修复我的乐子

MAWHA · Oct 1, 2024 · a125c42 · a125c42
1 parent f73d56d
commit a125c42
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 20 deletions.
diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json
@@ -9,5 +9,10 @@
             "name": "启动",
             "option": []
         }
-    ]
+    ],
+    "adb": {
+        "adb_path": "D:/leidian/LDPlayer9/adb.exe",
+        "address": "emulator-5554",
+        "config": {}
+    }
 }
diff --git a/assets/resource/base/pipeline/11_(02)_snowscape.json b/assets/resource/base/pipeline/11_(02)_snowscape.json
@@ -2035,7 +2035,7 @@
         "expected": "代班",
         "post_delay": 30000,
         "timeout": 150000,
-        "on_error": [
+        "timeout_next": [
             "fail",
             "war_seven"
         ],

diff --git a/assets/resource/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json
@@ -29,7 +29,7 @@
         "action": "Click",
         "post_delay": 10000,
         "timeout": 20000,
-        "on_error": [
+        "timeout_next": [
             "update",
             "CloseAnnouncement"
         ],

diff --git a/assets/resource_picli/base/pipeline/11_(02)_snowscape.json b/assets/resource_picli/base/pipeline/11_(02)_snowscape.json
@@ -2075,16 +2075,16 @@
     "remind_all": {
         "recognition": "OCR",
         "action": "DoNothing",
-        "expected": "代班",
+        "expected": [
+            "代班",
+            "敌方"
+        ],
         "post_delay": 30000,
         "timeout": 150000,
-        "on_error": [
-            "fail",
-            "war_seven"
-        ],
         "next": [
             "fail",
-            "war_seven"
+            "war_seven",
+            "remind_all"
         ]
     },
     "war_seven": {

diff --git a/assets/resource_picli/base/pipeline/14_activity.json b/assets/resource_picli/base/pipeline/14_activity.json
@@ -484,10 +484,6 @@
         "recognition": "DirectHit",
         "action": "DoNothing",
         "post_delay": 97000,
-        "timeout": 20000,
-        "on_error": [
-            "activity-bazaar-two"
-        ],
         "next": [
             "activity-bazaar-two"
         ]

diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json
@@ -10,7 +10,7 @@
         "action": "StartApp",
         "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity",
         "post_wait_freezes": 10000,
-        "timeout": 20000,
+        "timeout": 120000,
         "next": [
             "update",
             "CloseAnnouncement",
@@ -28,10 +28,9 @@
         ],
         "action": "Click",
         "post_delay": 10000,
-        "timeout": 20000,
-        "on_error": [
-            "update",
-            "CloseAnnouncement"
+        "timeout": 120000,
+        "timeout_next": [
+            "update-detect"
         ],
         "target": [
             765,
@@ -43,6 +42,17 @@
             "CloseAnnouncement"
         ]
     },
+    "update-detect": {
+        "recognition": "OCR",
+        "expected": "更新",
+        "action": "DoNothing",
+        "post_delay": 10000,
+        "timeout": 120000,
+        "next": [
+            "CloseAnnouncement",
+            "update"
+        ]
+    },
     "CloseAnnouncement": {
         "recognition": "TemplateMatch",
         "template": "Startup/12.png",

diff --git a/assets/resource_picli/base/pipeline/6_(02)water.json b/assets/resource_picli/base/pipeline/6_(02)water.json
@@ -5,7 +5,6 @@
             "water",
             "max_water",
             "Swipe_drink",
-            "drink",
             "drink_a_2day_water"
         ]
     },
@@ -67,7 +66,6 @@
             "max_water",
             "sub_drink",
             "quit_fork",
-            "max_water",
             "click_water"
         ]
     },