fix: 修复轶事多次返回主页面的情况；复现次数固定为4次；为轶事派遣任务补充说明 (MaaXYZ#244)

a16797 · Nov 15, 2024 · 1838283 · 1838283
1 parent 64e6b6a
commit 1838283
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 39 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -81,7 +81,7 @@
             "entry": "Awards"
         },
         {
-            "name": "轶事派遣",
+            "name": "轶事派遣（角色故事请自行阅读）",
             "entry": "Anecdote",
             "pipeline_override": {
                 "EnterTheActivityMain": {
@@ -802,30 +802,6 @@
         },
         "复现次数": {
             "cases": [
-                {
-                    "name": "x1",
-                    "pipeline_override": {
-                        "SetReplaysTimes": {
-                            "expected": "1"
-                        }
-                    }
-                },
-                {
-                    "name": "x2",
-                    "pipeline_override": {
-                        "SetReplaysTimes": {
-                            "expected": "2"
-                        }
-                    }
-                },
-                {
-                    "name": "x3",
-                    "pipeline_override": {
-                        "SetReplaysTimes": {
-                            "expected": "3"
-                        }
-                    }
-                },
                 {
                     "name": "x4",
                     "pipeline_override": {

diff --git a/assets/resource/base/pipeline/activity/ReveriesInTheRain.json b/assets/resource/base/pipeline/activity/ReveriesInTheRain.json
@@ -7,9 +7,7 @@
         "interrupt": [
             "ReveriesInTheRainMainEntry",
             "EnterTheShow",
-            "HomeButton",
-            "BackButton",
-            "StartUp"
+            "ReturnMain"
         ]
     },
     "ReveriesInTheRainMainEntry": {

diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json
@@ -7,9 +7,7 @@
         "interrupt": [
             "OutsideDeduction",
             "EnterTheShow",
-            "HomeButton",
-            "BackButton",
-            "StartUp"
+            "ReturnMain"
         ]
     },
     "OutsideDeduction": {

diff --git a/assets/resource/base/pipeline/anecdote.json b/assets/resource/base/pipeline/anecdote.json
@@ -4,13 +4,12 @@
         "next": [
             "ActivityMainFlag",
             "ActivityMainAnecdoteFlag",
-            "AnecdoteMainFlag"
+            "AnecdoteMainFlag",
+            "EnterTheActivityMain"
         ],
         "interrupt": [
-            "EnterTheActivityMain",
             "ActivityMainSelectAnecdote",
-            "ObtainedAwards",
-            "StartUp"
+            "ReturnMain"
         ]
     },
     "ActivityMainFlag": {
@@ -590,6 +589,10 @@
             183
         ],
         "action": "Click",
-        "post_wait_freezes": 300
+        "post_wait_freezes": 300,
+        "next": [
+            "ActivityMainFlag",
+            "EnterTheActivityMain"
+        ]
     }
 }
diff --git a/assets/resource/base/pipeline/limbo.json b/assets/resource/base/pipeline/limbo.json
@@ -12,9 +12,7 @@
             "ArtificialSleepwalkingAwards",
             "EnterTheShow",
             "ArtificialSleepwalking",
-            "HomeButton",
-            "BackButton",
-            "StartUp"
+            "ReturnMain"
         ]
     },
     "ArtificialSleepwalking": {

diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json
@@ -19,6 +19,25 @@
             "Sub_Start1999"
         ]
     },
+    "ReturnMain": {
+        "doc": "返回主界面（专供任务开始前使用）",
+        "next": [
+            "HomeButton",
+            "BackButton",
+            "ObtainedAwards",
+            "AccumulatedSignIn",
+            "BirthdayReward",
+            "Reward",
+            "CloseDuringFestivalDipaRewardPage",
+            "StartGame",
+            "CloseAnnouncement",
+            "Download",
+            "GameLoading",
+            "BluePochLogo",
+            "Disclaimer",
+            "Stop"
+        ]
+    },
     "Sub_StartUp": {
         "is_sub": true,
         "next": [
@@ -245,6 +264,26 @@
         "action": "Click"
     },
     "Stop": {},
+    "Reward": {
+        "recognition": "TemplateMatch",
+        "template": [
+            "StartUp/Reward.png",
+            "StartUp/Reward1.png"
+        ],
+        "roi": [
+            419,
+            90,
+            297,
+            148
+        ],
+        "action": "Click",
+        "target": [
+            0,
+            0,
+            526,
+            590
+        ]
+    },
     "Sub_Reward": {
         "is_sub": true,
         "recognition": "TemplateMatch",
@@ -266,6 +305,17 @@
             590
         ]
     },
+    "AccumulatedSignIn": {
+        "recognition": "TemplateMatch",
+        "template": "StartUp/AccumulatedSignIn.png",
+        "roi": [
+            562,
+            483,
+            347,
+            163
+        ],
+        "action": "Click"
+    },
     "Sub_AccumulatedSignIn": {
         "is_sub": true,
         "recognition": "TemplateMatch",
@@ -278,6 +328,18 @@
         ],
         "action": "Click"
     },
+    "BirthdayReward": {
+        "recognition": "TemplateMatch",
+        "template": "StartUp/BirthdayReward.png",
+        "threshold": 0.8,
+        "roi": [
+            803,
+            273,
+            121,
+            121
+        ],
+        "action": "Click"
+    },
     "Sub_BirthdayReward": {
         "is_sub": true,
         "recognition": "TemplateMatch",
@@ -291,6 +353,18 @@
         ],
         "action": "Click"
     },
+    "CloseDuringFestivalDipaRewardPage": {
+        "green_mask": true,
+        "recognition": "TemplateMatch",
+        "template": "StartUp/CloseDuringFestivalDipaRewardPage.png",
+        "roi": [
+            1069,
+            68,
+            138,
+            138
+        ],
+        "action": "Click"
+    },
     "Sub_CloseDuringFestivalDipaRewardPage": {
         "is_sub": true,
         "green_mask": true,