refactor: StartUp大重构 (#263)

看起来改的多，其实主要是将StartUp任务改了下，一部分sub任务直接重构为非sub任务放入interrupt，其它文件的sub_StartUp替换为ReturnMain并放入interrupt；特别地，留了个sub_BackButton、Sub_ObtainedAwards，主要是还某些任务还在用，而且目测不能直接放入interrupt，这个先留着。 --------- Co-authored-by: a16797 <[email protected]>
MaaXYZ · Nov 25, 2024 · 4cf6427 · 4cf6427
1 parent 960d455
commit 4cf6427
Show file tree

Hide file tree

Showing 22 changed files with 240 additions and 247 deletions.
diff --git a/assets/resource/base/image/StartUp/GameLoading2.png b/assets/resource/base/image/StartUp/GameLoading2.png
diff --git a/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json b/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json
@@ -1,8 +1,10 @@
 {
     "ANightmareAtGreenLake": {
         "next": [
-            "ANightmareAtGreenLakeEnterTheShow",
-            "Sub_StartUp"
+            "ANightmareAtGreenLakeEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "ANightmareAtGreenLakeEnterTheShow": {

diff --git a/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json b/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json
@@ -6,8 +6,10 @@
             "EITM_入口2",
             "EITM_入口1",
             "EITM_重置",
-            "EITM_退出",
-            "Sub_StartUp"
+            "EITM_退出"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "EITM_入口1": {

diff --git a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json
@@ -1,8 +1,10 @@
 {
     "FloorItToTheGoldenCity": {
         "next": [
-            "FloorItToTheGoldenCityEnterTheShow",
-            "Sub_StartUp"
+            "FloorItToTheGoldenCityEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "FloorItToTheGoldenCityEnterTheShow": {
@@ -35,8 +37,10 @@
     },
     "FloorItToTheGoldenCity_StagePromotion": {
         "next": [
-            "FloorItToTheGoldenCityEnterTheShow_StagePromotion",
-            "Sub_StartUp"
+            "FloorItToTheGoldenCityEnterTheShow_StagePromotion"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "FloorItToTheGoldenCityEnterTheShow_StagePromotion": {
@@ -69,4 +73,4 @@
             "ActivityStageModelSellect"
         ]
     }
-}
+}
diff --git a/assets/resource/base/pipeline/activity/GoodbyeRaya.json b/assets/resource/base/pipeline/activity/GoodbyeRaya.json
@@ -1,8 +1,10 @@
 {
     "GoodbyeRaya": {
         "next": [
-            "GoodbyeRayaEnterTheShow",
-            "Sub_StartUp"
+            "GoodbyeRayaEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "GoodbyeRayaEnterTheShow": {

diff --git a/assets/resource/base/pipeline/activity/JourneytoMorPankh.json b/assets/resource/base/pipeline/activity/JourneytoMorPankh.json
@@ -1,8 +1,10 @@
 {
     "JourneytoMorPankh": {
         "next": [
-            "JourneytoMorPankhEnterTheShow",
-            "Sub_StartUp"
+            "JourneytoMorPankhEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "JourneytoMorPankhEnterTheShow": {
@@ -36,4 +38,4 @@
             "SwipeLeftAndFindStage"
         ]
     }
-}
+}
diff --git a/assets/resource/base/pipeline/activity/NotesOnShuoRi.json b/assets/resource/base/pipeline/activity/NotesOnShuoRi.json
@@ -1,8 +1,10 @@
 {
     "NotesOnShuoRi": {
         "next": [
-            "NotesOnShuoRiEnterTheShow",
-            "Sub_StartUp"
+            "NotesOnShuoRiEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "NotesOnShuoRiEnterTheShow": {

diff --git a/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json b/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json
@@ -1,8 +1,10 @@
 {
     "RevivalTheUluruGames": {
         "next": [
-            "RevivalTheUluruGamesEnterTheShow",
-            "Sub_StartUp"
+            "RevivalTheUluruGamesEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "RevivalTheUluruGamesEnterTheShow": {
@@ -34,8 +36,10 @@
     },
     "RevivalTheUluruGames_Reproduction": {
         "next": [
-            "RevivalTheUluruGames_ReproductionEnterTheShow",
-            "Sub_StartUp"
+            "RevivalTheUluruGames_ReproductionEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "RevivalTheUluruGames_ReproductionEnterTheShow": {
@@ -72,4 +76,4 @@
         "action": "Click",
         "next": "SwipeLeftAndFindStage"
     }
-}
+}
diff --git a/assets/resource/base/pipeline/activity/Route77.json b/assets/resource/base/pipeline/activity/Route77.json
@@ -1,8 +1,10 @@
 {
     "Route77": {
         "next": [
-            "Route77EnterTheShow",
-            "Sub_StartUp"
+            "Route77EnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "Route77EnterTheShow": {
@@ -35,8 +37,10 @@
     },
     "Route77_StagePromotion": {
         "next": [
-            "Route77EnterTheShow_StagePromotion",
-            "Sub_StartUp"
+            "Route77EnterTheShow_StagePromotion"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "Route77EnterTheShow_StagePromotion": {
@@ -69,4 +73,4 @@
             "ActivityStageModelSellect"
         ]
     }
-}
+}
diff --git a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json
@@ -1,8 +1,10 @@
 {
     "ThePrisonerintheCave": {
         "next": [
-            "ThePrisonerintheCaveEnterTheShow",
-            "Sub_StartUp"
+            "ThePrisonerintheCaveEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "ThePrisonerintheCaveEnterTheShow": {

diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json
@@ -2532,8 +2532,10 @@
         ],
         "action": "Click",
         "next": [
-            "SOD_Main",
-            "Sub_BackButton"
+            "SOD_Main"
+        ],
+        "interrupt": [
+            "BackButton"
         ]
     },
     "SOD_Skip": {

diff --git a/assets/resource/base/pipeline/all_in.json b/assets/resource/base/pipeline/all_in.json
@@ -303,8 +303,10 @@
         "next": [
             "EatCandyWithin24H",
             "Sub_QuitEatCandyPage",
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     }
 }
diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
@@ -4,9 +4,10 @@
             "Sub_MailBadge",
             "Sub_JukeboxBadge",
             "Sub_DailyBadge",
-            "HomeFlag",
-            "Sub_ObtainedAwards",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "Sub_MailBadge": {
@@ -75,8 +76,10 @@
             163
         ],
         "next": [
-            "HomeFlag",
-            "Sub_BackButton"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "BackButton"
         ]
     },
     "Sub_DailyBadge": {
@@ -95,8 +98,10 @@
         "next": [
             "Sub_CollectDailyAwards",
             "Sub_ObtainedAwards",
-            "WeeklyAwardsBadge",
-            "Sub_BackButton"
+            "WeeklyAwardsBadge"
+        ],
+        "interrupt": [
+            "BackButton"
         ]
     },
     "Sub_CollectDailyAwards": {

diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json
@@ -1,8 +1,10 @@
 {
     "Combat": {
         "next": [
-            "EnterTheShow",
-            "Sub_StartUp"
+            "EnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "EnterTheShow": {
@@ -748,8 +750,10 @@
         "action": "Click",
         "target": "StartReplay",
         "next": [
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "Replaying": {
@@ -795,8 +799,10 @@
         "next": [
             "Victory",
             "AllIn",
-            "HomeFlag",
-            "Sub_HomeButton"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "HomeButton"
         ]
     }
 }
diff --git a/assets/resource/base/pipeline/combat_activity.json b/assets/resource/base/pipeline/combat_activity.json
@@ -1,8 +1,10 @@
 {
     "ActivityEntry": {
         "next": [
-            "ActivityEnterTheShow",
-            "Sub_StartUp"
+            "ActivityEnterTheShow"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "ActivityEnterTheShow": {

diff --git a/assets/resource/base/pipeline/eat_candy.json b/assets/resource/base/pipeline/eat_candy.json
@@ -61,8 +61,10 @@
         ],
         "next": [
             "Sub_QuitEatCandyPage",
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "EatMiniCandy24H": {
@@ -149,8 +151,10 @@
         "next": [
             "SmallCandy24H",
             "Sub_QuitEatCandyPage",
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "SmallCandy24HNotEnough": {
@@ -165,8 +169,10 @@
         "next": [
             "BigCandy24H",
             "Sub_QuitEatCandyPage",
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "BigCandy24HNotEnough": {
@@ -180,8 +186,10 @@
         ],
         "next": [
             "Sub_QuitEatCandyPage",
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "Sub_QuitEatCandyPage": {

diff --git a/assets/resource/base/pipeline/psychube.json b/assets/resource/base/pipeline/psychube.json
@@ -4,8 +4,10 @@
             "PsychubeEnterTheShow",
             "PsychubeResourceStages",
             "FreePsychubeStages",
-            "PsychubeStages_7",
-            "Sub_StartUp"
+            "PsychubeStages_7"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "PsychubeEnterTheShow": {
@@ -63,8 +65,10 @@
             297
         ],
         "next": [
-            "HomeFlag",
-            "Sub_StartUp"
+            "HomeFlag"
+        ],
+        "interrupt": [
+            "ReturnMain"
         ]
     },
     "PsychubeStages_7": {