Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/task 20250112 #30

Merged
merged 3 commits into from
Jan 12, 2025
Merged

Fix/task 20250112 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ea4b72
fix: 部分任务
Htgs Jan 12, 2025
ead7abf
feat:开发环境
Htgs Jan 12, 2025
62c333c
feat:移除资源
Htgs Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,4 +447,6 @@ install
# Tools
tools/ImageCropper/**/*.png

config
config

lib
32 changes: 5 additions & 27 deletions assets/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"entry": "WeekInstance",
"pipeline_override": {
"首页_出击": {
"next": "ActivityExploration"
"next": "ActivityExploration_fifth_ep"
}
},
"option": [
Expand Down Expand Up @@ -282,38 +282,16 @@
{
"name": "第一关45微晶",
"pipeline_override": {
"ActivityExploration_2": {
"next": [
"ActivityExploration_3",
"ActivityExploration_SwipeUp",
"ActivityExploration_2"
]
},
"ActivityExploration_CombatEnd3": {
"next": [
"子任务_获得物品",
"ActivityExploration_3",
"ActivityExploration_CombatEnd3"
]
"首页_出击": {
"next": "ActivityExploration_first_ep"
}
}
},
{
"name": "第五关120微晶",
"pipeline_override": {
"ActivityExploration_2": {
"next": [
"ActivityExploration_第五关",
"ActivityExploration_SwipeDown",
"ActivityExploration_2"
]
},
"ActivityExploration_CombatEnd3": {
"next": [
"子任务_获得物品",
"ActivityExploration_第五关",
"ActivityExploration_CombatEnd3"
]
"首页_出击": {
"next": "ActivityExploration_fifth_ep"
}
}
}
Expand Down
Binary file added assets/resource/base/image/StartUp/CloseOneYear.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/resource/base/image/StartUp/NoMail.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions assets/resource/base/pipeline/awards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"Mail": {
"recognition": "ColorMatch",
"roi": [
254,
14,
42,
27
1058,
27,
34,
35
],
"method": 4,
"lower": [
Expand Down Expand Up @@ -66,10 +66,10 @@
"recognition": "TemplateMatch",
"template": "StartUp/NoMail.png",
"roi": [
259,
20,
24,
24
1060,
31,
30,
26
],
"next": [
"DailyTask",
Expand All @@ -80,10 +80,10 @@
"recognition": "TemplateMatch",
"template": "StartUp/DailyTask.png",
"roi": [
1219,
394,
39,
35
686,
609,
62,
83
],
"action": "Click",
"next": [
Expand Down
10 changes: 5 additions & 5 deletions assets/resource/base/pipeline/infrastructures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"基地"
],
"roi": [
1020,
619,
167,
93
606,
665,
42,
26
],
"action": "Click",
"post_delay": 3000,
Expand Down Expand Up @@ -1638,4 +1638,4 @@
"Infr_行星指挥部_返回"
]
}
}
}
24 changes: 9 additions & 15 deletions assets/resource/base/pipeline/rehearsal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"模拟军演"
],
"roi": [
185,
282,
280,
174
256,
338,
113,
40
],
"action": "Click",
"next": [
Expand All @@ -25,21 +25,15 @@
"模拟军演_二级入口": {
"recognition": "OCR",
"expected": [
"模拟军演"
"镜像竞技"
],
"roi": [
483,
41,
358,
118
155,
405,
202,
56
],
"action": "Click",
"target_offset": [
-10,
276,
20,
20
],
"next": [
"模拟军演_刷新对手",
"模拟军演_选择对手",
Expand Down
14 changes: 14 additions & 0 deletions assets/resource/base/pipeline/startup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"子任务_点击取消",
"子任务_点击确认",
"子任务_关闭公告",
"关闭周年弹窗",
"签到",
"首页标志1",
"开始游戏",
Expand Down Expand Up @@ -61,6 +62,7 @@
"next": [
"首页标志1",
"子任务_关闭公告",
"关闭周年弹窗",
"签到",
"开始游戏"
]
Expand Down Expand Up @@ -131,5 +133,17 @@
"is_sub": true,
"action": "StartApp",
"package": "com.megagame.crosscore/com.megagame.crosscore.extend.PhoneUtilActivity"
},
"关闭周年弹窗": {
"recognition": "TemplateMatch",
"template": "StartUp/CloseOneYear.png",
"roi": [
1143,
118,
36,
41
],
"action": "Click",
"green_mask": true
}
}
8 changes: 4 additions & 4 deletions assets/resource/base/pipeline/utils.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"出击"
],
"roi": [
1058,
159,
212,
123
1134,
603,
97,
51
],
"action": "Click",
"next_doc": "Set in code."
Expand Down
Loading
Loading