feat：新增简易魔精收取生产。fix：修复签到界面叉不掉。

MaaXYZ · Sep 21, 2024 · 392ef7f · 392ef7f
1 parent 4815a3e
commit 392ef7f
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 49 deletions.
diff --git a/assets/resource/base/image/StartUp/CloseDuringFestivalDipaRewardPage.png b/assets/resource/base/image/StartUp/CloseDuringFestivalDipaRewardPage.png
diff --git a/assets/resource/base/image/Wilderness/CollectProduct.png b/assets/resource/base/image/Wilderness/CollectProduct.png
diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json
@@ -261,6 +261,7 @@
     },
     "Sub_CloseDuringFestivalDipaRewardPage": {
         "is_sub": true,
+        "green_mask": true,
         "recognition": "TemplateMatch",
         "template": "StartUp/CloseDuringFestivalDipaRewardPage.png",
         "roi": [

diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json
@@ -23,6 +23,7 @@
         "action": "Click",
         "next": [
             "EnterWilderness",
+            "EnterProduct",
             "CollectEXP",
             "CollectMoney",
             "CollectAwards",
@@ -79,47 +80,6 @@
             "HomeFlag"
         ]
     },
-    "CollectEXP备份": {
-        "recognition": "TemplateMatch",
-        "template": "Wilderness/CollectEXP.png",
-        "roi": [
-            455,
-            87,
-            139,
-            134
-        ],
-        "action": "Click",
-        "post_wait_freezes": 1,
-        "next": [
-            "CollectMoney",
-            "CollectAwards",
-            "CollectTrust",
-            "TrustDialogueNext",
-            "TrustDialogueInteraction",
-            "Sub_HomeButton",
-            "HomeFlag"
-        ]
-    },
-    "CollectMoney备份": {
-        "recognition": "TemplateMatch",
-        "template": "Wilderness/CollectMoney.png",
-        "roi": [
-            685,
-            34,
-            132,
-            134
-        ],
-        "action": "Click",
-        "post_wait_freezes": 1,
-        "next": [
-            "CollectAwards",
-            "CollectTrust",
-            "TrustDialogueNext",
-            "TrustDialogueInteraction",
-            "Sub_HomeButton",
-            "HomeFlag"
-        ]
-    },
     "CollectAwards": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/CollectAwards.png",
@@ -209,19 +169,110 @@
             "HomeFlag"
         ]
     },
-    "TrustMax备份": {
-        "recognition": "TemplateMatch",
-        "template": "Wilderness/TrustMax.png",
+    "EnterProduct": {
+        "recognition": "OCR",
+        "expected": [
+            "生产"
+        ],
         "roi": [
+            238,
+            506,
+            191,
+            214
+        ],
+        "target_offset": [
             0,
-            162,
-            141,
-            114
+            -30,
+            0,
+            0
         ],
         "action": "Click",
         "next": [
-            "Sub_HomeButton",
-            "HomeFlag"
+            "CollectProduct",
+            "EnterProduct"
+        ]
+    },
+    "CollectProduct": {
+        "recognition": "OCR",
+        "expected": [
+            "收取"
+        ],
+        "roi": [
+            157,
+            22,
+            971,
+            650
+        ],
+        "action": "Click",
+        "next": [
+            "Sub_CollectProduct",
+            "AutoSelectProducts"
+        ]
+    },
+    "Sub_CollectProduct": {
+        "is_sub": true,
+        "recognition": "TemplateMatch",
+        "template": "Wilderness/CollectProduct.png",
+        "roi": [
+            431,
+            48,
+            406,
+            220
+        ],
+        "action": "Click"
+    },
+    "AutoSelectProducts": {
+        "recognition": "OCR",
+        "expected": [
+            "批量放入产品"
+        ],
+        "roi": [
+            675,
+            563,
+            309,
+            152
+        ],
+        "action": "Click",
+        "next": [
+            "AutoSelectLeast"
+        ]
+    },
+    "AutoSelectLeast": {
+        "recognition": "OCR",
+        "expected": [
+            "最少"
+        ],
+        "roi": [
+            567,
+            91,
+            184,
+            282
+        ],
+        "action": "Click",
+        "next": [
+            "AutoSelectComfirm"
+        ]
+    },
+    "AutoSelectComfirm": {
+        "recognition": "OCR",
+        "expected": [
+            "批量放入"
+        ],
+        "roi": [
+            507,
+            483,
+            264,
+            138
+        ],
+        "action": "Click",
+        "next": [
+            "CollectEXP",
+            "CollectMoney",
+            "CollectAwards",
+            "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_BackButton"
         ]
     }
 }