From 99d90eaad95cbcdf33761dd1b82847e5259cd892 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Wed, 26 Oct 2022 01:16:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A8=8D=E5=BE=AE=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?tasks.json=20=E4=B8=AD=E8=82=89=E9=B8=BD=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Roguelike@Begin` 增加 GetDrops#next 即允许从 战斗掉落界面 开始任务 --- resource/tasks.json | 463 ++++++++++++++++---------------------------- 1 file changed, 165 insertions(+), 298 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index e031b32e6c..11ed5a6f5f 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6776,40 +6776,6 @@ 138 ] }, - "Begin": { - "Doc": "Roguelike base task", - "algorithm": "JustReturn" - }, - "FromIntegratedStrategies": { - "algorithm": "OcrDetect", - "action": "ClickSelf", - "text": [ - "进入主题" - ], - "roi": [ - 1006, - 445, - 246, - 157 - ], - "next": [ - "FromIntegratedStrategies", - "Begin" - ] - }, - "IntegratedStrategies": { - "action": "ClickSelf", - "roi": [ - 963, - 599, - 148, - 121 - ], - "next": [ - "IntegratedStrategies", - "FromIntegratedStrategies" - ] - }, "Roguelike@Abandon": { "Doc": "base_task", "template": "empty.png", @@ -6838,6 +6804,29 @@ "Roguelike@StartExplore" ] }, + "Roguelike@Begin": { + "algorithm": "JustReturn", + "next": [ + "Roguelike@ChooseDifficulty", + "Roguelike@StartExplore", + "Roguelike@NextLevel#next", + "Roguelike@GetDrops#next", + "Roguelike@NextLevel", + "Roguelike@ExitThenAbandon", + "Roguelike@Abandon", + "Roguelike@TodaysSupplies", + "Roguelike@Main", + "Roguelike@CloseAnno", + "Roguelike@TodoEnter", + "Roguelike@Continue", + "Roguelike@ReturnTo", + "Roguelike@ReturnToConfirm", + "Roguelike@OfflineConfirm", + "Roguelike@StartToWakeUp", + "Roguelike@StartUpConnectingFlag", + "Roguelike@FromStageSN" + ] + }, "Roguelike@ChooseDifficulty": { "Doc": "base_task", "template": "empty.png", @@ -6897,7 +6886,22 @@ 50, 50 ], - "rearDelay": 500 + "rearDelay": 500, + "next": [ + "Roguelike@NextLevel#next", + "Roguelike@ChooseOperFlag", + "Roguelike@StageEncounterSpecialClose", + "Roguelike@TraderRandomShopping", + "Roguelike@StageTraderLeave", + "Roguelike@DropsFlag", + "Roguelike@TodaysSupplies", + "Roguelike@Main", + "Roguelike@CloseAnno", + "Roguelike@OfflineConfirm", + "Roguelike@StartToWakeUp", + "Roguelike@StartUpConnectingFlag", + "Roguelike@ClickToDrops" + ] }, "Roguelike@ClickToStartPoint": { "algorithm": "JustReturn", @@ -6908,7 +6912,23 @@ 50, 50 ], - "rearDelay": 1000 + "rearDelay": 1000, + "next": [ + "Roguelike@StartExplore", + "Roguelike@NextLevel#next", + "Roguelike@GamePass", + "Roguelike@TodaysSupplies", + "Roguelike@Main", + "Roguelike@CloseAnno", + "Roguelike@TodoEnter", + "Roguelike@Continue", + "Roguelike@ReturnTo", + "Roguelike@ReturnToConfirm", + "Roguelike@OfflineConfirm", + "Roguelike@StartToWakeUp", + "Roguelike@StartUpConnectingFlag", + "Roguelike@ClickToStartPoint" + ] }, "Roguelike@CloseCollection": { "Doc": "base_task", @@ -6980,7 +7000,10 @@ 202, 239 ], - "rearDelay": 3000 + "rearDelay": 3000, + "next": [ + "Roguelike@NextLevel#next" + ] }, "Roguelike@ExitThenAbandon": { "action": "ClickSelf", @@ -7004,6 +7027,23 @@ "Roguelike@StartAction" ] }, + "Roguelike@FromIntegratedStrategies": { + "algorithm": "OcrDetect", + "action": "ClickSelf", + "text": [ + "进入主题" + ], + "roi": [ + 1006, + 445, + 246, + 157 + ], + "next": [ + "Roguelike@FromIntegratedStrategies", + "Roguelike@Begin" + ] + }, "Roguelike@GamePass": { "Doc": "base_task", "template": "empty.png", @@ -7069,9 +7109,8 @@ "Roguelike@GamePass" ] }, - "Roguelike@GetDrop1": { + "Roguelike@GetDrop": { "Doc": "base_task", - "Doc2": "源石锭，绿色的“拿走”按钮", "template": "empty.png", "action": "ClickSelf", "cache": false, @@ -7082,7 +7121,13 @@ 157 ], "templThreshold": 0.85, - "rearDelay": 1000, + "rearDelay": 1000 + }, + "Roguelike@GetDrop1": { + "Doc": "base_task", + "template": "empty.png", + "baseTask": "Roguelike@GetDrop", + "Doc2": "源石锭，绿色的“拿走”按钮", "next": [ "Roguelike@DropsFlag", "Roguelike@ChooseOperFlag" @@ -7090,18 +7135,9 @@ }, "Roguelike@GetDrop2": { "Doc": "base_task", - "Doc2": "希望，黄色的“拿走”按钮", "template": "empty.png", - "action": "ClickSelf", - "cache": false, - "roi": [ - 0, - 471, - 1280, - 157 - ], - "templThreshold": 0.85, - "rearDelay": 1000, + "baseTask": "Roguelike@GetDrop", + "Doc2": "希望，黄色的“拿走”按钮", "next": [ "Roguelike@DropsFlag", "Roguelike@ChooseOperFlag", @@ -7110,18 +7146,9 @@ }, "Roguelike@GetDrop3": { "Doc": "base_task", - "Doc2": "未知的剧目，黄色的“翻开”按钮", "template": "empty.png", - "action": "ClickSelf", - "cache": false, - "roi": [ - 0, - 471, - 1280, - 157 - ], - "rearDelay": 1000, - "templThreshold": 0.85, + "baseTask": "Roguelike@GetDrop", + "Doc2": "未知的剧目，黄色的“翻开”按钮", "next": [ "Roguelike@ChooseOperFlag", "Roguelike@ClickToDrops" @@ -7143,7 +7170,12 @@ 302, 289 ], - "rearDelay": 3000 + "rearDelay": 3000, + "next": [ + "Roguelike@GetDrops#next", + "Roguelike@ChooseOperFlag", + "Roguelike@ClickToDrops" + ] }, "Roguelike@GetDropLeave": { "Doc": "base_task", @@ -7188,7 +7220,13 @@ 1280, 157 ], - "rearDelay": 1000 + "rearDelay": 1000, + "next": [ + "Roguelike@ChooseOperFlag", + "Roguelike@GetDrops#next", + "Roguelike@GetDropCompleted", + "Roguelike@GetDropLeave" + ] }, "Roguelike@GetDropSelect": { "Doc": "base_task", @@ -7247,6 +7285,10 @@ "Roguelike@ClickToDrops" ] }, + "Roguelike@GetDrops": { + "Doc": "base_sharp_task", + "algorithm": "JustReturn" + }, "Roguelike@InBattleFlag": { "template": "BattleOfficiallyBegin.png", "roi": [ @@ -7284,6 +7326,19 @@ "Roguelike@InitalDrop" ] }, + "Roguelike@IntegratedStrategies": { + "action": "ClickSelf", + "roi": [ + 963, + 599, + 148, + 121 + ], + "next": [ + "Roguelike@IntegratedStrategies", + "Roguelike@FromIntegratedStrategies" + ] + }, "Roguelike@LastReward": { "Doc": "base_task", "Doc2": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援——热水壶", @@ -7394,7 +7449,17 @@ }, "Roguelike@MissionFailedFlag": { "Doc": "base_task", - "template": "empty.png" + "template": "empty.png", + "roi": [ + 504, + 163, + 480, + 267 + ], + "next": [ + "Roguelike@NextLevel#next", + "Roguelike@ClickToStartPoint" + ] }, "Roguelike@MissionFailedFlag2": { "Doc": "base_task", @@ -7469,20 +7534,13 @@ "Roguelike@RecruitOther": { "Doc": "base_task", "template": "empty.png", - "action": "ClickSelf", - "templThreshold": 0.6, - "cache": false, + "baseTask": "Roguelike@RecruitMain", "roi": [ 190, 470, 900, 154 - ], - "next": [ - "Roguelike@ChooseOperFlag", - "Roguelike@RecruitCloseGuide" - ], - "rearDelay": 1000 + ] }, "Roguelike@RecruitSkip": { "template": "RecruitSkip.png", @@ -7974,6 +8032,9 @@ 447, 295, 203 + ], + "next": [ + "Roguelike@NextLevel#next" ] }, "Roguelike@StartAction": { @@ -8092,69 +8153,12 @@ ] }, "Phantom@Roguelike@Abandon": {}, - "Phantom@Roguelike@Begin": { - "algorithm": "JustReturn", - "next": [ - "Phantom@Roguelike@ChooseDifficulty", - "Phantom@Roguelike@StartExplore", - "Phantom@Roguelike@NextLevel#next", - "Phantom@Roguelike@NextLevel", - "Phantom@Roguelike@ExitThenAbandon", - "Phantom@Roguelike@Abandon", - "Phantom@Roguelike@TodaysSupplies", - "Phantom@Roguelike@Main", - "Phantom@Roguelike@CloseAnno", - "Phantom@Roguelike@TodoEnter", - "Phantom@Roguelike@Continue", - "Phantom@Roguelike@ReturnTo", - "Phantom@Roguelike@ReturnToConfirm", - "Phantom@Roguelike@OfflineConfirm", - "Phantom@Roguelike@StartToWakeUp", - "Phantom@Roguelike@StartUpConnectingFlag", - "Phantom@Roguelike@FromStageSN" - ] - }, "Phantom@Roguelike@ChooseDifficulty": {}, "Phantom@Roguelike@ChooseOper": { "next": [ "Phantom@Roguelike@ChooseOperConfirm" ] }, - "Phantom@Roguelike@ClickToDrops": { - "next": [ - "Phantom@Roguelike@NextLevel#next", - "Phantom@Roguelike@ChooseOperFlag", - "Phantom@Roguelike@StageEncounterSpecialClose", - "Phantom@Roguelike@TraderRandomShopping", - "Phantom@Roguelike@StageTraderLeave", - "Phantom@Roguelike@DropsFlag", - "Phantom@Roguelike@TodaysSupplies", - "Phantom@Roguelike@Main", - "Phantom@Roguelike@CloseAnno", - "Phantom@Roguelike@OfflineConfirm", - "Phantom@Roguelike@StartToWakeUp", - "Phantom@Roguelike@StartUpConnectingFlag", - "Phantom@Roguelike@ClickToDrops" - ] - }, - "Phantom@Roguelike@ClickToStartPoint": { - "next": [ - "Phantom@Roguelike@StartExplore", - "Phantom@Roguelike@NextLevel#next", - "Phantom@Roguelike@GamePass", - "Phantom@Roguelike@TodaysSupplies", - "Phantom@Roguelike@Main", - "Phantom@Roguelike@CloseAnno", - "Phantom@Roguelike@TodoEnter", - "Phantom@Roguelike@Continue", - "Phantom@Roguelike@ReturnTo", - "Phantom@Roguelike@ReturnToConfirm", - "Phantom@Roguelike@OfflineConfirm", - "Phantom@Roguelike@StartToWakeUp", - "Phantom@Roguelike@StartUpConnectingFlag", - "Phantom@Roguelike@ClickToStartPoint" - ] - }, "Phantom@Roguelike@CloseCollection": { "next": [ "Phantom@Roguelike@LastReward", @@ -8175,11 +8179,7 @@ "Phantom@Roguelike@DropsFlag": { "template": "Roguelike@DropsFlag.png", "next": [ - "Phantom@Roguelike@GetDrop1", - "Phantom@Roguelike@GetDrop2", - "Phantom@Roguelike@GetDrop3", - "Phantom@Roguelike@GetDropSelect", - "Phantom@Roguelike@GetDropRecruit", + "Phantom@Roguelike@GetDrops#next", "Phantom@Roguelike@GetDropCompleted", "Phantom@Roguelike@GetDropLeave", "Phantom@Roguelike@NextLevel#next", @@ -8190,11 +8190,7 @@ "Phantom@Roguelike@DialogSkip" ] }, - "Phantom@Roguelike@EnterAfterRecruit": { - "next": [ - "Phantom@Roguelike@NextLevel#next" - ] - }, + "Phantom@Roguelike@EnterAfterRecruit": {}, "Phantom@Roguelike@ExitThenAbandon": { "template": "Roguelike@ExitThenAbandon.png", "next": [ @@ -8214,53 +8210,30 @@ "Phantom@Roguelike@GetDrop1": {}, "Phantom@Roguelike@GetDrop2": {}, "Phantom@Roguelike@GetDrop3": {}, - "Phantom@Roguelike@GetDropCompleted": { - "next": [ - "Phantom@Roguelike@GetDrop1", - "Phantom@Roguelike@GetDrop2", - "Phantom@Roguelike@GetDrop3", - "Phantom@Roguelike@GetDropSelect", - "Phantom@Roguelike@GetDropRecruit", - "Phantom@Roguelike@ChooseOperFlag", - "Phantom@Roguelike@ClickToDrops" - ] - }, + "Phantom@Roguelike@GetDropCompleted": {}, "Phantom@Roguelike@GetDropLeave": {}, - "Phantom@Roguelike@GetDropRecruit": { - "next": [ - "Phantom@Roguelike@ChooseOperFlag", - "Phantom@Roguelike@GetDrop1", - "Phantom@Roguelike@GetDrop2", - "Phantom@Roguelike@GetDrop3", - "Phantom@Roguelike@GetDropSelect", - "Phantom@Roguelike@GetDropRecruit", - "Phantom@Roguelike@GetDropCompleted", - "Phantom@Roguelike@GetDropLeave" - ] - }, + "Phantom@Roguelike@GetDropRecruit": {}, "Phantom@Roguelike@GetDropSelect": {}, "Phantom@Roguelike@GetDropSelectRecruit": { "template": "Phantom@Roguelike@GetDropRecruit.png" }, "Phantom@Roguelike@GetDropSelectReward": {}, + "Phantom@Roguelike@GetDrops": { + "next": [ + "Phantom@Roguelike@GetDrop1", + "Phantom@Roguelike@GetDrop2", + "Phantom@Roguelike@GetDrop3", + "Phantom@Roguelike@GetDropSelect", + "Phantom@Roguelike@GetDropRecruit" + ] + }, "Phantom@Roguelike@InitalDrop": {}, "Phantom@Roguelike@LastReward": {}, "Phantom@Roguelike@LastReward2": {}, "Phantom@Roguelike@LastReward3": {}, "Phantom@Roguelike@LastRewardConfirm": {}, "Phantom@Roguelike@LastRewardRand": {}, - "Phantom@Roguelike@MissionFailedFlag": { - "roi": [ - 504, - 163, - 480, - 267 - ], - "next": [ - "Phantom@Roguelike@NextLevel#next", - "Phantom@Roguelike@ClickToStartPoint" - ] - }, + "Phantom@Roguelike@MissionFailedFlag": {}, "Phantom@Roguelike@MissionFailedFlag2": {}, "Phantom@Roguelike@NextLevel": { "text": [ @@ -8360,37 +8333,11 @@ "template": "Roguelike@StageTraderLeaveConfirm.png", "exceededNext": [ "Phantom@Roguelike@ExitThenAbandon" - ], - "next": [ - "Phantom@Roguelike@NextLevel#next" ] }, "Phantom@Roguelike@StartExplore": {}, "Phantom@Roguelike@TodoEnter": {}, "Mizuki@Roguelike@Abandon": {}, - "Mizuki@Roguelike@Begin": { - "algorithm": "JustReturn", - "next": [ - "Mizuki@Roguelike@ChooseDifficulty", - "Mizuki@Roguelike@StartExplore", - "Mizuki@Roguelike@NextLevel#next", - "Mizuki@Roguelike@CloseEvent", - "Mizuki@Roguelike@NextLevel", - "Mizuki@Roguelike@ExitThenAbandon", - "Mizuki@Roguelike@Abandon", - "Mizuki@Roguelike@TodaysSupplies", - "Mizuki@Roguelike@Main", - "Mizuki@Roguelike@CloseAnno", - "Mizuki@Roguelike@TodoEnter", - "Mizuki@Roguelike@Continue", - "Mizuki@Roguelike@ReturnTo", - "Mizuki@Roguelike@ReturnToConfirm", - "Mizuki@Roguelike@OfflineConfirm", - "Mizuki@Roguelike@StartToWakeUp", - "Mizuki@Roguelike@StartUpConnectingFlag", - "Mizuki@Roguelike@FromStageSN" - ] - }, "Mizuki@Roguelike@ChooseDifficulty": {}, "Mizuki@Roguelike@ChooseOper": { "next": [ @@ -8399,41 +8346,6 @@ "Mizuki@Roguelike@ChooseOperConfirm" ] }, - "Mizuki@Roguelike@ClickToDrops": { - "next": [ - "Mizuki@Roguelike@NextLevel#next", - "Mizuki@Roguelike@ChooseOperFlag", - "Mizuki@Roguelike@StageEncounterSpecialClose", - "Mizuki@Roguelike@TraderRandomShopping", - "Mizuki@Roguelike@StageTraderLeave", - "Mizuki@Roguelike@DropsFlag", - "Mizuki@Roguelike@TodaysSupplies", - "Mizuki@Roguelike@Main", - "Mizuki@Roguelike@CloseAnno", - "Mizuki@Roguelike@OfflineConfirm", - "Mizuki@Roguelike@StartToWakeUp", - "Mizuki@Roguelike@StartUpConnectingFlag", - "Mizuki@Roguelike@ClickToDrops" - ] - }, - "Mizuki@Roguelike@ClickToStartPoint": { - "next": [ - "Mizuki@Roguelike@StartExplore", - "Mizuki@Roguelike@NextLevel#next", - "Mizuki@Roguelike@GamePass", - "Mizuki@Roguelike@TodaysSupplies", - "Mizuki@Roguelike@Main", - "Mizuki@Roguelike@CloseAnno", - "Mizuki@Roguelike@TodoEnter", - "Mizuki@Roguelike@Continue", - "Mizuki@Roguelike@ReturnTo", - "Mizuki@Roguelike@ReturnToConfirm", - "Mizuki@Roguelike@OfflineConfirm", - "Mizuki@Roguelike@StartToWakeUp", - "Mizuki@Roguelike@StartUpConnectingFlag", - "Mizuki@Roguelike@ClickToStartPoint" - ] - }, "Mizuki@Roguelike@CloseCollection": { "next": [ "Mizuki@Roguelike@LastReward", @@ -8579,12 +8491,7 @@ "Mizuki@Roguelike@DropsFlag": { "template": "Roguelike@DropsFlag.png", "next": [ - "Mizuki@Roguelike@GetDrop1", - "Mizuki@Roguelike@GetDrop2", - "Mizuki@Roguelike@GetDrop3", - "Mizuki@Roguelike@GetDropSelect", - "Mizuki@Roguelike@GetDropRecruit", - "Mizuki@Roguelike@GetDropBox", + "Mizuki@Roguelike@GetDrops#next", "Mizuki@Roguelike@GetDropCompleted", "Mizuki@Roguelike@GetDropLeave", "Mizuki@Roguelike@NextLevel#next", @@ -8596,11 +8503,7 @@ "Mizuki@Roguelike@DialogSkip" ] }, - "Mizuki@Roguelike@EnterAfterRecruit": { - "next": [ - "Mizuki@Roguelike@NextLevel#next" - ] - }, + "Mizuki@Roguelike@EnterAfterRecruit": {}, "Mizuki@Roguelike@ExitThenAbandon": { "template": "Roguelike@ExitThenAbandon.png", "next": [ @@ -8624,17 +8527,8 @@ "Mizuki@Roguelike@GetDrop2": {}, "Mizuki@Roguelike@GetDrop3": {}, "Mizuki@Roguelike@GetDropBox": { + "baseTask": "Mizuki@Roguelike@GetDrop", "Doc": "漂流密匣“打开”按钮", - "action": "ClickSelf", - "cache": false, - "roi": [ - 0, - 471, - 1280, - 157 - ], - "templThreshold": 0.85, - "rearDelay": 1000, "next": [ "Mizuki@Roguelike@DropsFlag", "Mizuki@Roguelike@GetDropBoxSelect", @@ -8659,37 +8553,24 @@ "Mizuki@Roguelike@ClickToDrops" ] }, - "Mizuki@Roguelike@GetDropCompleted": { - "next": [ - "Mizuki@Roguelike@GetDrop1", - "Mizuki@Roguelike@GetDrop2", - "Mizuki@Roguelike@GetDrop3", - "Mizuki@Roguelike@GetDropSelect", - "Mizuki@Roguelike@GetDropRecruit", - "Mizuki@Roguelike@GetDropBox", - "Mizuki@Roguelike@ChooseOperFlag", - "Mizuki@Roguelike@ClickToDrops" - ] - }, + "Mizuki@Roguelike@GetDropCompleted": {}, "Mizuki@Roguelike@GetDropLeave": {}, - "Mizuki@Roguelike@GetDropRecruit": { - "next": [ - "Mizuki@Roguelike@ChooseOperFlag", - "Mizuki@Roguelike@GetDrop1", - "Mizuki@Roguelike@GetDrop2", - "Mizuki@Roguelike@GetDrop3", - "Mizuki@Roguelike@GetDropSelect", - "Mizuki@Roguelike@GetDropRecruit", - "Mizuki@Roguelike@GetDropBox", - "Mizuki@Roguelike@GetDropCompleted", - "Mizuki@Roguelike@GetDropLeave" - ] - }, + "Mizuki@Roguelike@GetDropRecruit": {}, "Mizuki@Roguelike@GetDropSelect": {}, "Mizuki@Roguelike@GetDropSelectRecruit": { "template": "Mizuki@Roguelike@GetDropRecruit.png" }, "Mizuki@Roguelike@GetDropSelectReward": {}, + "Mizuki@Roguelike@GetDrops": { + "next": [ + "Mizuki@Roguelike@GetDrop1", + "Mizuki@Roguelike@GetDrop2", + "Mizuki@Roguelike@GetDrop3", + "Mizuki@Roguelike@GetDropSelect", + "Mizuki@Roguelike@GetDropRecruit", + "Mizuki@Roguelike@GetDropBox" + ] + }, "Mizuki@Roguelike@InitalDrop": {}, "Mizuki@Roguelike@LastReward": {}, "Mizuki@Roguelike@LastReward2": {}, @@ -8722,18 +8603,7 @@ "Mizuki@Roguelike@RecruitOther" ] }, - "Mizuki@Roguelike@MissionFailedFlag": { - "roi": [ - 504, - 163, - 480, - 267 - ], - "next": [ - "Mizuki@Roguelike@NextLevel#next", - "Mizuki@Roguelike@ClickToStartPoint" - ] - }, + "Mizuki@Roguelike@MissionFailedFlag": {}, "Mizuki@Roguelike@MissionFailedFlag2": {}, "Mizuki@Roguelike@NextLevel": { "text": [ @@ -8901,9 +8771,6 @@ "exceededNext": [ "Mizuki@Roguelike@DiceConfirmThenAbandon", "Mizuki@Roguelike@ExitThenAbandon" - ], - "next": [ - "Mizuki@Roguelike@NextLevel#next" ] }, "Mizuki@Roguelike@StageWindAndRain": {