diff --git a/resource/tasks.json b/resource/tasks.json
index 403d4d93bf..09e898f02d 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -9019,7 +9019,8 @@
         "baseTask": "Roguelike@StageVerticalConfirm",
         "template": "Roguelike@StageVerticalConfirm.png",
         "next": [
-            "Roguelike@StageEncounterEnter"
+            "Roguelike@StageEncounterEnter",
+            "Roguelike@StageEncounterJudgeClick"
         ]
     },
     "Roguelike@StageEncounterGiveUpRecruitConfirm": {
@@ -9198,7 +9199,10 @@
         "baseTask": "Roguelike@StageVerticalConfirm",
         "template": "Roguelike@StageVerticalConfirm.png",
         "next": [
-            "Roguelike@StageSafeHouseEnter"
+            "Roguelike@StageSafeHouseEnter",
+            "Roguelike@StageSafeHouseEnter",
+            "Roguelike@StageEncounterOptions#next",
+            "Roguelike@StageEncounterClickToLeave"
         ]
     },
     "Roguelike@StageTrader": {
@@ -9229,7 +9233,12 @@
         "template": "Roguelike@StageVerticalConfirm.png",
         "baseTask": "Roguelike@StageVerticalConfirm",
         "next": [
-            "Roguelike@StageTraderEnter"
+            "Roguelike@StageTraderEnter",
+            "Roguelike@StageTraderEnter",
+            "Roguelike@StageTraderRefreshWithDice",
+            "Roguelike@StageTraderInvestSystem",
+            "Roguelike@TraderRandomShopping",
+            "Roguelike@StageTraderLeave"
         ]
     },
     "Roguelike@StageTraderInvestCancel": {
@@ -10910,6 +10919,7 @@
     },
     "Sami@Roguelike@SquadDefault": {},
     "Sami@Roguelike@StageVerticalConfirm": {
+        "action": "ClickSelf",
         "next": [
             "#back"
         ]
@@ -10957,7 +10967,8 @@
         "template": "Sami@Roguelike@StageVerticalConfirm.png",
         "baseTask": "Sami@Roguelike@StageVerticalConfirm",
         "next": [
-            "Sami@Roguelike@StageBoonsEnter"
+            "Sami@Roguelike@StageBoonsEnter",
+            "Sami@Roguelike@StageEncounterJudgeClick"
         ]
     },
     "Sami@Roguelike@StageBoskyPassage": {
@@ -11004,7 +11015,8 @@
         "template": "Sami@Roguelike@StageVerticalConfirm.png",
         "baseTask": "Sami@Roguelike@StageVerticalConfirm",
         "next": [
-            "Sami@Roguelike@StageBoskyPassageEnter"
+            "Sami@Roguelike@StageBoskyPassageEnter",
+            "Sami@Roguelike@StageEncounterJudgeClick"
         ]
     },
     "Sami@Roguelike@StageCambatDps": {
@@ -11358,7 +11370,9 @@
         "template": "Sami@Roguelike@StageVerticalConfirm.png",
         "baseTask": "Sami@Roguelike@StageVerticalConfirm",
         "next": [
-            "Sami@Roguelike@StageSafeHouseEnter"
+            "Sami@Roguelike@StageSafeHouseEnter",
+            "Sami@Roguelike@StageSafeHouseEnter",
+            "Sami@Roguelike@StageEncounterJudgeClick"
         ]
     },
     "Sami@Roguelike@StageTrader": {
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
index 028b569929..939c01feac 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
@@ -93,7 +93,7 @@ bool asst::RoguelikeBattleTaskPlugin::_run()
 void asst::RoguelikeBattleTaskPlugin::wait_until_start_button_clicked()
 {
     std::string theme = status()->get_properties(Status::RoguelikeTheme).value();
-    ProcessTask(*this, { theme + "Roguelike@WaitForStartButtonClicked" }).set_task_delay(0).set_retry_times(0).run();
+    ProcessTask(*this, { theme + "@Roguelike@WaitForStartButtonClicked" }).set_task_delay(0).set_retry_times(0).run();
 }
 
 std::string asst::RoguelikeBattleTaskPlugin::oper_name_in_config(const battle::DeploymentOper& oper) const