Skip to content

Commit e2ea79f

Browse files
Saratoga-OfficialSaratoga-Official
committed
perf: 各种优化/细节调整
1 parent 9ffe744 commit e2ea79f

11 files changed

Lines changed: 617 additions & 72 deletions

File tree

‎assets/interface.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
"name": "自动出征",
6464
"enabled": false
6565
},
66+
{
67+
"name": "自动出征Lite",
68+
"enabled": false
69+
},
6670
{
6771
"name": "自动决战",
6872
"enabled": false

‎assets/resource/pipeline/戰鬥.json‎

Lines changed: 170 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@
157157
},
158158
"post_wait_freezes": 0,
159159
"next": [
160-
"[JumpBack]启用军阶buff",
161160
"[JumpBack]战斗编队",
161+
"[JumpBack]启用军阶buff",
162+
"[JumpBack]关闭军阶buff",
163+
"战斗检测buff",
162164
"战斗检测等级",
163165
"[JumpBack]战斗自动补给",
164166
"战斗检测无补给",
@@ -172,23 +174,55 @@
172174
},
173175
"启用军阶buff": {
174176
"recognition": {
175-
"type": "ColorMatch",
177+
"type": "Or",
176178
"param": {
177-
"roi": [
178-
817,
179-
91,
180-
58,
181-
56
182-
],
183-
"lower": [
184-
31,
185-
86,
186-
143
187-
],
188-
"upper": [
189-
39,
190-
149,
191-
253
179+
"any_of": [
180+
{
181+
"recognition": {
182+
"type": "ColorMatch",
183+
"param": {
184+
"roi": [
185+
827,
186+
99,
187+
40,
188+
40
189+
],
190+
"lower": [
191+
31,
192+
86,
193+
143
194+
],
195+
"upper": [
196+
39,
197+
149,
198+
253
199+
]
200+
}
201+
}
202+
},
203+
{
204+
"recognition": {
205+
"type": "ColorMatch",
206+
"param": {
207+
"roi": [
208+
827,
209+
99,
210+
40,
211+
40
212+
],
213+
"lower": [
214+
234,
215+
173,
216+
41
217+
],
218+
"upper": [
219+
244,
220+
188,
221+
68
222+
]
223+
}
224+
}
225+
}
192226
]
193227
}
194228
},
@@ -202,7 +236,8 @@
202236
],
203237
"focus": {
204238
"Node.Recognition.Succeeded": "选择军阶buff"
205-
}
239+
},
240+
"max_hit": 1
206241
},
207242
"识别当前BUFF": {
208243
"recognition": {
@@ -221,17 +256,30 @@
221256
]
222257
}
223258
},
224-
"action": {
225-
"type": "Click",
259+
"next": [
260+
"[JumpBack]重新连接",
261+
"使用当前BUFF",
262+
"退出当前BUFF"
263+
]
264+
},
265+
"使用当前BUFF": {
266+
"recognition": {
267+
"type": "OCR",
226268
"param": {
227-
"target": [
269+
"expected": [
270+
"未启用"
271+
],
272+
"roi": [
228273
970,
229274
339,
230275
77,
231276
39
232277
]
233278
}
234279
},
280+
"action": {
281+
"type": "Click"
282+
},
235283
"next": [
236284
"[JumpBack]重新连接",
237285
"退出当前BUFF"
@@ -241,7 +289,12 @@
241289
"action": {
242290
"type": "Click",
243291
"param": {
244-
"target": "识别当前BUFF"
292+
"target": [
293+
978,
294+
154,
295+
193,
296+
40
297+
]
245298
}
246299
}
247300
},
@@ -331,6 +384,101 @@
331384
"识别当前BUFF"
332385
]
333386
},
387+
"关闭军阶buff": {
388+
"recognition": {
389+
"type": "ColorMatch",
390+
"param": {
391+
"roi": [
392+
827,
393+
99,
394+
40,
395+
40
396+
],
397+
"lower": [
398+
234,
399+
173,
400+
41
401+
],
402+
"upper": [
403+
244,
404+
188,
405+
68
406+
]
407+
}
408+
},
409+
"action": {
410+
"type": "Click"
411+
},
412+
"next": [
413+
"[JumpBack]重新连接",
414+
"关闭当前BUFF"
415+
],
416+
"focus": {
417+
"Node.Recognition.Succeeded": "关闭军阶buff"
418+
},
419+
"enabled": false
420+
},
421+
"关闭当前BUFF": {
422+
"recognition": {
423+
"type": "OCR",
424+
"param": {
425+
"expected": [
426+
"启用"
427+
],
428+
"roi": [
429+
970,
430+
339,
431+
77,
432+
39
433+
]
434+
}
435+
},
436+
"action": {
437+
"type": "Click"
438+
},
439+
"next": [
440+
"[JumpBack]重新连接",
441+
"退出当前BUFF"
442+
]
443+
},
444+
"战斗检测buff": {
445+
"recognition": {
446+
"type": "ColorMatch",
447+
"param": {
448+
"roi": [
449+
827,
450+
99,
451+
40,
452+
40
453+
],
454+
"lower": [
455+
140,
456+
140,
457+
140
458+
],
459+
"upper": [
460+
140,
461+
140,
462+
140
463+
]
464+
}
465+
},
466+
"next": [
467+
"战斗退出"
468+
],
469+
"post_wait_freezes": 0,
470+
"enabled": false,
471+
"focus": {
472+
"Node.Recognition.Succeeded": {
473+
"content": "<span style=\"color: red;\">检测到BUFF已用完</span>",
474+
"display": [
475+
"log",
476+
"notification",
477+
"toast"
478+
]
479+
}
480+
}
481+
},
334482
"战斗编队": {
335483
"recognition": {
336484
"type": "ColorMatch",

‎assets/resource/pipeline/決戰.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3206,6 +3206,7 @@
32063206
"[JumpBack]决战请选择前进点",
32073207
"[JumpBack]决战招募",
32083208
"决战识别boss点3",
3209+
"[JumpBack]决战检测紫貂技能3",
32093210
"[JumpBack]决战进入编队"
32103211
],
32113212
"on_error": [
@@ -3215,6 +3216,23 @@
32153216
"Node.Recognition.Succeeded": "战前决策"
32163217
}
32173218
},
3219+
"决战检测紫貂技能3": {
3220+
"recognition": "TemplateMatch",
3221+
"template": "决战/紫貂技能.png",
3222+
"order_by": "Score",
3223+
"threshold": 0.95,
3224+
"roi": [
3225+
228,
3226+
587,
3227+
114,
3228+
114
3229+
],
3230+
"action": "Click",
3231+
"enabled": false,
3232+
"focus": {
3233+
"Node.Recognition.Succeeded": "使用紫貂技能"
3234+
}
3235+
},
32183236
"决战进入编队界面4": {
32193237
"recognition": "OCR",
32203238
"expected": "开始出征",

‎assets/resource/pipeline/通用.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,41 @@
905905
"任务出错"
906906
]
907907
},
908+
"战斗SL记入次数": {
909+
"recognition": {
910+
"type": "OCR",
911+
"param": {
912+
"expected": "撤退",
913+
"roi": [
914+
844,
915+
627,
916+
192,
917+
87
918+
]
919+
}
920+
},
921+
"action": {
922+
"type": "Click"
923+
},
924+
"anchor": {
925+
"节点1锚点阵型": "",
926+
"节点2锚点阵型": "",
927+
"节点3锚点阵型": "",
928+
"节点4锚点阵型": "",
929+
"节点5锚点阵型": "",
930+
"节点6锚点阵型": "",
931+
"最终阵型": ""
932+
},
933+
"next": [
934+
"[JumpBack]重新连接",
935+
"回到关卡了",
936+
"回到关卡了2"
937+
],
938+
"on_error": [
939+
"战斗SL记入次数",
940+
"任务出错"
941+
]
942+
},
908943
"凹点位检测概率": {
909944
"recognition": {
910945
"type": "OCR",

‎assets/resource/pipeline/開始前任務.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@
1818
"登录奖励",
1919
"小长春的赠礼",
2020
"[JumpBack]活动退出",
21-
"开始退出",
21+
"[JumpBack]开始退出",
2222
"结束开始唤醒"
2323
]
2424
},
2525
"开始退出": {
2626
"recognition": "TemplateMatch",
27-
"template": "通用/退出.png",
27+
"template": [
28+
"通用/退出.png",
29+
"通用/退出公告.png",
30+
"战斗/活动退出.png",
31+
"战斗/活动退出2.png"
32+
],
2833
"roi": [
2934
7,
3035
5,
@@ -33,11 +38,7 @@
3338
],
3439
"action": "Click",
3540
"green_mask": true,
36-
"post_delay": 1000,
37-
"next": [
38-
"[JumpBack]重新连接",
39-
"打开游戏"
40-
]
41+
"post_delay": 1000
4142
},
4243
"游戏更新": {
4344
"recognition": "OCR",

0 commit comments

Comments
 (0)