From 5865bc3bb4e6df90ffbe6d2b7630856f2f3e7b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=A8=E6=8B=89=E6=89=98=E5=8A=A0?= <151550168+Saratoga-Official@users.noreply.github.com> Date: Sat, 22 Nov 2025 18:12:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=82=89=E9=B8=BD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#14654)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: 萨米界园肉鸽添加并优化暂时撤退逻辑 * perf: 萨卡兹肉鸽关掉进入事件可能弹出的窗口 * chore: Auto update by pre-commit hooks [skip changelog] * fix: RolesConfirm不知道为啥点不进去 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- resource/tasks/Roguelike/JieGarden.json | 15 +++++++++++++++ resource/tasks/Roguelike/Sami.json | 22 ++++++++++++++++++---- resource/tasks/Roguelike/Sarkaz.json | 17 +++++++++++++++++ resource/tasks/Roguelike/base.json | 3 ++- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json index 2ca3b5426e..a33fcae19f 100644 --- a/resource/tasks/Roguelike/JieGarden.json +++ b/resource/tasks/Roguelike/JieGarden.json @@ -606,6 +606,21 @@ "JieGarden@Roguelike@MonthlySquad": { "template": "Roguelike@MonthlySquad.png" }, + "JieGarden@Roguelike@ClickToStartPoint": { + "next": [ + "JieGarden@Roguelike@MissionCompletedFlag", + "JieGarden@Roguelike@MissionFailedFlag2", + "JieGarden@Roguelike@StartExplore", + "JieGarden@Roguelike@Stages#next", + "JieGarden@Roguelike@GamePass", + "JieGarden@Roguelike@TodoEnter", + "JieGarden@Roguelike@Continue", + "JieGarden@Roguelike@ReturnButtons#next", + "JieGarden@Roguelike@ReturnConfirm", + "JieGarden@Roguelike@StartUpThemes#next", + "JieGarden@Roguelike@ClickToStartPoint" + ] + }, "JieGarden@Roguelike@MonthlySquadComms": { "template": "Roguelike@MonthlySquadComms.png", "roi": [560, 420, 190, 60] diff --git a/resource/tasks/Roguelike/Sami.json b/resource/tasks/Roguelike/Sami.json index d5b616dee5..a28f0cbc4a 100644 --- a/resource/tasks/Roguelike/Sami.json +++ b/resource/tasks/Roguelike/Sami.json @@ -541,10 +541,24 @@ "Sami@Roguelike@MissionFailedFlag": {}, "Sami@Roguelike@MissionFailedFlag2": {}, "Sami@Roguelike@MissionFailedFlag3": { - "action": "ClickSelf", - "roi": [504, 163, 480, 267], - "postDelay": 10000, - "next": ["Sami@Roguelike@MissionCompletedFlag"] + "baseTask": "Sami@Roguelike@MissionFailedFlag", + "template": "Sami@Roguelike@MissionFailedFlag3.png", + "roi": [504, 163, 480, 267] + }, + "Sami@Roguelike@ClickToStartPoint": { + "next": [ + "Sami@Roguelike@MissionCompletedFlag", + "Sami@Roguelike@MissionFailedFlag2", + "Sami@Roguelike@StartExplore", + "Sami@Roguelike@Stages#next", + "Sami@Roguelike@GamePass", + "Sami@Roguelike@TodoEnter", + "Sami@Roguelike@Continue", + "Sami@Roguelike@ReturnButtons#next", + "Sami@Roguelike@ReturnConfirm", + "Sami@Roguelike@StartUpThemes#next", + "Sami@Roguelike@ClickToStartPoint" + ] }, "Sami@Roguelike@MonthlySquad": { "template": "Roguelike@MonthlySquad.png" diff --git a/resource/tasks/Roguelike/Sarkaz.json b/resource/tasks/Roguelike/Sarkaz.json index 0b38eeec01..00a69fa0c0 100644 --- a/resource/tasks/Roguelike/Sarkaz.json +++ b/resource/tasks/Roguelike/Sarkaz.json @@ -639,6 +639,23 @@ "templThreshold": 0.96 }, "Sarkaz@Roguelike@StageEncounterEnter": {}, + "Sarkaz@Roguelike@StageEncounterJudgeClick2": { + "next": [ + "Sarkaz@Roguelike@StageEncounterContinue", + "Sarkaz@Roguelike@StageEncounterClose", + "Sarkaz@Roguelike@StageEncounterJudgeOption" + ] + }, + "Sarkaz@Roguelike@StageEncounterContinue": { + "Doc": "关掉进入事件可能弹出的窗口", + "baseTask": "Sarkaz@Roguelike@CloseCollectionContinue", + "next": ["Sarkaz@Roguelike@StageEncounterJudgeOption"] + }, + "Sarkaz@Roguelike@StageEncounterClose": { + "Doc": "关掉进入事件可能弹出的窗口", + "baseTask": "Sarkaz@Roguelike@CloseCollectionClose", + "next": ["Sarkaz@Roguelike@StageEncounterJudgeOption"] + }, "Sarkaz@Roguelike@StageEncounterLeaveConfirm": {}, "Sarkaz@Roguelike@StageEncounterOptionFree": {}, "Sarkaz@Roguelike@StageEncounterOptionLeave": {}, diff --git a/resource/tasks/Roguelike/base.json b/resource/tasks/Roguelike/base.json index 93d8d90969..1e577c8448 100644 --- a/resource/tasks/Roguelike/base.json +++ b/resource/tasks/Roguelike/base.json @@ -1095,7 +1095,8 @@ "template": "empty.png", "action": "ClickSelf", "roi": [0, 153, 1280, 529], - "next": ["Roguelike@RecruitMain"] + "postDelay": 500, + "next": ["Roguelike@RecruitMain", "#self"] }, "Roguelike@RolesDefault": { "Doc": "base_task",