Skip to content

Commit ff84bb4

Browse files
committed
fix: 修复了平日农场可能卡在宠物互动界面的问题
1 parent 00088df commit ff84bb4

2 files changed

Lines changed: 71 additions & 12 deletions

File tree

assets/resource/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
-
99
- **修复**
1010
- 修复了房间参观可能识别打扫项错误的问题
11+
- 修复了平日农场可能卡在宠物互动界面的问题
1112

1213
> 更多日志与累积更新请在公告相关板块中查看
1314

assets/resource/base/pipeline/日常任务/农场视察.json

Lines changed: 70 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"$__mpe_code": {
44
"filePath": "D:\\_Projects\\programs\\MaaDuDuL\\assets\\resource\\base\\pipeline\\日常任务\\农场视察.json",
55
"filename": "农场视察",
6-
"lastSyncTime": 1767620043951,
6+
"lastSyncTime": 1768123777032,
77
"prefix": "农场视察",
88
"savedViewport": {
9-
"x": -2546,
10-
"y": 158,
11-
"zoom": 0.72
9+
"x": -6470,
10+
"y": 406,
11+
"zoom": 1.32
1212
},
1313
"version": "v0.14.2"
1414
}
@@ -90,6 +90,27 @@
9090
"type": "DirectHit"
9191
}
9292
},
93+
"农场视察_宠物详情处理": {
94+
"$__mpe_code": {
95+
"position": {
96+
"x": 5338,
97+
"y": -174
98+
}
99+
},
100+
"action": {
101+
"param": {
102+
"target": [42, 39, 0, 0]
103+
},
104+
"type": "Click"
105+
},
106+
"recognition": {
107+
"param": {
108+
"expected": ["更改位置", "喂养", "哄睡", "玩耍"],
109+
"roi": [605, 628, 665, 82]
110+
},
111+
"type": "OCR"
112+
}
113+
},
93114
"农场视察_开始": {
94115
"$__mpe_code": {
95116
"position": {
@@ -126,7 +147,13 @@
126147
"focus": {
127148
"Node.Recognition.Starting": " \u003e 收集宠物萝卜"
128149
},
129-
"next": ["农场视察_检测宠物萝卜"],
150+
"next": [
151+
"农场视察_检测宠物萝卜",
152+
{
153+
"jump_back": true,
154+
"name": "农场视察_宠物详情处理"
155+
}
156+
],
130157
"on_error": ["农场视察_获取萝卜结束"],
131158
"post_delay": 0,
132159
"pre_delay": 0,
@@ -173,7 +200,13 @@
173200
},
174201
"type": "Click"
175202
},
176-
"next": ["农场视察_获取树桩萝卜"],
203+
"next": [
204+
"农场视察_获取树桩萝卜",
205+
{
206+
"jump_back": true,
207+
"name": "农场视察_宠物详情处理"
208+
}
209+
],
177210
"on_error": ["农场视察_收获宠物萝卜"],
178211
"recognition": {
179212
"param": {},
@@ -195,7 +228,13 @@
195228
"focus": {
196229
"Node.Recognition.Succeeded": " \u003e 拿来吧你!"
197230
},
198-
"next": ["农场视察_获取宠物萝卜"],
231+
"next": [
232+
"农场视察_获取宠物萝卜",
233+
{
234+
"jump_back": true,
235+
"name": "农场视察_宠物详情处理"
236+
}
237+
],
199238
"pre_delay": 0,
200239
"recognition": {
201240
"param": {
@@ -265,8 +304,8 @@
265304
"农场视察_获取宠物萝卜": {
266305
"$__mpe_code": {
267306
"position": {
268-
"x": 5607,
269-
"y": -199
307+
"x": 5601,
308+
"y": -238
270309
}
271310
},
272311
"action": {
@@ -275,8 +314,15 @@
275314
},
276315
"type": "Click"
277316
},
278-
"next": ["农场视察_检测宠物萝卜"],
317+
"next": [
318+
"农场视察_检测宠物萝卜",
319+
{
320+
"jump_back": true,
321+
"name": "农场视察_宠物详情处理"
322+
}
323+
],
279324
"on_error": ["农场视察_获取萝卜结束"],
325+
"post_delay": 500,
280326
"recognition": {
281327
"param": {
282328
"expected": ["点击屏幕继续"]
@@ -299,7 +345,13 @@
299345
"focus": {
300346
"Node.Recognition.Succeeded": " \u003e 收取每日萝卜"
301347
},
302-
"next": ["农场视察_收获宠物萝卜"],
348+
"next": [
349+
"农场视察_收获宠物萝卜",
350+
{
351+
"jump_back": true,
352+
"name": "农场视察_宠物详情处理"
353+
}
354+
],
303355
"recognition": {
304356
"param": {
305357
"expected": ["确定"],
@@ -359,7 +411,13 @@
359411
"param": {},
360412
"type": "DoNothing"
361413
},
362-
"next": ["农场视察_派遣跑腿开始"],
414+
"next": [
415+
"农场视察_派遣跑腿开始",
416+
{
417+
"jump_back": true,
418+
"name": "农场视察_宠物详情处理"
419+
}
420+
],
363421
"post_delay": 0,
364422
"pre_delay": 0,
365423
"recognition": {

0 commit comments

Comments
 (0)