feat: 新增批量分派魔精 (#250)

使用批量分派魔精时，如果有心情值归零的魔精，能自动让它去休息，并更换其他魔精
MaaXYZ · Nov 17, 2024 · 715374d · 715374d
1 parent 94c1318
commit 715374d
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 44 deletions.
diff --git a/assets/resource/base/image/Wilderness/SummonlngSuccess.png b/assets/resource/base/image/Wilderness/SummonlngSuccess.png
diff --git a/assets/resource/base/image/Wilderness/UniqueParxxxx.png b/assets/resource/base/image/Wilderness/UniqueParxxxx.png
diff --git a/assets/resource/base/image/empty.png b/assets/resource/base/image/empty.png
diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json
@@ -115,29 +115,10 @@
             "CollectTrust",
             "TrustDialogueNext",
             "TrustDialogueInteraction",
-            "Sub_TestCritterTraining",
             "Sub_HomeButton",
             "HomeFlag"
         ]
     },
-    "Sub_TestCritterTraining": {
-        "is_sub": true,
-        "recognition": "OCR",
-        "expected": "培训位置",
-        "roi": [
-            1076,
-            0,
-            204,
-            131
-        ],
-        "action": "Click",
-        "target": [
-            44,
-            44,
-            8,
-            8
-        ]
-    },
     "TrustDialogueNext": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/TrustDialogueNext.png",
@@ -207,30 +188,14 @@
             0,
             0
         ],
-        "post_delay": 500,
         "action": "Click",
+        "post_wait_freezes": 100,
         "next": [
             "CollectProduct",
-            "EnterProduct",
-            "Sub_SummonlngSuccess"
-        ]
-    },
-    "Sub_SummonlngSuccess": {
-        "is_sub": true,
-        "recognition": "TemplateMatch",
-        "template": "Wilderness/SummonlngSuccess.png",
-        "roi": [
-            528,
-            1,
-            245,
-            166
+            "EnterProduct"
         ],
-        "action": "Click",
-        "target": [
-            44,
-            44,
-            8,
-            8
+        "interrupt": [
+            "interrupt_SummonlngSuccessBack"
         ]
     },
     "CollectProduct": {
@@ -246,12 +211,11 @@
         ],
         "action": "Click",
         "next": [
-            "Sub_CollectProduct",
+            "CollectProductNext",
             "AutoSelectProducts"
         ]
     },
-    "Sub_CollectProduct": {
-        "is_sub": true,
+    "CollectProductNext": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/CollectProduct.png",
         "roi": [
@@ -277,8 +241,7 @@
         "post_delay": 200,
         "next": [
             "AutoSelectLeast",
-            "AutoSelectProducts",
-            "Sub_CollectProduct"
+            "AutoSelectProducts"
         ]
     },
     "AutoSelectLeast": {
@@ -311,6 +274,7 @@
         ],
         "action": "Click",
         "next": [
+            "AutoAssignCritters",
             "AutoSelectComfirm",
             "CollectEXP",
             "CollectMoney",
@@ -320,5 +284,113 @@
             "TrustDialogueInteraction",
             "Sub_BackButton"
         ]
+    },
+    "AutoAssignCritters": {
+        "recognition": "OCR",
+        "expected": [
+            "分派",
+            "魔精"
+        ],
+        "roi": [
+            287,
+            578,
+            287,
+            128
+        ],
+        "action": "Click",
+        "post_wait_freezes": 100,
+        "next": [
+            "UnableAssignCritters",
+            "SummonlngSuccess",
+            "AutoAssignCritters"
+        ]
+    },
+    "UnableAssignCritters": {
+        "recognition": "OCR",
+        "expected": [
+            "当前",
+            "分派",
+            "魔精"
+        ],
+        "roi": [
+            1167,
+            104,
+            92,
+            37
+        ],
+        "action": "Click",
+        "target": [
+            44,
+            44,
+            8,
+            8
+        ],
+        "next": [
+            "CollectEXP",
+            "CollectMoney",
+            "CollectAwards",
+            "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_BackButton"
+        ]
+    },
+    "SummonlngSuccess": {
+        "recognition": "TemplateMatch",
+        "template": "Wilderness/UniqueParxxxx.png",
+        "roi": [
+            214,
+            109,
+            834,
+            611
+        ],
+        "action": "Click",
+        "next": [
+            "SummonlngSuccess",
+            "SummonlngSuccessBack"
+        ]
+    },
+    "SummonlngSuccessBack": {
+        "recognition": "TemplateMatch",
+        "template": "Wilderness/SummonlngSuccess.png",
+        "roi": [
+            528,
+            1,
+            245,
+            166
+        ],
+        "target": [
+            44,
+            44,
+            8,
+            8
+        ],
+        "action": "Click",
+        "next": [
+            "CollectEXP",
+            "CollectMoney",
+            "CollectAwards",
+            "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_BackButton"
+        ]
+    },
+    "interrupt_SummonlngSuccessBack": {
+        "recognition": "TemplateMatch",
+        "template": "Wilderness/SummonlngSuccess.png",
+        "roi": [
+            528,
+            1,
+            245,
+            166
+        ],
+        "target": [
+            44,
+            44,
+            8,
+            8
+        ],
+        "action": "Click"
     }
 }