Skip to content

Commit 14e129f

Browse files
authored
Merge pull request #26 from LBEILC/dev
feat: 获取物品添加延迟,删除夏活任务,模拟军演添加刷新阈值
2 parents cd121da + 9a239a3 commit 14e129f

3 files changed

Lines changed: 47 additions & 17 deletions

File tree

assets/interface.json

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@
3636
"作战关卡"
3737
]
3838
},
39-
{
40-
"name": "夏日活动",
41-
"entry": "夏活"
42-
},
4339
{
4440
"name": "模拟军演",
4541
"entry": "模拟军演",
42+
"option": [
43+
"刷新战力阈值"
44+
],
4645
"pipeline_override": {
4746
"首页_出击": {
4847
"next": "模拟军演_入口"
@@ -319,6 +318,42 @@
319318
}
320319
}
321320
]
321+
},
322+
"刷新战力阈值": {
323+
"cases": [
324+
{
325+
"name": "5000",
326+
"pipeline_override": {
327+
"模拟军演_刷新对手": {
328+
"expected": "^([5-9]\\d{3}|[1-9]\\d{4})$"
329+
}
330+
}
331+
},
332+
{
333+
"name": "10000",
334+
"pipeline_override": {
335+
"模拟军演_刷新对手": {
336+
"expected": "^[1-9]\\d{4}$"
337+
}
338+
}
339+
},
340+
{
341+
"name": "20000",
342+
"pipeline_override": {
343+
"模拟军演_刷新对手": {
344+
"expected": "^([2-9]\\d{4})$"
345+
}
346+
}
347+
},
348+
{
349+
"name": "30000",
350+
"pipeline_override": {
351+
"模拟军演_刷新对手": {
352+
"expected": "^([3-9]\\d{4})$"
353+
}
354+
}
355+
}
356+
]
322357
}
323358
}
324-
}
359+
}

assets/resource/base/pipeline/rehearsal.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,11 @@
4848
},
4949
"模拟军演_刷新对手": {
5050
"recognition": "OCR",
51-
"expected": [
52-
"1",
53-
"2",
54-
"3",
55-
"4",
56-
"5"
57-
],
51+
"expected": "^[1-9]\\d{4}$",
5852
"roi": [
59-
341,
53+
330,
6054
315,
61-
23,
55+
92,
6256
29
6357
],
6458
"action": "Click",
@@ -201,4 +195,4 @@
201195
],
202196
"action": "Click"
203197
}
204-
}
198+
}

assets/resource/base/pipeline/utils.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
405,
102102
117
103103
],
104-
"action": "Click"
104+
"action": "Click",
105+
"post_delay": 1000
105106
},
106107
"子任务_点击返回": {
107108
"is_sub": true,
@@ -142,4 +143,4 @@
142143
],
143144
"action": "Click"
144145
}
145-
}
146+
}

0 commit comments

Comments
 (0)