diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json index b77e496bb2..e9583c2428 100644 --- a/resource/tasks/Roguelike/JieGarden.json +++ b/resource/tasks/Roguelike/JieGarden.json @@ -118,7 +118,8 @@ "JieGarden@Roguelike@DropsFlag", "JieGarden@Roguelike@CloseEvent", "JieGarden@Roguelike@ChooseOperFlag", - "JieGarden@Roguelike@CoppersAfterAction" + "JieGarden@Roguelike@CoppersExchangeFinish", + "JieGarden@Roguelike@CoppersRecastResult" ] }, "JieGarden@Roguelike@CloseCollectionContinue": { @@ -130,7 +131,8 @@ "JieGarden@Roguelike@DropsFlag", "JieGarden@Roguelike@CloseEvent", "JieGarden@Roguelike@ChooseOperFlag", - "JieGarden@Roguelike@CoppersAfterAction" + "JieGarden@Roguelike@CoppersExchangeFinish", + "JieGarden@Roguelike@CoppersRecastResult" ] }, "JieGarden@Roguelike@CloseEvent": { @@ -170,16 +172,6 @@ "cache": true, "next": ["JieGarden@Roguelike@CoppersAbandonConfirm", "#self"] }, - "JieGarden@Roguelike@CoppersAfterAction": { - "template": "empty.png", - "Doc": "通宝操作完成后的跳转逻辑", - "next": [ - "JieGarden@Roguelike@CoppersExchangeFinish", - "JieGarden@Roguelike@CoppersRecastConfirm", - "JieGarden@Roguelike@CloseCollectionContinue", - "JieGarden@Roguelike@CloseCollectionClose" - ] - }, "JieGarden@Roguelike@CoppersAnalyzer-CastOCR": { "Doc": "通宝已投出状态识别 - 通宝已投出识别用 roi 为 通宝类型 的 Rect.move(me.roi)", "algorithm": "OcrDetect", @@ -254,7 +246,12 @@ "Doc": "交换通宝的确认按钮", "baseTask": "JieGarden@Roguelike@CoppersListDialogConfirm", "template": "JieGarden@Roguelike@CoppersListDialogConfirm.png", - "next": ["JieGarden@Roguelike@CoppersAfterAction", "#self"] + "next": [ + "JieGarden@Roguelike@CloseCollectionClose", + "JieGarden@Roguelike@CloseCollectionContinue", + "JieGarden@Roguelike@CoppersExchangeFinish", + "#self" + ] }, "JieGarden@Roguelike@CoppersExchangeFinish": { "Doc": "通宝交换完成后的交换按钮 (用于确认交换操作完成)", @@ -355,7 +352,7 @@ "baseTask": "JieGarden@Roguelike@CoppersBox" }, "JieGarden@Roguelike@CoppersRecast": { - "Doc": "重新投钱", + "Doc": "重新投钱 状态机的图参见 #16553", "method": "HSVCount", "roi": [1196, 70, 80, 56], "colorScales": [ @@ -370,14 +367,19 @@ ], "action": "ClickSelf", "postDelay": 600, - "next": ["JieGarden@Roguelike@CoppersRecastConfirm", "#self"] + "next": ["JieGarden@Roguelike@CoppersRecastConfirm-NoRetain", "#self"] }, - "JieGarden@Roguelike@CoppersRecastConfirm": { - "Doc": "重新投钱的确认按钮", - "baseTask": "JieGarden@Roguelike@CoppersListDialogConfirm", - "template": "JieGarden@Roguelike@CoppersListDialogConfirm.png", + "JieGarden@Roguelike@CoppersRecastConfirm-NoRetain": { + "Doc": "不留钱的重新投钱的确认按钮", + "action": "ClickSelf", + "roi": [794, 559, 381, 147], "postDelay": 3000, - "next": ["JieGarden@Roguelike@CoppersRecastResult", "JieGarden@Roguelike@CoppersAfterAction", "#self"] + "next": [ + "JieGarden@Roguelike@CloseCollectionClose", + "JieGarden@Roguelike@CloseCollectionContinue", + "JieGarden@Roguelike@CoppersRecastResult", + "#self" + ] }, "JieGarden@Roguelike@CoppersRecastResult": { "Doc": "点击投钱结果界面的对号 有时延迟时间比较长会失败 目前依赖retry_times有20次兜底", @@ -385,16 +387,29 @@ "template": "JieGarden@Roguelike@StageEncounterDrawCopperResult.png", "postDelay": 500, "roi": [1033, 462, 153, 155], - "next": ["JieGarden@Roguelike@CoppersAfterAction", "#self"] + "next": [ + "JieGarden@Roguelike@CloseCollectionClose", + "JieGarden@Roguelike@CloseCollectionContinue", + "JieGarden@Roguelike@CoppersTakeFlag", + "JieGarden@Roguelike@DropsFlag", + "JieGarden@Roguelike@CloseEvent", + "#self" + ] }, "JieGarden@Roguelike@CoppersTakeConfirm": { - "Doc": "交换通宝确认按钮 (用于插件 RoguelikeCoppersTaskPlugin 的确认操作)", + "Doc": ["交换通宝确认按钮 (用于插件 RoguelikeCoppersTaskPlugin 的确认操作) 插件出口 状态机的图参见 #16553"], "action": "ClickSelf", "template": "JieGarden@Roguelike@CoppersTakeFlag.png", "roi": [1031, 606, 249, 114], "postDelay": 500, "cache": true, - "next": ["JieGarden@Roguelike@CoppersExchangeFinish", "JieGarden@Roguelike@CoppersExchangeConfirm", "#self"] + "next": [ + "JieGarden@Roguelike@CloseCollectionClose", + "JieGarden@Roguelike@CloseCollectionContinue", + "JieGarden@Roguelike@CoppersExchangeFinish", + "JieGarden@Roguelike@CoppersExchangeConfirm", + "#self" + ] }, "JieGarden@Roguelike@CoppersTakeFlag": { "Doc": "交换通宝界面 - 拿取通宝按钮 (本任务注册了插件 RoguelikeCoppersTaskPlugin EXCHANGE 模式)", diff --git a/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersRecastConfirm-NoRetain.png b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersRecastConfirm-NoRetain.png new file mode 100644 index 0000000000..0d78588ec8 Binary files /dev/null and b/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersRecastConfirm-NoRetain.png differ