From 279ba656edba47211d79aaeb582b6a1bb12715a9 Mon Sep 17 00:00:00 2001
From: a16797 <167970334@qq.com>
Date: Mon, 9 Sep 2024 20:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8D=92=E5=8E=9F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAOCR=E8=AF=86=E5=88=AB=E3=80=82=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E5=8F=B7=20(#178)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 +
 README.md                                     |  4 +-
 assets/resource/base/pipeline/wilderness.json | 66 ++++++++++++++++++-
 3 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b3857a..d60e1f6 100644
--- 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
index 25d5811..c588a02 100644
--- 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
index f802792..8d76b80 100644
--- 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": [