fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

rft: 使用多模板匹配重构 ReturnButtons

Browse Source
This commit is contained in:
zzyyyl
2023-10-07 12:48:30 +08:00
parent 2d03e9ac5b
commit 083c7134c4
1 changed files with 39 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
resource/tasks.json
View File

@@ -3436,25 +3436,19 @@
"ReturnButtons": {
"algorithm": "JustReturn",
"next": [
"BlackReturn",
"WhiteReturn",
"ReturnButton",
"FromStageSN"
]
},
"WhiteReturn": {
"template": "Return-White.png",
"templThreshold": 0.8,
"baseTask": "BlackReturn",
"roi": [
0,
0,
220,
150
]
},
"BlackReturn": {
"template": "Return.png",
"templThreshold": 0.7,
"ReturnButton": {
"template": [
"Return.png",
"Return-White.png"
],
"templThreshold": [
0.7,
0.8
],
"action": "ClickSelf",
"cache": false,
"roi": [
@@ -3467,8 +3461,8 @@
"#back",
"ReturnButtons#next",
"ReturnConfirm",
"BlackReturn@LoadingIcon",
"BlackReturn@LoadingText",
"ReturnButton@LoadingIcon",
"ReturnButton@LoadingText",
"CloseAnnos#next"
]
},
@@ -3489,7 +3483,7 @@
35
],
"next": [
"BlackReturn"
"ReturnButton"
]
},
"ReturnConfirm": {
@@ -4850,7 +4844,6 @@
"postDelay": 2000
},
"MailWithoutAward": {
"action": "DoNothing",
"cache": false,
"roi": [
120,
@@ -4858,11 +4851,8 @@
150,
135
],
"postDelay": 500,
"next": [
"Mail",
"Stop"
]
"templThreshold": 0.9,
"postDelay": 500
},
"ReceiveMail": {
"action": "ClickSelf",
@@ -5372,17 +5362,14 @@
"Infrast@OfflineConfirm"
]
},
"Infrast@WhiteReturn": {
"template": "Return-White.png",
"next": [
"Infrast@BlackReturn#next"
]
},
"Infrast@BlackReturn": {
"template": "Return.png",
"Infrast@ReturnButton": {
"template": [
"Return.png",
"Return-White.png"
],
"next": [
"InfrastBegin#next",
"Infrast@(BlackReturn#next)"
"Infrast@(ReturnButton#next)"
]
},
"Infrast@ReturnConfirm": {
@@ -9347,20 +9334,17 @@
60
]
},
"Roguelike@WhiteReturn": {
"template": "Return-White.png",
"next": [
"Roguelike@BlackReturn#next"
]
},
"Roguelike@BlackReturn": {
"template": "Return.png",
"Roguelike@ReturnButton": {
"template": [
"Return.png",
"Return-White.png"
],
"next": [
"Roguelike@ChooseDifficulty",
"Roguelike@StartExplore",
"Roguelike@ExitThenAbandon",
"Roguelike@Abandon",
"Roguelike@(BlackReturn#next)"
"Roguelike@(ReturnButton#next)"
]
},
"Roguelike@RolesConfirm": {
@@ -13791,17 +13775,14 @@
"templThreshold": 0.7,
"action": "ClickSelf",
"next": [
"Reclamation@BlackReturn#next"
"Reclamation@ReturnButton#next"
]
},
"Reclamation@WhiteReturn": {
"template": "Return-White.png",
"next": [
"Reclamation@BlackReturn#next"
]
},
"Reclamation@BlackReturn": {
"template": "Return.png",
"Reclamation@ReturnButton": {
"template": [
"Return.png",
"Return-White.png"
],
"next": [
"Reclamation@AtHomePageFlag",
"Reclamation@LevelForceExitConfirm",
@@ -13810,7 +13791,7 @@
"Reclamation@ExitAlgorithm",
"Reclamation@SmallReturn",
"Reclamation@ReturnInFocus",
"Reclamation@(BlackReturn#next)"
"Reclamation@(ReturnButton#next)"
]
},
"Reclamation@ReturnInFocus": {
@@ -13823,7 +13804,7 @@
"templThreshold": 0.7,
"action": "ClickSelf",
"next": [
"Reclamation@BlackReturn#next"
"Reclamation@ReturnButton#next"
]
},
"Reclamation@Begin": {
@@ -13832,7 +13813,7 @@
"Reclamation@GiveupAlgorithm",
"Reclamation@StartAlgorithm",
"Reclamation@ConfirmStart#next",
"Reclamation@BlackReturn#next",
"Reclamation@ReturnButton#next",
"Reclamation@BattleStart#next",
"Reclamation@LevelComplete",
"Reclamation@GiveupReportSkip",
@@ -14190,13 +14171,13 @@
"next": [
"Reclamation@LevelForceExitConfirm",
"Reclamation@LevelForceExit",
"Reclamation@BlackReturn#next"
"Reclamation@ReturnButton#next"
]
},
"Reclamation@LevelForceExitConfirm": {
"baseTask": "Reclamation@ExitLevelConfirm",
"next": [
"Reclamation@BlackReturn#next"
"Reclamation@ReturnButton#next"
]
},
"Reclamation@LevelComplete": {
@@ -14690,7 +14671,7 @@
"algorithm": "JustReturn",
"next": [
"NavigateHome@Reclamation@AtHomePageFlag",
"NavigateHome@Reclamation@BlackReturn#next",
"NavigateHome@Reclamation@ReturnButton#next",
"NavigateHome@Reclamation@SkipAnnounce",
"NavigateHome@Reclamation@SkipDailyReport",
"NavigateHome@Reclamation@LevelComplete",