Skip to content

Commit d05f52d

Browse files
mmwuyoummwuyou
authored
Merge pull request #50 from YlovexLN/main
feat(assets): 添加武器制造流程中的额外步骤，以适配武器制造相关选项
2 parents 90cc8e5 + 147caa3 commit d05f52d

File tree

2 files changed

+255
-3
lines changed

2 files changed

+255
-3
lines changed

‎assets/resource/interface.json‎

Lines changed: 99 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@
3838
},
3939
{
4040
"name": "武器制造",
41-
"entry": "weapons-fabricate"
41+
"entry": "weapons-fabricate",
42+
"option": [
43+
"订单等级",
44+
"制造数量"
45+
]
4246
},
4347
{
4448
"name": "和合",
@@ -882,6 +886,100 @@
882886
}
883887
}
884888
]
889+
},
890+
"订单等级": {
891+
"cases": [
892+
{
893+
"name": "高级",
894+
"pipeline_override": {
895+
"weapons-fabricate-job": {
896+
"next": [
897+
"senior-orders-add",
898+
"weapons-fabricate-job"
899+
]
900+
}
901+
}
902+
},
903+
{
904+
"name": "绝密",
905+
"pipeline_override": {
906+
"weapons-fabricate-job": {
907+
"next": [
908+
"confidential-orders-add",
909+
"weapons-fabricate-job"
910+
]
911+
}
912+
}
913+
}
914+
]
915+
},
916+
"制造数量": {
917+
"cases": [
918+
{
919+
"name": "1",
920+
"pipeline_override": {
921+
"weapons-fabricate-job": {
922+
"next": [
923+
"orders-add",
924+
"weapons-fabricate-job"
925+
]
926+
},
927+
"weapons-fabricate-quit-two-add": {
928+
"next": [
929+
"weapons-fabricate-add-1"
930+
]
931+
}
932+
}
933+
},
934+
{
935+
"name": "2",
936+
"pipeline_override": {
937+
"weapons-fabricate-job": {
938+
"next": [
939+
"orders-add",
940+
"weapons-fabricate-job"
941+
]
942+
},
943+
"weapons-fabricate-quit-two-add": {
944+
"next": [
945+
"weapons-fabricate-add-2"
946+
]
947+
}
948+
}
949+
},
950+
{
951+
"name": "3",
952+
"pipeline_override": {
953+
"weapons-fabricate-job": {
954+
"next": [
955+
"orders-add",
956+
"weapons-fabricate-job"
957+
]
958+
},
959+
"weapons-fabricate-quit-two-add": {
960+
"next": [
961+
"weapons-fabricate-add-3"
962+
]
963+
}
964+
}
965+
},
966+
{
967+
"name": "4",
968+
"pipeline_override": {
969+
"weapons-fabricate-job": {
970+
"next": [
971+
"orders-add",
972+
"weapons-fabricate-job"
973+
]
974+
},
975+
"weapons-fabricate-quit-two-add": {
976+
"next": [
977+
"weapons-fabricate-add-4"
978+
]
979+
}
980+
}
981+
}
982+
]
885983
}
886984
},
887985
"version": "v0.0.1"

‎assets/resource_picli/base/pipeline/3_(9)_weapons_fabricate.json‎

