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

fix: 再次修复一些肉鸽卡住的问题

Browse Source
This commit is contained in:
MistEO
2022-10-01 12:37:23 +08:00
parent 077b43a1f4
commit 6bd8bb82ea
3 changed files with 126 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
resource/addition/Roguelike2/resource/tasks.json
View File

@@ -368,7 +368,7 @@
},
"Roguelike2CloseCollectionContinue": {
"action": "ClickSelf",
"templThreshold": 0.85,
"templThreshold": 0.9,
"cache": false,
"roi": [
549,
@@ -396,13 +396,14 @@
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike1DropsFlag"
"Roguelike1DropsFlag",
"Roguelike2CloseEvent"
]
},
"Roguelike2CloseCollectionClose": {
"action": "ClickSelf",
"cache": false,
"templThreshold": 0.85,
"templThreshold": 0.9,
"roi": [
572,
434,
@@ -413,6 +414,35 @@
100,
255
],
"next": [
"Roguelike1StageEncounterEnter",
"Roguelike1StageTrader",
"Roguelike1StageSafeHouse",
"Roguelike1StageEncounter",
"Roguelike1StageBoons",
"Roguelike1StageCambatDps",
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike1DropsFlag",
"Roguelike2CloseEvent"
]
},
"Roguelike2CloseEvent": {
"action": "ClickSelf",
"cache": false,
"roi": [
567,
584,
145,
136
],
"next": [
"Roguelike1StageEncounterEnter",
"Roguelike1StageTrader",
@@ -494,5 +524,42 @@
"next": [
"Roguelike1RecruitOther"
]
},
"Roguelike2NextLevel": {
"algorithm": "OcrDetect",
"action": "ClickSelf",
"cache": false,
"text": [
"天光海岸",
"离岸孤岛",
"波涛略地",
"隐秘温床",
"失尘岩洞",
"幽海丛林",
"绀碧摇篮"
],
"roi": [
522,
431,
245,
144
],
"next": [
"Roguelike1StageTrader",
"Roguelike1StageSafeHouse",
"Roguelike1StageEncounter",
"Roguelike1StageBoons",
"Roguelike1StageCambatDps",
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
}
}

BIN
resource/addition/Roguelike2/resource/template/Roguelike2CloseEvent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

67
resource/tasks.json
View File

@@ -7100,6 +7100,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"Roguelike1ExitThenAbandon",
"Roguelike1Abandon",
"TodaysSuppliesToRoguelike1",
@@ -7204,9 +7211,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike1LastReward": {
@@ -7357,9 +7368,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"Roguelike2MapObject"
]
},
@@ -7606,9 +7621,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike1StageTrader": {
@@ -7632,9 +7651,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike1StageTraderEnter": {
@@ -7767,9 +7790,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike2StageRegionalCommissioning": {
@@ -7997,7 +8024,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike2DiceConfirmThenAbandon": {
@@ -8038,7 +8066,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike1StageBoons": {
@@ -8067,7 +8096,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
]
},
"Roguelike1StageEncounterEnter": {
@@ -8231,7 +8261,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
],
"next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
},
@@ -8274,7 +8305,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
],
"next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
},
@@ -8318,7 +8350,8 @@
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose"
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel"
],
"next_Doc": "普通作战和紧急作战的图比较像，有时候会识别错，这里的next把两个开始的按钮都放进来，提高容错"
},
@@ -8505,9 +8538,14 @@
"Roguelike1MissionFailedFlag2",
"Roguelike1GamePassSkip1",
"Roguelike1GamePassTheEndConfirm",
"Roguelike1GamePass"
"Roguelike1GamePass",
"Roguelike2NextLevel"
]
},
"Roguelike2NextLevel": {
"template": "empty.png",
"templThreshold": 2.0
},
"Roguelike1GamePassSkip1": {
"action": "ClickSelf",
"roi": [
@@ -8642,6 +8680,7 @@
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"Roguelike1ChooseOperFlag",
"Roguelike1StageEncounterSpecialClose",
"Roguelike1TraderRandomShopping",
@@ -8686,6 +8725,7 @@
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"Roguelike1ChooseOperFlag",
"Roguelike1StageEncounterFree",
"Roguelike1StageEncounterLeave",
@@ -8904,6 +8944,7 @@
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"Roguelike1ClickToStartPoint"
]
},
@@ -8943,9 +8984,13 @@
"Roguelike1StageEmergencyDps",
"Roguelike1StageDreadfulFoe",
"Roguelike2StageDreadfulFoe-5",
"Roguelike2StageRegionalCommissioning",
"Roguelike2StageGambling",
"Roguelike2CommissionedMissionCompleted",
"Roguelike2DiceConfirm",
"Roguelike2CloseCollectionContinue",
"Roguelike2CloseCollectionClose",
"Roguelike2NextLevel",
"TodaysSuppliesToRoguelike1",
"TerminalToRoguelike1",
"CloseAnnoToRoguelike1",