Skip to content

Commit a65784f

Browse files
TohkahbTohkahb
authored
Merge pull request #22 from LBEILC/dev
feat: 添加自动换取资源功能， 修复无法点击确定的问题，修复异常退出的问题
2 parents 5b19538 + 132b380 commit a65784f

File tree

1 file changed

+253
-2
lines changed

1 file changed

+253
-2
lines changed

‎assets/resource/base/pipeline/infrastructures.json

+253-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
],
2727
"action": "Click",
2828
"next": [
29+
"Infr_收取资源_不换班",
2930
"Infr_DealDefaltYes",
3031
"Base_Deal"
3132
]
@@ -64,6 +65,22 @@
6465
"Infr_驻员状况"
6566
]
6667
},
68+
"Infr_收取资源_不换班": {
69+
"recognition": "TemplateMatch",
70+
"template": "Infrastructures/Infr_Recourse.png",
71+
"roi": [
72+
412,
73+
425,
74+
331,
75+
288
76+
],
77+
"action": "Click",
78+
"next": [
79+
"子任务_获得物品",
80+
"Infr_收取资源_不换班",
81+
"Infr_DealDefaltYes"
82+
]
83+
},
6784
"Infr_驻员状况": {
6885
"recognition": "OCR",
6986
"expected": [
@@ -651,6 +668,7 @@
651668
"action": "Click",
652669
"next": [
653670
"Infr_Deal",
671+
"Infr_制作素材",
654672
"Infr_DealSelf"
655673
]
656674
},
@@ -665,8 +683,9 @@
665683
],
666684
"action": "Click",
667685
"next": [
686+
"Infr_行星指挥部_返回",
668687
"Infr_DealDefaltYes",
669-
"Infr_DealSelf"
688+
"Infr_制作素材"
670689
]
671690
},
672691
"Infr_Deal1": {
@@ -686,7 +705,6 @@
686705
},
687706
"Infr_DealSelf": {
688707
"next": [
689-
"Infr_DealNextFriends_End",
690708
"Infr_DealSelf1",
691709
"Infr_DealSelf2",
692710
"Infr_DealSelf3",
@@ -1220,6 +1238,9 @@
12201238
26
12211239
],
12221240
"next": [
1241+
"Infr_DealSelf1_Yes",
1242+
"Infr_DealSelf1_No",
1243+
"子任务_获得物品",
12231244
"Infr_DealNextFriends1",
12241245
"Infr_DealNextFriends"
12251246
]
@@ -1338,5 +1359,235 @@
13381359
"next": [
13391360
"进入首页"
13401361
]
1362+
},
1363+
"Infr_制作素材": {
1364+
"recognition": "OCR",
1365+
"expected": [
1366+
"制作素材"
1367+
],
1368+
"roi": [
1369+
42,
1370+
99,
1371+
108,
1372+
34
1373+
],
1374+
"action": "Click",
1375+
"target": [
1376+
53,
1377+
358,
1378+
79,
1379+
73
1380+
],
1381+
"next": [
1382+
"Infr_制作素材",
1383+
"Infr_制作素材_材料不足",
1384+
"Infr_制作素材_材料充足"
1385+
]
1386+
},
1387+
"Infr_制作素材_材料充足": {
1388+
"recognition": "ColorMatch",
1389+
"roi": [
1390+
461,
1391+
520,
1392+
85,
1393+
28
1394+
],
1395+
"lower": [
1396+
59,
1397+
65,
1398+
74
1399+
],
1400+
"upper": [
1401+
99,
1402+
97,
1403+
107
1404+
],
1405+
"action": "Click",
1406+
"target": [
1407+
272,
1408+
525,
1409+
145,
1410+
140
1411+
],
1412+
"next": [
1413+
"Infr_制作素材_材料充足_合成",
1414+
"Infr_制作素材_材料充足"
1415+
]
1416+
},
1417+
"Infr_制作素材_材料不足": {
1418+
"recognition": "ColorMatch",
1419+
"roi": [
1420+
461,
1421+
520,
1422+
85,
1423+
28
1424+
],
1425+
"lower": [
1426+
33,
1427+
20,
1428+
33
1429+
],
1430+
"upper": [
1431+
57,
1432+
32,
1433+
49
1434+
],
1435+
"next": [
1436+
"Infr_制作素材_返回"
1437+
]
1438+
},
1439+
"Infr_制作素材_材料充足_合成": {
1440+
"recognition": "OCR",
1441+
"expected": [
1442+
"合成份数"
1443+
],
1444+
"roi": [
1445+
901,
1446+
95,
1447+
106,
1448+
33
1449+
],
1450+
"action": "Click",
1451+
"target": [
1452+
1159,
1453+
342,
1454+
67,
1455+
33
1456+
],
1457+
"next": [
1458+
"Infr_制作素材_材料充足_最大",
1459+
"Infr_制作素材_材料充足_合成"
1460+
]
1461+
},
1462+
"Infr_制作素材_材料充足_最大": {
1463+
"recognition": "ColorMatch",
1464+
"roi": [
1465+
414,
1466+
308,
1467+
405,
1468+
107
1469+
],
1470+
"lower": [
1471+
33,
1472+
20,
1473+
33
1474+
],
1475+
"upper": [
1476+
57,
1477+
32,
1478+
49
1479+
],
1480+
"next": [
1481+
"Infr_制作素材_材料充足_确定"
1482+
]
1483+
},
1484+
"Infr_制作素材_材料充足_确定": {
1485+
"recognition": "OCR",
1486+
"expected": [
1487+
"合成份数"
1488+
],
1489+
"roi": [
1490+
896,
1491+
94,
1492+
111,
1493+
35
1494+
],
1495+
"action": "Click",
1496+
"target": [
1497+
1020,
1498+
603,
1499+
90,
1500+
39
1501+
],
1502+
"next": [
1503+
"子任务_获得物品",
1504+
"Infr_制作素材_合成_返回"
1505+
]
1506+
},
1507+
"Infr_制作素材_合成_返回": {
1508+
"action": "Click",
1509+
"recognition": "OCR",
1510+
"expected": [
1511+
"概率"
1512+
],
1513+
"roi": [
1514+
43,
1515+
428,
1516+
51,
1517+
31
1518+
],
1519+
"target": [
1520+
44,
1521+
29,
1522+
120,
1523+
39
1524+
],
1525+
"next": [
1526+
"子任务_获得物品",
1527+
"Infr_制作素材_返回",
1528+
"Infr_换取页面",
1529+
"Infr_制作素材_合成_返回"
1530+
]
1531+
},
1532+
"Infr_制作素材_返回": {
1533+
"action": "Click",
1534+
"recognition": "OCR",
1535+
"expected": [
1536+
"基地素材"
1537+
],
1538+
"roi": [
1539+
61,
1540+
481,
1541+
112,
1542+
37
1543+
],
1544+
"target": [
1545+
44,
1546+
29,
1547+
120,
1548+
39
1549+
],
1550+
"next": [
1551+
"Infr_制作素材_返回",
1552+
"Infr_换取页面"
1553+
]
1554+
},
1555+
"Infr_换取页面": {
1556+
"recognition": "OCR",
1557+
"expected": [
1558+
"制作素材"
1559+
],
1560+
"roi": [
1561+
44,
1562+
96,
1563+
100,
1564+
40
1565+
],
1566+
"next": [
1567+
"Infr_DealSelf"
1568+
]
1569+
},
1570+
"Infr_行星指挥部_返回": {
1571+
"recognition": "OCR",
1572+
"expected": [
1573+
"行星指挥部"
1574+
],
1575+
"roi": [
1576+
137,
1577+
105,
1578+
143,
1579+
35
1580+
],
1581+
"action": "Click",
1582+
"target": [
1583+
52,
1584+
24,
1585+
102,
1586+
43
1587+
],
1588+
"next": [
1589+
"Infr_DealDefaltYes",
1590+
"Infr_行星指挥部_返回"
1591+
]
13411592
}
13421593
}

0 commit comments

Comments
 (0)