From b7da52dbe8904df37dca252908dda267d4620ba7 Mon Sep 17 00:00:00 2001 From: travellerse <58685479+travellerse@users.noreply.github.com> Date: Mon, 11 May 2026 01:48:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E5=AE=9D?= =?UTF-8?q?=E4=BA=A4=E6=8D=A2/=E6=8A=95=E9=92=B1=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=93=BE=E4=BB=A5=E9=80=82=E9=85=8D=E4=BA=A4=E6=8D=A2=E9=80=9A?= =?UTF-8?q?=E5=AE=9D/=E6=8A=95=E9=92=B1=E5=90=8E=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E8=97=8F=E5=93=81=E7=9A=84=E6=83=85=E5=86=B5=20(#16553)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 修复通宝交换任务链 * fix: 修复重新投钱任务链 * fix: 更新重新投钱和交换通宝的状态机图参见信息 * fix: potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- resource/tasks/Roguelike/JieGarden.json | 61 +++++++++++------- ...oguelike@CoppersRecastConfirm-NoRetain.png | Bin 0 -> 8036 bytes 2 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersRecastConfirm-NoRetain.png 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 0000000000000000000000000000000000000000..0d78588ec8b03307c41ab8c11828189bea6b6f80 GIT binary patch literal 8036 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 m5pY^3DhMa7#!LN41pgZYtxL8LPvArV0000