修改荒原改为OCR识别。新增交流群号 (#178)

MaaXYZ · Sep 9, 2024 · 279ba65 · 279ba65
1 parent 14b12cb
commit 279ba65
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -449,3 +449,5 @@ tools/ImageCropper/**/*.png
 
 # MacOS
 .DS_Store
+.nicegui/storage-general.json
+config/maa_option.json
diff --git a/README.md b/README.md
@@ -89,6 +89,6 @@
 </a>
 
 ## Join us
-
-- 1999 开发交流 QQ 群：649344857
+- M9A 闲聊群 QQ 群：175638678
+- M9A 开发群 QQ 群：649344857
 - MaaFramework 开发交流 QQ 群: 595990173
diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json
@@ -33,6 +33,53 @@
         ]
     },
     "CollectEXP": {
+        "recognition": "OCR",
+        "expected": [
+            "微尘",
+            "钟楼"
+        ],
+        "roi": [
+            422,
+            65,
+            218,
+            236
+        ],
+        "action": "Click",
+        "post_wait_freezes": 1,
+        "next": [
+            "CollectMoney",
+            "CollectAwards",
+            "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_HomeButton",
+            "HomeFlag"
+        ]
+    },
+    "CollectMoney": {
+        "recognition": "OCR",
+        "expected": [
+            "利齿",
+            "市集"
+        ],
+        "roi": [
+            638,
+            6,
+            221,
+            232
+        ],
+        "action": "Click",
+        "post_wait_freezes": 1,
+        "next": [
+            "CollectAwards",
+            "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_HomeButton",
+            "HomeFlag"
+        ]
+    },
+    "CollectEXP备份": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/CollectEXP.png",
         "roi": [
@@ -53,7 +100,7 @@
             "HomeFlag"
         ]
     },
-    "CollectMoney": {
+    "CollectMoney备份": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/CollectMoney.png",
         "roi": [
@@ -146,6 +193,23 @@
         ]
     },
     "TrustMax": {
+        "recognition": "OCR",
+        "expected": [
+            "MAX"
+        ],
+        "roi": [
+            0,
+            162,
+            141,
+            114
+        ],
+        "action": "Click",
+        "next": [
+            "Sub_HomeButton",
+            "HomeFlag"
+        ]
+    },
+    "TrustMax备份": {
         "recognition": "TemplateMatch",
         "template": "Wilderness/TrustMax.png",
         "roi": [