Skip to content

Commit 13efdc3

Browse files
runheyrunhey
authored
Merge pull request #1533 from LGG686/dev-ui
feat: 初步适配新探索界面
2 parents 6e03c72 + aec7dfe commit 13efdc3

72 files changed

Lines changed: 212 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tasks/EternitySea/assets.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ class EternitySeaAssets:
1212

1313
# Image Rule Assets
1414
# 选择永生之海
15-
I_ETERNITY_SEA = RuleImage(roi_front=(1139,93,127,416), roi_back=(1139,93,127,416), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
15+
I_ETERNITY_SEA = RuleImage(roi_front=(1158,88,70,70), roi_back=(1002,78,233,353), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
1616
# 组队
17-
I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
17+
I_FORM_TEAM = RuleImage(roi_front=(962,579,96,90), roi_back=(962,579,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
1818
# 挑战
19-
I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
19+
I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1146,595,92,49), roi_back=(1142,580,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
2020
# 开锁
21-
I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(556,560,35,34), roi_back=(556,560,35,34), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
21+
I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(700,654,35,34), roi_back=(669,644,167,64), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
2222
# 关锁
23-
I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
23+
I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(699,652,31,37), roi_back=(667,652,164,53), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
2424
# 小小宠物，发现宝藏
2525
I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
2626
# description
@@ -29,7 +29,7 @@ class EternitySeaAssets:
2929

3030
# List Rule Assets
3131
# 永生之海层数列表
32-
L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(138,127,353,435), size=(56, 68),
32+
L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(124,101,74,593), size=(71, 84),
3333
array=["壹", "贰", "叁", "肆"])
3434

3535

‎tasks/EternitySea/res/image.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@
22
{
33
"itemName": "eternity_sea",
44
"imageName": "res_eternity_sea.png",
5-
"roiFront": "1139,93,127,416",
6-
"roiBack": "1139,93,127,416",
5+
"roiFront": "1158,88,70,70",
6+
"roiBack": "1002,78,233,353",
77
"method": "Template matching",
88
"threshold": 0.8,
99
"description": "选择永生之海"
1010
},
1111
{
1212
"itemName": "form_team",
1313
"imageName": "res_form_team.png",
14-
"roiFront": "939,594,96,90",
15-
"roiBack": "939,594,96,90",
14+
"roiFront": "962,579,96,90",
15+
"roiBack": "962,579,96,90",
1616
"method": "Template matching",
1717
"threshold": 0.8,
1818
"description": "组队"
1919
},
2020
{
2121
"itemName": "eternity_sea_fire",
2222
"imageName": "res_eternity_sea_fire.png",
23-
"roiFront": "1108,592,96,93",
24-
"roiBack": "1108,592,96,93",
23+
"roiFront": "1146,595,92,49",
24+
"roiBack": "1142,580,96,93",
2525
"method": "Template matching",
2626
"threshold": 0.8,
2727
"description": "挑战"
2828
},
2929
{
3030
"itemName": "eternitysea_unlock",
3131
"imageName": "res_eternitysea_unlock.png",
32-
"roiFront": "556,560,35,34",
33-
"roiBack": "556,560,35,34",
32+
"roiFront": "700,654,35,34",
33+
"roiBack": "669,644,167,64",
3434
"method": "Template matching",
3535
"threshold": 0.8,
3636
"description": "开锁"
3737
},
3838
{
3939
"itemName": "neweternitysea_lock",
4040
"imageName": "res_neweternitysea_lock.png",
41-
"roiFront": "556,560,31,37",
42-
"roiBack": "556,560,31,37",
41+
"roiFront": "699,652,31,37",
42+
"roiBack": "667,652,164,53",
4343
"method": "Template matching",
4444
"threshold": 0.8,
4545
"description": "关锁"

‎tasks/EternitySea/res/list.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
"name": "layer_list",
33
"direction": "vertical",
44
"type": "ocr",
5-
"roiBack": "138,127,353,435",
5+
"roiBack": "124,101,74,593",
66
"description": "永生之海层数列表",
77
"list": [
88
{
99
"itemName": "壹",
10-
"roiFront": "266,148,60,64"
10+
"roiFront": "126,104,69,83"
1111
},
1212
{
1313
"itemName": "贰",
14-
"roiFront": "270,253,54,74"
14+
"roiFront": "125,203,72,81"
1515
},
1616
{
1717
"itemName": "叁",
18-
"roiFront": "276,367,50,67"
18+
"roiFront": "125,295,72,87"
1919
},
2020
{
2121
"itemName": "肆",
22-
"roiFront": "271,479,60,70"
22+
"roiFront": "124,396,74,85"
2323
}
2424
]
2525
}

‎tasks/EternitySea/res/res_eternity_sea.png‎

-70.6 KB
Loading

‎tasks/EternitySea/res/res_eternity_sea_fire.png‎

-7.91 KB
Loading

‎tasks/EternitySea/res/res_eternitysea_unlock.png‎

612 Bytes
Loading

‎tasks/EternitySea/res/res_form_team.png‎

2.79 KB
Loading

‎tasks/EternitySea/res/res_neweternitysea_lock.png‎

618 Bytes
Loading

‎tasks/EvoZone/assets.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@ class EvoZoneAssets:
1212

1313
# Image Rule Assets
1414
# 火麒麟进入
15-
I_FIRE_KIRIN = RuleImage(roi_front=(84,126,217,406), roi_back=(84,126,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
15+
I_FIRE_KIRIN = RuleImage(roi_front=(104,120,217,406), roi_back=(104,120,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
1616
# 组队
17-
I_FORM_TEAM = RuleImage(roi_front=(934,585,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
17+
I_FORM_TEAM = RuleImage(roi_front=(959,580,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
1818
# description
19-
I_EVOZONE_LOCK = RuleImage(roi_front=(558,565,31,32), roi_back=(548,554,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
19+
I_EVOZONE_LOCK = RuleImage(roi_front=(700,655,31,32), roi_back=(690,648,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
2020
# description
21-
I_EVOZONE_UNLOCK = RuleImage(roi_front=(560,565,26,29), roi_back=(551,557,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
21+
I_EVOZONE_UNLOCK = RuleImage(roi_front=(701,657,26,29), roi_back=(695,650,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
2222
# 点击挑战
23-
I_EVOZONE_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
23+
I_EVOZONE_FIRE = RuleImage(roi_front=(1127,568,131,124), roi_back=(1127,568,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
2424
# 式神录
25-
I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
25+
I_SHI_RECORDS = RuleImage(roi_front=(843,570,48,45), roi_back=(843,570,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
2626
# 小小宠物，发现宝藏
2727
I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_pet_present.png")
2828
# 风麒麟进入
29-
I_WIND_KIRIN = RuleImage(roi_front=(377,126,232,420), roi_back=(377,126,232,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
29+
I_WIND_KIRIN = RuleImage(roi_front=(410,116,225,320), roi_back=(410,116,225,320), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
3030
# 水麒麟进入
31-
I_WATER_KIRIN = RuleImage(roi_front=(671,122,236,420), roi_back=(671,122,236,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
31+
I_WATER_KIRIN = RuleImage(roi_front=(705,115,224,378), roi_back=(705,115,224,378), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
3232
# 雷麒麟进入
33-
I_LIGHTNING_KIRIN = RuleImage(roi_front=(967,121,239,419), roi_back=(967,121,239,419), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
33+
I_LIGHTNING_KIRIN = RuleImage(roi_front=(1005,99,229,326), roi_back=(1005,99,229,326), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
3434

3535

3636
# List Rule Assets
3737
# 这个是觉醒界面选择不同层数的
38-
L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(44, 88),
38+
L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(124,84,77,632), size=(75, 83),
3939
array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾"])
4040

4141

4242
# Ocr Rule Assets
4343
# Ocr-description
44-
O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
44+
O_O_TEST_OCR = RuleOcr(roi=(128,114,349,564), area=(128,114,349,564), mode="Full", method="Default", keyword="", name="o_test_ocr")
4545

4646

‎tasks/EvoZone/o/image.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
{
33
"itemName": "fire_kirin",
44
"imageName": "o_fire_kirin.png",
5-
"roiFront": "84,126,217,406",
6-
"roiBack": "84,126,217,406",
5+
"roiFront": "104,120,217,406",
6+
"roiBack": "104,120,217,406",
77
"method": "Template matching",
88
"threshold": 0.8,
99
"description": "火麒麟进入"
1010
},
1111
{
1212
"itemName": "form_team",
1313
"imageName": "o_form_team.png",
14-
"roiFront": "934,585,100,100",
14+
"roiFront": "959,580,100,100",
1515
"roiBack": "916,572,156,130",
1616
"method": "Template matching",
1717
"threshold": 0.8,
@@ -20,35 +20,35 @@
2020
{
2121
"itemName": "evozone_lock",
2222
"imageName": "o_evozone_lock.png",
23-
"roiFront": "558,565,31,32",
24-
"roiBack": "548,554,53,54",
23+
"roiFront": "700,655,31,32",
24+
"roiBack": "690,648,53,54",
2525
"method": "Template matching",
2626
"threshold": 0.8,
2727
"description": "description"
2828
},
2929
{
3030
"itemName": "evozone_unlock",
3131
"imageName": "o_evozone_unlock.png",
32-
"roiFront": "560,565,26,29",
33-
"roiBack": "551,557,43,45",
32+
"roiFront": "701,657,26,29",
33+
"roiBack": "695,650,43,45",
3434
"method": "Template matching",
3535
"threshold": 0.8,
3636
"description": "description"
3737
},
3838
{
3939
"itemName": "evozone_fire",
4040
"imageName": "o_evozone_fire.png",
41-
"roiFront": "1095,577,131,124",
42-
"roiBack": "1095,577,131,124",
41+
"roiFront": "1127,568,131,124",
42+
"roiBack": "1127,568,131,124",
4343
"method": "Template matching",
4444
"threshold": 0.6,
4545
"description": "点击挑战"
4646
},
4747
{
4848
"itemName": "shi_records",
4949
"imageName": "o_shi_records.png",
50-
"roiFront": "821,638,48,45",
51-
"roiBack": "821,638,48,45",
50+
"roiFront": "843,570,48,45",
51+
"roiBack": "843,570,48,45",
5252
"method": "Template matching",
5353
"threshold": 0.8,
5454
"description": "式神录"
@@ -65,26 +65,26 @@
6565
{
6666
"itemName": "wind_kirin",
6767
"imageName": "o_wind_kirin.png",
68-
"roiFront": "377,126,232,420",
69-
"roiBack": "377,126,232,420",
68+
"roiFront": "410,116,225,320",
69+
"roiBack": "410,116,225,320",
7070
"method": "Template matching",
7171
"threshold": 0.8,
7272
"description": "风麒麟进入"
7373
},
7474
{
7575
"itemName": "water_kirin",
7676
"imageName": "o_water_kirin.png",
77-
"roiFront": "671,122,236,420",
78-
"roiBack": "671,122,236,420",
77+
"roiFront": "705,115,224,378",
78+
"roiBack": "705,115,224,378",
7979
"method": "Template matching",
8080
"threshold": 0.8,
8181
"description": "水麒麟进入"
8282
},
8383
{
8484
"itemName": "lightning_kirin",
8585
"imageName": "o_lightning_kirin.png",
86-
"roiFront": "967,121,239,419",
87-
"roiBack": "967,121,239,419",
86+
"roiFront": "1005,99,229,326",
87+
"roiBack": "1005,99,229,326",
8888
"method": "Template matching",
8989
"threshold": 0.8,
9090
"description": "雷麒麟进入"

0 commit comments

Comments
 (0)