Lines changed: 156 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,21 @@
5050
"senior-orders"
5151
]
5252
},
53+
"senior-orders-add": {
54+
"recognition": "OCR",
55+
"expected": "高级",
56+
"action": "Click",
57+
"post_delay": 2000,
58+
"target_offset": [
59+
50,
60+
30,
61+
0,
62+
0
63+
],
64+
"next": [
65+
"orders-add"
66+
]
67+
},
5368
"signed-contract": {
5469
"recognition": "OCR",
5570
"expected": "签订合同",
@@ -102,7 +117,7 @@
102117
},
103118
"weapons-fabricate-quit-Image": {
104119
"recognition": "TemplateMatch",
105-
"template": "Company\\29.png",
120+
"template": "Company/29.png",
106121
"action": "Click",
107122
"target": [
108123
1150,
@@ -122,6 +137,24 @@
122137
"weapons-fabricate-quit-Image"
123138
]
124139
},
140+
"weapons-fabricate-quit-Image-add": {
141+
"recognition": "TemplateMatch",
142+
"template": "Company/29.png",
143+
"action": "Click",
144+
"target": [
145+
1150,
146+
70,
147+
0,
148+
0
149+
],
150+
"post_delay": 2000,
151+
"roi": [
152+
1050,
153+
0,
154+
200,
155+
190
156+
]
157+
},
125158
"confidential-orders": {
126159
"recognition": "OCR",
127160
"expected": "绝密",
@@ -140,6 +173,27 @@
140173
"confidential-orders"
141174
]
142175
},
176+
"confidential-orders-add": {
177+
"recognition": "OCR",
178+
"expected": "绝密",
179+
"action": "Click",
180+
"post_delay": 2000,
181+
"target_offset": [
182+
50,
183+
30,
184+
0,
185+
0
186+
],
187+
"next": [
188+
"orders-add"
189+
]
190+
},
191+
"orders-add": {
192+
"post_delay": 2000,
193+
"next": [
194+
"weapons-fabricate-quit-two-add"
195+
]
196+
},
143197
"signed-contract-two": {
144198
"recognition": "OCR",
145199
"expected": "签订合同",
@@ -157,6 +211,18 @@
157211
"signed-contract-two"
158212
]
159213
},
214+
"signed-contract-two-add": {
215+
"recognition": "OCR",
216+
"expected": "签订合同",
217+
"action": "Click",
218+
"post_delay": 2000,
219+
"roi": [
220+
835,
221+
500,
222+
400,
223+
210
224+
]
225+
},
160226
"weapons-fabricate-determine-three": {
161227
"recognition": "OCR",
162228
"expected": "确定",
@@ -174,6 +240,18 @@
174240
"weapons-fabricate-full"
175241
]
176242
},
243+
"weapons-fabricate-determine-three-add": {
244+
"recognition": "OCR",
245+
"expected": "确定",
246+
"action": "Click",
247+
"post_delay": 2000,
248+
"roi": [
249+
655,
250+
400,
251+
260,
252+
150
253+
]
254+
},
177255
"weapons-fabricate-quit-two": {
178256
"recognition": "OCR",
179257
"expected": "等待生产",
@@ -188,6 +266,82 @@
188266
"weapons-fabricate-home"
189267
]
190268
},
269+
"weapons-fabricate-quit-two-add": {
270+
"next": [
271+
"weapons-fabricate-add-2"
272+
],
273+
"interrupt": [
274+
"weapons-fabricate-quit-Image-add",
275+
"weapons-fabricate-determine-three-add",
276+
"signed-contract-two-add",
277+
"weapons-fabricate-quit-two-add"
278+
]
279+
},
280+
"weapons-fabricate-add-1": {
281+
"recognition": "OCR",
282+
"expected": [
283+
"1/1",
284+
"1/2",
285+
"1/3",
286+
"1/4"
287+
],
288+
"roi": [
289+
439,
290+
584,
291+
197,
292+
40
293+
],
294+
"next": [
295+
"weapons-fabricate-home"
296+
]
297+
},
298+
"weapons-fabricate-add-2": {
299+
"recognition": "OCR",
300+
"expected": [
301+
"2/2",
302+
"2/3",
303+
"2/4"
304+
],
305+
"roi": [
306+
439,
307+
584,
308+
197,
309+
40
310+
],
311+
"next": [
312+
"weapons-fabricate-home"
313+
]
314+
},
315+
"weapons-fabricate-add-3": {
316+
"recognition": "OCR",
317+
"expected": [
318+
"3/4"
319+
],
320+
"roi": [
321+
439,
322+
584,
323+
197,
324+
40
325+
],
326+
"next": [
327+
"weapons-fabricate-home"
328+
]
329+
},
330+
"weapons-fabricate-add-4": {
331+
"recognition": "OCR",
332+
"expected": [
333+
"4/4"
334+
],
335+
"roi": [
336+
439,
337+
584,
338+
197,
339+
40
340+
],
341+
"next": [
342+
"weapons-fabricate-home"
343+
]
344+
},
191345
"weapons-fabricate-lack": {
192346
"recognition": "OCR",
193347
"expected": "缺少所需",
@@ -217,7 +371,7 @@
217371
},
218372
"weapons-fabricate-home": {
219373
"recognition": "TemplateMatch",
220-
"template": "Startup\\10.png",
374+
"template": "Startup/10.png",
221375
"action": "Click"
222376
}
223377
}

0 commit comments

Comments
 (0)