Skip to content

Commit 279ba65

Browse files
authored
修改荒原改为OCR识别。新增交流群号 (#178)
1 parent 14b12cb commit 279ba65

File tree

3 files changed

+69
-3
lines changed

3 files changed

+69
-3
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,5 @@ tools/ImageCropper/**/*.png
449449

450450
# MacOS
451451
.DS_Store
452+
.nicegui/storage-general.json
453+
config/maa_option.json

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@
8989
</a>
9090

9191
## Join us
92-
93-
- 1999 开发交流 QQ 群:649344857
92+
- M9A 闲聊群 QQ 群:175638678
93+
- M9A 开发群 QQ 群:649344857
9494
- MaaFramework 开发交流 QQ 群: 595990173

assets/resource/base/pipeline/wilderness.json

+65-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,53 @@
3333
]
3434
},
3535
"CollectEXP": {
36+
"recognition": "OCR",
37+
"expected": [
38+
"微尘",
39+
"钟楼"
40+
],
41+
"roi": [
42+
422,
43+
65,
44+
218,
45+
236
46+
],
47+
"action": "Click",
48+
"post_wait_freezes": 1,
49+
"next": [
50+
"CollectMoney",
51+
"CollectAwards",
52+
"CollectTrust",
53+
"TrustDialogueNext",
54+
"TrustDialogueInteraction",
55+
"Sub_HomeButton",
56+
"HomeFlag"
57+
]
58+
},
59+
"CollectMoney": {
60+
"recognition": "OCR",
61+
"expected": [
62+
"利齿",
63+
"市集"
64+
],
65+
"roi": [
66+
638,
67+
6,
68+
221,
69+
232
70+
],
71+
"action": "Click",
72+
"post_wait_freezes": 1,
73+
"next": [
74+
"CollectAwards",
75+
"CollectTrust",
76+
"TrustDialogueNext",
77+
"TrustDialogueInteraction",
78+
"Sub_HomeButton",
79+
"HomeFlag"
80+
]
81+
},
82+
"CollectEXP备份": {
3683
"recognition": "TemplateMatch",
3784
"template": "Wilderness/CollectEXP.png",
3885
"roi": [
@@ -53,7 +100,7 @@
53100
"HomeFlag"
54101
]
55102
},
56-
"CollectMoney": {
103+
"CollectMoney备份": {
57104
"recognition": "TemplateMatch",
58105
"template": "Wilderness/CollectMoney.png",
59106
"roi": [
@@ -146,6 +193,23 @@
146193
]
147194
},
148195
"TrustMax": {
196+
"recognition": "OCR",
197+
"expected": [
198+
"MAX"
199+
],
200+
"roi": [
201+
0,
202+
162,
203+
141,
204+
114
205+
],
206+
"action": "Click",
207+
"next": [
208+
"Sub_HomeButton",
209+
"HomeFlag"
210+
]
211+
},
212+
"TrustMax备份": {
149213
"recognition": "TemplateMatch",
150214
"template": "Wilderness/TrustMax.png",
151215
"roi": [

0 commit comments

Comments
 (0)