perf: 对局外演绎&雨中悬想&深眠进行部分优化，增强深眠运行稳定性 (MaaXYZ#241)

a16797 · Nov 13, 2024 · e75bcaa · e75bcaa
1 parent 22619c5
commit e75bcaa
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 99 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -92,7 +92,7 @@
         },
         {
             "name": "雨中悬想：迷思海（“寻思”每周扫荡）",
-            "entry": "RevereisInTheRain"
+            "entry": "ReveriesInTheRain"
         },
         {
             "name": "关闭游戏",
@@ -115,12 +115,7 @@
         },
         {
             "name": "局外演绎：黄昏的音序（勿挂资料片）",
-            "entry": "SeriesOfDusks",
-            "pipeline_override": {
-                "EnterTheShow": {
-                    "next": "OutsideDeduction"
-                }
-            }
+            "entry": "SeriesOfDusks"
         }
     ],
     "recognizer": {},

diff --git a/assets/resource/base/image/OutsideDeduction/SOD_MENU.png b/assets/resource/base/image/OutsideDeduction/SOD_MENU.png
diff --git a/...e/RevereisInTheRain/DepthsOfMythEntry.png → ...e/ReveriesInTheRain/DepthsOfMythEntry.png b/...e/RevereisInTheRain/DepthsOfMythEntry.png → ...e/ReveriesInTheRain/DepthsOfMythEntry.png
diff --git a/...e/image/RevereisInTheRain/PlayTimesX1.png → ...e/image/ReveriesInTheRain/PlayTimesX1.png b/...e/image/RevereisInTheRain/PlayTimesX1.png → ...e/image/ReveriesInTheRain/PlayTimesX1.png
diff --git a/...e/image/RevereisInTheRain/PlayTimesX2.png → ...e/image/ReveriesInTheRain/PlayTimesX2.png b/...e/image/RevereisInTheRain/PlayTimesX2.png → ...e/image/ReveriesInTheRain/PlayTimesX2.png
diff --git a/...e/image/RevereisInTheRain/PlayTimesX3.png → ...e/image/ReveriesInTheRain/PlayTimesX3.png b/...e/image/RevereisInTheRain/PlayTimesX3.png → ...e/image/ReveriesInTheRain/PlayTimesX3.png
diff --git a/...e/image/RevereisInTheRain/PlayTimesX4.png → ...e/image/ReveriesInTheRain/PlayTimesX4.png b/...e/image/RevereisInTheRain/PlayTimesX4.png → ...e/image/ReveriesInTheRain/PlayTimesX4.png
diff --git a/...sInTheRain/RevereisInTheRainMainEntry.png → ...sInTheRain/ReveriesInTheRainMainEntry.png b/...sInTheRain/RevereisInTheRainMainEntry.png → ...sInTheRain/ReveriesInTheRainMainEntry.png
diff --git a/.../image/RevereisInTheRain/TranceButton.png → .../image/ReveriesInTheRain/TranceButton.png b/.../image/RevereisInTheRain/TranceButton.png → .../image/ReveriesInTheRain/TranceButton.png
diff --git a/...e/image/RevereisInTheRain/TranceClose.png → ...e/image/ReveriesInTheRain/TranceClose.png b/...e/image/RevereisInTheRain/TranceClose.png → ...e/image/ReveriesInTheRain/TranceClose.png
diff --git a/.../pipeline/activity/RevereisInTheRain.json → .../pipeline/activity/ReveriesInTheRain.json b/.../pipeline/activity/RevereisInTheRain.json → .../pipeline/activity/ReveriesInTheRain.json
@@ -1,36 +1,21 @@
 {
-    "RevereisInTheRain": {
+    "ReveriesInTheRain": {
         "doc": "常驻活动：雨中悬想",
         "next": [
-            "RevereisInTheRainMainFlag",
-            "RevereisInTheRainHomeFlag"
+            "ReveriesInTheRainMainFlag"
         ],
         "interrupt": [
+            "ReveriesInTheRainMainEntry",
+            "EnterTheShow",
+            "HomeButton",
+            "BackButton",
             "StartUp"
         ]
     },
-    "RevereisInTheRainHomeFlag": {
-        "doc": "判断位于全局主页面",
-        "recognition": "TemplateMatch",
-        "template": "Combat/EnterTheShow.png",
-        "roi": [
-            926,
-            221,
-            229,
-            153
-        ],
-        "next": [
-            "RevereisInTheRainMainFlag"
-        ],
-        "interrupt": [
-            "RevereisInTheRainMainEntry",
-            "EnterTheShow"
-        ]
-    },
-    "RevereisInTheRainMainEntry": {
+    "ReveriesInTheRainMainEntry": {
         "doc": "进入雨中悬想主页面",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/RevereisInTheRainMainEntry.png",
+        "template": "ReveriesInTheRain/ReveriesInTheRainMainEntry.png",
         "roi": [
             1097,
             564,
@@ -40,7 +25,7 @@
         "action": "Click",
         "post_wait_freezes": 300
     },
-    "RevereisInTheRainMainFlag": {
+    "ReveriesInTheRainMainFlag": {
         "doc": "判断位于雨中悬想主页面",
         "recognition": "OCR",
         "expected": "迷思原型",
@@ -82,7 +67,7 @@
     "DepthsOfMythEntry": {
         "doc": "进入迷思海",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/DepthsOfMythEntry.png",
+        "template": "ReveriesInTheRain/DepthsOfMythEntry.png",
         "roi": [
             921,
             484,
@@ -107,7 +92,7 @@
     "DepthsOfMythMainFlag": {
         "doc": "判断位于迷思海主页面",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/TranceButton.png",
+        "template": "ReveriesInTheRain/TranceButton.png",
         "roi": [
             914,
             0,
@@ -125,7 +110,7 @@
     "TranceButtonClick": {
         "doc": "点击“寻思”按钮",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/TranceButton.png",
+        "template": "ReveriesInTheRain/TranceButton.png",
         "roi": [
             914,
             0,
@@ -332,7 +317,7 @@
     "TrancePlayTimesX1": {
         "doc": "当前预消耗“寻思”X1",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/PlayTimesX1.png",
+        "template": "ReveriesInTheRain/PlayTimesX1.png",
         "roi": [
             743,
             418,
@@ -346,7 +331,7 @@
     "TrancePlayTimesX2": {
         "doc": "当前预消耗“寻思”X2",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/PlayTimesX2.png",
+        "template": "ReveriesInTheRain/PlayTimesX2.png",
         "roi": [
             743,
             418,
@@ -360,7 +345,7 @@
     "TrancePlayTimesX3": {
         "doc": "当前预消耗“寻思”X3",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/PlayTimesX3.png",
+        "template": "ReveriesInTheRain/PlayTimesX3.png",
         "roi": [
             743,
             418,
@@ -374,7 +359,7 @@
     "TrancePlayTimesX4": {
         "doc": "当前预消耗“寻思”X4",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/PlayTimesX4.png",
+        "template": "ReveriesInTheRain/PlayTimesX4.png",
         "roi": [
             743,
             418,
@@ -407,7 +392,7 @@
     "TranceClose": {
         "doc": "关闭迷思海“寻思”页面",
         "recognition": "TemplateMatch",
-        "template": "RevereisInTheRain/TranceClose.png",
+        "template": "ReveriesInTheRain/TranceClose.png",
         "roi": [
             1162,
             0,

diff --git a/...e/pipeline/activity/outsidededuction.json → .../pipeline/activity/outside_deduction.json b/...e/pipeline/activity/outsidededuction.json → .../pipeline/activity/outside_deduction.json
@@ -1,12 +1,15 @@
 {
     "SeriesOfDusks": {
         "next": [
-            "EnterTheShow",
-            "SODStop",
-            "SODStart",
+            "SOD_MENU",
+            "SOD_Main"
+        ],
+        "interrupt": [
             "OutsideDeduction",
-            "SOD_Main",
-            "Sub_StartUp"
+            "EnterTheShow",
+            "HomeButton",
+            "BackButton",
+            "StartUp"
         ]
     },
     "OutsideDeduction": {
@@ -19,10 +22,21 @@
             104
         ],
         "action": "Click",
+        "post_wait_freezes": 300
+    },
+    "SOD_MENU": {
+        "recognition": "TemplateMatch",
+        "template": "OutsideDeduction/SOD_MENU.png",
+        "roi": [
+            196,
+            169,
+            355,
+            161
+        ],
         "next": [
             "SODStop",
             "SODStart",
-            "OutsideDeduction"
+            "SOD_Main"
         ]
     },
     "SODStop": {
@@ -1723,6 +1737,7 @@
             64
         ],
         "timeout": 40000,
+        "post_delay": 3000,
         "next": [
             "SOD_CombatVictory",
             "Sub_SOD_Dialog_1",