更改完善部分流水线

MAWHA · Sep 25, 2024 · 8d2f7ff · 8d2f7ff
1 parent feba72b
commit 8d2f7ff
Show file tree

Hide file tree

Showing 14 changed files with 198 additions and 196 deletions.
diff --git a/assets/config/maa_pi_config.json b/assets/config/maa_pi_config.json
@@ -4,10 +4,15 @@
         "type": "Adb"
     },
     "adb": {
-        "adb_path": "D:/雷电/LDPlayer9/adb.exe",
+        "adb_path": "D:/leidian/LDPlayer9/adb.exe",
         "address": "emulator-5554",
         "config": {}
     },
     "resource": "B 服",
-    "task": []
+    "task": [
+        {
+            "name": "启动",
+            "option": []
+        }
+    ]
 }
diff --git a/assets/resource/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json
@@ -10,6 +10,7 @@
         "action": "StartApp",
         "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity",
         "post_wait_freezes": 10000,
+        "timeout": 20000,
         "next": [
             "update",
             "CloseAnnouncement",
@@ -60,14 +61,20 @@
     },
     "StartGame": {
         "recognition": "OCR",
-        "expected": "点击",
+        "expected": "提示",
         "action": "Click",
         "post_delay": 7000,
+        "target": [
+            1060,
+            80,
+            0,
+            0
+        ],
         "roi": [
-            190,
-            600,
-            130,
-            70
+            1170,
+            580,
+            100,
+            135
         ],
         "next": [
             "AccumulatedSignIn",

diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json
@@ -1,90 +1,22 @@
 {
-    "StartUp": {
+    "Start": {
         "next": [
-            "Sub_StartWuhua",
-            "Sub_CloseAnnouncement",
-            "Sub_StartGame",
-            "Sub_AccumulatedSignIn",
-            "Sub_AccumulatedSignInExit",
-            "convened",
-            "Sub_StartUp"
-        ]
-    },
-    "Sub_StartUp": {
-        "next": [
-            "StartUp"
+            "StartWuhua",
+            "update",
+            "CloseAnnouncement"
         ]
     },
-    "Sub_StartWuhua": {
+    "StartWuhua": {
         "action": "StartApp",
         "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity",
-        "post_delay": 5000,
+        "post_wait_freezes": 10000,
         "timeout": 20000,
-        "timeout_next": [
-            "advice",
-            "misinterpretation",
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement",
-            "convened"
-        ],
         "next": [
-            "advice",
-            "misinterpretation",
-            "examine",
             "update",
-            "Sub_CloseAnnouncement",
+            "CloseAnnouncement",
             "convened"
         ]
     },
-    "misinterpretation": {
-        "recognition": "OCR",
-        "expected": "曲解",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
-    "advice": {
-        "recognition": "OCR",
-        "expected": "健康游戏忠告",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "misinterpretation",
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
-    "examine": {
-        "recognition": "OCR",
-        "expected": "正在检查更新",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
     "update": {
         "recognition": "OCR",
         "expected": "终端数据更新",
@@ -99,7 +31,7 @@
         "timeout": 20000,
         "timeout_next": [
             "update",
-            "Sub_CloseAnnouncement"
+            "CloseAnnouncement"
         ],
         "target": [
             765,
@@ -108,10 +40,10 @@
             0
         ],
         "next": [
-            "Sub_CloseAnnouncement"
+            "CloseAnnouncement"
         ]
     },
-    "Sub_CloseAnnouncement": {
+    "CloseAnnouncement": {
         "recognition": "TemplateMatch",
         "template": "Startup/12.png",
         "roi": [
@@ -121,70 +53,82 @@
             157
         ],
         "action": "Click",
-        "timeout": 20000,
-        "timeout_next": [
-            "Sub_CloseAnnouncement",
-            "Sub_StartGame"
-        ],
+        "post_delay": 5000,
         "next": [
-            "Sub_StartGame"
+            "StartGame",
+            "CloseAnnouncement"
         ]
     },
-    "Sub_StartGame": {
+    "StartGame": {
         "recognition": "OCR",
-        "expected": "抵制不良游戏",
+        "expected": "提示",
         "action": "Click",
-        "next": [
-            "Sub_AccumulatedSignIn"
-        ]
-    },
-    "Sub_AccumulatedSignIn": {
-        "action": "Click",
-        "post_delay": 10000,
-        "timeout": 20000,
-        "timeout_next": [
-            "Sub_AccumulatedSignIn",
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
-            "convened"
+        "post_delay": 7000,
+        "target": [
+            1060,
+            80,
+            0,
+            0
+        ],
+        "roi": [
+            1170,
+            580,
+            100,
+            135
         ],
         "next": [
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
+            "AccumulatedSignIn",
+            "AccumulatedSignInExit",
+            "GetResource",
             "convened"
         ]
     },
     "convened": {
         "recognition": "TemplateMatch",
         "template": "Startup/11.png",
+        "action": "DoNothing",
         "roi": [
             906,
             340,
             170,
             205
         ],
+        "post_delay": 2000
+    },
+    "AccumulatedSignIn": {
+        "action": "Click",
+        "target": [
+            800,
+            350,
+            0,
+            0
+        ],
         "post_delay": 3000,
         "next": [
-            "stop"
+            "GetResource",
+            "AccumulatedSignInExit",
+            "convened",
+            "AccumulatedSignIn"
         ]
     },
-    "Sub_AccumulatedSignInExit": {
+    "AccumulatedSignInExit": {
         "recognition": "TemplateMatch",
         "template": "Startup/AccumulatedSignInExit.png",
         "action": "Click",
         "post_delay": 3000,
         "next": [
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
-            "stop"
+            "GetResource",
+            "AccumulatedSignInExit",
+            "convened"
         ]
     },
-    "Sub_GetResource": {
+    "GetResource": {
         "recognition": "OCR",
         "expected": "获得物资",
         "action": "Click",
         "next": [
-            "Sub_AccumulatedSignInExit"
+            "AccumulatedSignInExit",
+            "convened"
         ]
     }
 }
diff --git a/assets/resource_picli/base/pipeline/2_collect_operators.json b/assets/resource_picli/base/pipeline/2_collect_operators.json
@@ -2,7 +2,7 @@
     "Collect_operators": {
         "next": [
             "Collecting",
-            "Sub_ReceiveOperators"
+            "ReceiveOperators"
         ]
     },
     "Collecting": {
@@ -11,17 +11,18 @@
         "action": "Click",
         "post_delay": 2000,
         "next": [
-            "Sub_ReceiveOperators",
+            "ReceiveOperators",
             "ReceiveCollect"
         ]
     },
-    "Sub_ReceiveOperators": {
+    "ReceiveOperators": {
         "recognition": "TemplateMatch",
         "template": "Collect/02.png",
         "action": "Click",
         "post_delay": 2000,
         "next": [
-            "ReceiveCollect"
+            "ReceiveCollect",
+            "ReceiveOperators"
         ]
     },
     "ReceiveCollect": {

diff --git a/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json b/assets/resource_picli/base/pipeline/3-(2)_vending_machine.json
@@ -3,7 +3,9 @@
         "next": [
             "vending_machine",
             "vending_machine_reward",
-            "entry_dispath_two"
+            "entry_dispath_two",
+            "vending_home",
+            "entry_back"
         ]
     },
     "entry_dispath_two": {
@@ -31,7 +33,7 @@
         "next": [
             "vending_machine_reward",
             "vending_home",
-            "dc_back"
+            "entry_back"
         ]
     },
     "vending_home": {
@@ -61,7 +63,8 @@
             34
         ],
         "next": [
-            "coin_flip"
+            "coin_flip",
+            "vending_machine_reward"
         ]
     },
     "coin_flip": {
@@ -76,7 +79,8 @@
             232
         ],
         "next": [
-            "coin_flip_click_space"
+            "coin_flip_click_space",
+            "coin_flip"
         ]
     },
     "coin_flip_click_space": {
@@ -91,6 +95,7 @@
             480
         ],
         "next": [
+            "coin_flip_click_space",
             "vending_home"
         ]
     },