Skip to content

Commit 6ca4df5

Browse files
feat: 无限次数可检测旗舰等级
1 parent 080ad68 commit 6ca4df5

3 files changed

Lines changed: 62 additions & 31 deletions

File tree

assets/interface.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,14 @@
10331033
"inverse": true
10341034
}
10351035
}
1036+
},
1037+
{
1038+
"name": "直到旗舰满级后停止",
1039+
"pipeline_override": {
1040+
"战斗检测等级": {
1041+
"enabled": true
1042+
}
1043+
}
10361044
}
10371045
]
10381046
},
@@ -2325,22 +2333,6 @@
23252333
}
23262334
]
23272335
},
2328-
"活动无限次数": {
2329-
"cases": [
2330-
{
2331-
"name": "no",
2332-
"pipeline_override": {
2333-
"无限战斗": {
2334-
"enabled": false
2335-
}
2336-
}
2337-
},
2338-
{
2339-
"name": "yes",
2340-
"pipeline_override": {}
2341-
}
2342-
]
2343-
},
23442336
"立体强袭阵型": {
23452337
"cases": [
23462338
{
@@ -2388,16 +2380,24 @@
23882380
"立体强袭无限次数": {
23892381
"cases": [
23902382
{
2391-
"name": "no",
2383+
"name": "关闭",
23922384
"pipeline_override": {
23932385
"立体强袭无限战斗": {
23942386
"enabled": false
23952387
}
23962388
}
23972389
},
23982390
{
2399-
"name": "yes",
2391+
"name": "开启",
24002392
"pipeline_override": {}
2393+
},
2394+
{
2395+
"name": "旗舰等级满级时终止任务",
2396+
"pipeline_override": {
2397+
"立体强袭检测等级": {
2398+
"enabled": true
2399+
}
2400+
}
24012401
}
24022402
]
24032403
},
@@ -2434,7 +2434,7 @@
24342434
},
24352435
"立体强袭修理检测大破": {
24362436
"next": [
2437-
"战斗退出"
2437+
"退出立体强袭"
24382438
]
24392439
}
24402440
}
@@ -2444,12 +2444,12 @@
24442444
"pipeline_override": {
24452445
"立体强袭修理检测中破": {
24462446
"next": [
2447-
"战斗退出"
2447+
"退出立体强袭"
24482448
]
24492449
},
24502450
"立体强袭修理检测大破": {
24512451
"next": [
2452-
"战斗退出"
2452+
"退出立体强袭"
24532453
]
24542454
}
24552455
}

assets/resource/pipeline/立體強襲.json

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"template": "活动紧急情况.png",
1212
"action": "Click",
1313
"post_wait_freezes": 0,
14+
"post_delay": 1000,
1415
"next": [
1516
"立体强袭不处理"
1617
]
@@ -19,13 +20,30 @@
1920
"recognition": "TemplateMatch",
2021
"template": "活动不处理.png",
2122
"action": "Click",
23+
"post_delay": 1000,
2224
"next": [
2325
"立体强袭自动补给",
26+
"立体强袭检测等级",
2427
"立体强袭修理检测大破",
2528
"立体强袭修理检测中破",
2629
"立体强袭开始出征"
2730
]
2831
},
32+
"立体强袭检测等级": {
33+
"recognition": "OCR",
34+
"expected": "110",
35+
"roi": [
36+
88,
37+
408,
38+
31,
39+
15
40+
],
41+
"next": [
42+
"退出立体强袭"
43+
],
44+
"enabled": false,
45+
"focus": "[color:red]检测到旗舰等级已满[/color]"
46+
},
2947
"立体强袭自动补给": {
3048
"recognition": "TemplateMatch",
3149
"template": "对号.png",
@@ -38,6 +56,8 @@
3856
22
3957
],
4058
"next": [
59+
"立体强袭自动补给",
60+
"立体强袭检测等级",
4161
"立体强袭修理检测大破",
4262
"立体强袭修理检测中破",
4363
"立体强袭开始出征"
@@ -156,28 +176,21 @@
156176
"recognition": "TemplateMatch",
157177
"template": "开始出征.png",
158178
"action": "Click",
179+
"post_delay": 1000,
159180
"next": [
160-
"立体强袭前进",
161-
"立体强袭船舱满"
181+
"立体强袭前进"
162182
]
163183
},
164184
"立体强袭前进": {
165185
"recognition": "TemplateMatch",
166186
"template": "活动前进.png",
167187
"action": "Click",
188+
"post_delay": 1000,
168189
"next": [
169190
"立体强袭开始战斗",
170191
"立体强袭阵型"
171192
]
172193
},
173-
"立体强袭船舱满": {
174-
"recognition": "TemplateMatch",
175-
"template": "关闭船舱满提醒.png",
176-
"action": "Click",
177-
"next": [
178-
"退出立体强袭"
179-
]
180-
},
181194
"退出立体强袭": {
182195
"recognition": "TemplateMatch",
183196
"template": "退出.png",
@@ -224,6 +237,7 @@
224237
"recognition": "TemplateMatch",
225238
"template": "点击继续.png",
226239
"action": "Click",
240+
"post_delay": 1000,
227241
"next": [
228242
"立体强袭退出2",
229243
"立体强袭再点继续"

assets/resource/pipeline/自動戰鬥.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
],
197197
"next": [
198198
"战斗自动补给",
199+
"战斗检测等级",
199200
"战斗修理检测大破",
200201
"战斗修理检测中破",
201202
"战斗开始出征"
@@ -215,12 +216,28 @@
215216
],
216217
"next": [
217218
"战斗自动补给",
219+
"战斗检测等级",
218220
"战斗修理检测大破",
219221
"战斗修理检测中破",
220222
"战斗开始出征"
221223
],
222224
"focus": "切换自动补给"
223225
},
226+
"战斗检测等级": {
227+
"recognition": "OCR",
228+
"expected": "110",
229+
"roi": [
230+
88,
231+
408,
232+
31,
233+
15
234+
],
235+
"next": [
236+
"战斗退出"
237+
],
238+
"enabled": false,
239+
"focus": "[color:red]检测到旗舰等级已满[/color]"
240+
},
224241
"战斗修理检测大破": {
225242
"recognition": "ColorMatch",
226243
"roi": [

0 commit comments

Comments
 (0)