fix:适配新版界面

overflow65537 · Nov 7, 2024 · bbd092b · bbd092b
1 parent 1711399
commit bbd092b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 33 deletions.
diff --git a/assets/resource/base/pipeline/幻痛囚笼.json b/assets/resource/base/pipeline/幻痛囚笼.json
@@ -26,7 +26,13 @@
         ],
         "expected": "幻痛囚笼",
         "next": [
-            "需要进行任务"
+            "需要进行任务",
+            "无需进行任务"
+        ]
+    },
+    "无需进行任务": {
+        "next": [
+            "返回主菜单"
         ]
     },
     "需要进行任务": {

diff --git a/assets/resource/base/pipeline/战斗.json b/assets/resource/base/pipeline/战斗.json
@@ -91,10 +91,10 @@
     "打开拟战场域": {
         "recognition": "OCR",
         "roi": [
-            280,
-            484,
-            108,
-            38
+            47,
+            465,
+            166,
+            75
         ],
         "expected": "拟战场域",
         "action": "Click"

diff --git a/assets/resource/base/pipeline/指挥局.json b/assets/resource/base/pipeline/指挥局.json
@@ -160,27 +160,5 @@
             "返回",
             "返回_图标"
         ]
-    },
-    "返回": {
-        "recognition": "OCR",
-        "roi": [
-            76,
-            18,
-            62,
-            34
-        ],
-        "expected": "返回",
-        "action": "Click"
-    },
-    "返回_图标": {
-        "recognition": "TemplateMatch",
-        "roi": [
-            27,
-            10,
-            51,
-            53
-        ],
-        "template": "指挥局\\返回.png",
-        "action": "Click"
     }
 }
diff --git a/assets/resource/base/pipeline/通用任务.json b/assets/resource/base/pipeline/通用任务.json
@@ -18,7 +18,7 @@
         ]
     },
     "返回主菜单": {
-        "pre_delay": 1000,
+        "post_delay": 1000,
         "recognition": "OCR",
         "roi": [
             238,
@@ -34,7 +34,7 @@
         ]
     },
     "返回主菜单_图标": {
-        "pre_delay": 1000,
+        "post_delay": 1000,
         "recognition": "OCR",
         "roi": [
             186,
@@ -55,6 +55,7 @@
         ]
     },
     "意外点击_主界面": {
+        "post_delay": 1000,
         "recognition": "OCR",
         "roi": [
             758,
@@ -71,6 +72,30 @@
             0
         ]
     },
+    "返回": {
+        "post_delay": 1000,
+        "recognition": "OCR",
+        "roi": [
+            76,
+            18,
+            62,
+            34
+        ],
+        "expected": "返回",
+        "action": "Click"
+    },
+    "返回_图标": {
+        "post_delay": 1000,
+        "recognition": "TemplateMatch",
+        "roi": [
+            27,
+            10,
+            51,
+            53
+        ],
+        "template": "指挥局\\返回.png",
+        "action": "Click"
+    },
     "返回主菜单_err": {
         "next": [
             "返回主菜单",

diff --git a/assets/resource/base/pipeline/领取体力.json b/assets/resource/base/pipeline/领取体力.json
@@ -81,10 +81,10 @@
         "post_wait_freezes": 500,
         "recognition": "OCR",
         "roi": [
-            599,
-            643,
-            100,
-            35
+            1073,
+            632,
+            162,
+            60
         ],
         "expected": [
             "免费",