Skip to content

Commit 7825432

Browse files
runheyrunhey
authored
Merge pull request #1010 from runhey/dev
Automated PR 2025.08.28
2 parents 434599e + 0b1ebba commit 7825432

File tree

13 files changed

+106
-73
lines changed

13 files changed

+106
-73
lines changed

‎tasks/GameUi/assets.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@ class GameUiAssets:
3838
I_MAIN_GOTO_EXPLORATION = RuleImage(roi_front=(493,116,45,75), roi_back=(243,100,933,211), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_main_goto_exploration.png")
3939
# description
4040
I_CHECK_EXPLORATION = RuleImage(roi_front=(1146,175,21,22), roi_back=(1146,175,21,22), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
41-
# description
41+
# 探索前往觉醒
4242
I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(57,628,57,61), roi_back=(33,619,113,79), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
43-
# description
43+
# 探索前往御魂
4444
I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(159,633,55,55), roi_back=(138,620,89,75), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
45-
# description
46-
I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,102,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
47-
# 前往御灵
48-
I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,60,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
49-
# 式神委派
50-
I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(445,638,60,50), roi_back=(445,638,60,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
51-
# 秘闻
52-
I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(546,628,61,55), roi_back=(524,614,100,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
53-
# 地狱鬼王
54-
I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,51,45), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
55-
# 平安奇谭
56-
I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,52,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
57-
# 六道之门
58-
I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(838,640,60,49), roi_back=(818,631,200,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
59-
# 器灵
60-
I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(937,639,56,49), roi_back=(928,633,203,64), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
45+
# 探索前往结界突破
46+
I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,203,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
47+
# 探索前往御灵
48+
I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,178,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
49+
# 探索前往式神委派
50+
I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(445,638,60,50), roi_back=(445,638,180,50), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
51+
# 探索前往秘闻
52+
I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(546,628,61,55), roi_back=(524,614,200,87), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
53+
# 探索前往地域鬼王
54+
I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,180,45), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
55+
# 探索前往平安奇谭
56+
I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,180,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
57+
# 探索前往六道之门
58+
I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(938,640,60,49), roi_back=(918,631,200,66), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
59+
# 探索前往契灵之境
60+
I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1037,639,56,49), roi_back=(1018,633,203,64), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
6161
# description
6262
I_BACK_BLUE = RuleImage(roi_front=(32,37,54,52), roi_back=(3,2,130,114), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_blue.png")
6363
# description
6464
I_CHECK_AWAKE = RuleImage(roi_front=(376,565,73,82), roi_back=(376,565,73,82), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_awake.png")
6565
# description
66-
I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,105,298,405), roi_back=(49,105,298,405), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
66+
I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,186,298,237), roi_back=(49,186,298,237), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
6767
# description
6868
I_CHECK_REALM_RAID = RuleImage(roi_front=(129,632,52,48), roi_back=(66,526,233,188), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_realm_raid.png")
6969
# description

‎tasks/GameUi/page.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,29 +78,29 @@ def link(self, button, destination):
7878
page_secret_zones = Page(G.I_CHECK_SECRET_ZONES)
7979
page_secret_zones.link(button=G.I_BACK_BLUE, destination=page_exploration)
8080
page_exploration.link(button=G.I_EXPLORATION_GOTO_SECRET_ZONES, destination=page_secret_zones)
81-
# 地狱鬼王 area boss
81+
# 地域鬼王 area boss
8282
page_area_boss = Page(G.I_CHECK_AREA_BOSS)
8383
page_area_boss.link(button=G.I_BACK_BLUE, destination=page_exploration)
8484
page_exploration.link(button=G.I_EXPLORATION_GOTO_AREA_BOSS, destination=page_area_boss)
85-
# 平安奇谭
85+
# 平安奇谭 heian kitan
8686
page_heian_kitan = Page(G.I_CHECK_HEIAN_KITAN)
8787
page_heian_kitan.link(button=G.I_CHECK_HEIAN_KITAN, destination=page_exploration)
8888
page_exploration.link(button=G.I_EXPLORATION_GOTO_HEIAN_KITAN, destination=page_heian_kitan)
8989
# 六道之门 six gates
9090
page_six_gates = Page(G.I_CHECK_SIX_GATES)
9191
page_six_gates.link(button=G.I_SIX_GATES_GOTO_EXPLORATION, destination=page_exploration)
9292
page_exploration.link(button=G.I_EXPLORATION_GOTO_SIX_GATES, destination=page_six_gates)
93-
# 器灵 bondling_fairyland
93+
# 契灵之境 bondling fairyland
9494
page_bondling_fairyland = Page(G.I_CHECK_BONDLING_FAIRYLAND)
9595
page_bondling_fairyland.link(button=G.I_BACK_YOLLOW, destination=page_exploration)
9696
page_exploration.link(button=G.I_EXPLORATION_GOTO_BONDLING_FAIRYLAND, destination=page_bondling_fairyland)
9797

9898
# ************************************* 町中部分 *****************************************#
99-
# 斗鸡 duel
99+
# 斗技 duel
100100
page_duel = Page(G.I_CHECK_DUEL)
101101
page_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
102102
page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
103-
# 封魔之时 demon_encounter
103+
# 逢魔之时 demon_encounter
104104
page_demon_encounter = Page(G.I_CHECK_DEMON_ENCOUNTER)
105105
page_demon_encounter.link(button=G.I_DEMON_ENCOUNTER_GOTO_TOWN, destination=page_town)
106106
page_town.link(button=G.I_TOWN_GOTO_DEMON_ENCOUNTER, destination=page_demon_encounter)
@@ -112,7 +112,7 @@ def link(self, button, destination):
112112
page_draft_duel = Page(G.I_CHECK_DRAFT_DUEL)
113113
page_draft_duel.link(button=G.I_BACK_YOLLOW, destination=page_town)
114114
page_town.link(button=G.I_TOWN_GOTO_DRAFT_DUEL, destination=page_draft_duel)
115-
# 百鬼奕 hyakkisen
115+
# 百鬼弈 hyakkisen
116116
page_hyakkisen = Page(G.I_CHECK_HYAKKISEN)
117117
page_hyakkisen.link(button=G.I_BACK_YOLLOW, destination=page_town)
118118
page_town.link(button=G.I_TOWN_GOTO_HYAKKISEN, destination=page_hyakkisen)

‎tasks/GameUi/page/page_check_soul_zones.png‎

-68.2 KB
Loading

‎tasks/GameUi/page/page_img.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"roiBack": "33,619,113,79",
4343
"method": "Template matching",
4444
"threshold": 0.8,
45-
"description": "description"
45+
"description": "探索前往觉醒"
4646
},
4747
{
4848
"itemName": "exploration_goto_soul_zone",
@@ -51,79 +51,79 @@
5151
"roiBack": "138,620,89,75",
5252
"method": "Template matching",
5353
"threshold": 0.8,
54-
"description": "description"
54+
"description": "探索前往御魂"
5555
},
5656
{
5757
"itemName": "exploration_goto_realm_raid",
5858
"imageName": "page_exploration_goto_realm_raid.png",
5959
"roiFront": "248,636,67,48",
60-
"roiBack": "229,612,102,87",
60+
"roiBack": "229,612,203,87",
6161
"method": "Template matching",
6262
"threshold": 0.8,
63-
"description": "description"
63+
"description": "探索前往结界突破"
6464
},
6565
{
6666
"itemName": "exploration_goto_goryou_realm",
6767
"imageName": "page_exploration_goto_goryou_realm.png",
6868
"roiFront": "353,639,47,45",
69-
"roiBack": "346,626,60,67",
69+
"roiBack": "346,626,178,67",
7070
"method": "Template matching",
7171
"threshold": 0.7,
72-
"description": "前往御灵"
72+
"description": "探索前往御灵"
7373
},
7474
{
7575
"itemName": "exploration_goto_delegation",
7676
"imageName": "page_exploration_goto_delegation.png",
7777
"roiFront": "445,638,60,50",
78-
"roiBack": "445,638,60,50",
78+
"roiBack": "445,638,180,50",
7979
"method": "Template matching",
8080
"threshold": 0.8,
81-
"description": "式神委派"
81+
"description": "探索前往式神委派"
8282
},
8383
{
8484
"itemName": "exploration_goto_secret_zones",
8585
"imageName": "page_exploration_goto_secret_zones.png",
8686
"roiFront": "546,628,61,55",
87-
"roiBack": "524,614,100,87",
87+
"roiBack": "524,614,200,87",
8888
"method": "Template matching",
8989
"threshold": 0.8,
90-
"description": "秘闻"
90+
"description": "探索前往秘闻"
9191
},
9292
{
9393
"itemName": "exploration_goto_area_boss",
9494
"imageName": "page_exploration_goto_area_boss.png",
9595
"roiFront": "640,638,51,45",
96-
"roiBack": "640,638,51,45",
96+
"roiBack": "640,638,180,45",
9797
"method": "Template matching",
9898
"threshold": 0.8,
99-
"description": "地狱鬼王"
99+
"description": "探索前往地域鬼王"
100100
},
101101
{
102102
"itemName": "exploration_goto_heian_kitan",
103103
"imageName": "page_exploration_goto_heian_kitan.png",
104104
"roiFront": "739,643,52,44",
105-
"roiBack": "739,643,52,44",
105+
"roiBack": "739,643,180,44",
106106
"method": "Template matching",
107107
"threshold": 0.8,
108-
"description": "平安奇谭"
108+
"description": "探索前往平安奇谭"
109109
},
110110
{
111111
"itemName": "exploration_goto_six_gates",
112112
"imageName": "page_exploration_goto_six_gates.png",
113-
"roiFront": "838,640,60,49",
114-
"roiBack": "818,631,200,66",
113+
"roiFront": "938,640,60,49",
114+
"roiBack": "918,631,200,66",
115115
"method": "Template matching",
116116
"threshold": 0.8,
117-
"description": "六道之门"
117+
"description": "探索前往六道之门"
118118
},
119119
{
120120
"itemName": "exploration_goto_bondling_fairyland",
121121
"imageName": "page_exploration_goto_bondling_fairyland.png",
122-
"roiFront": "937,639,56,49",
123-
"roiBack": "928,633,203,64",
122+
"roiFront": "1037,639,56,49",
123+
"roiBack": "1018,633,203,64",
124124
"method": "Template matching",
125125
"threshold": 0.8,
126-
"description": "器灵"
126+
"description": "探索前往契灵之境"
127127
},
128128
{
129129
"itemName": "back_blue",
@@ -146,8 +146,8 @@
146146
{
147147
"itemName": "check_soul_zones",
148148
"imageName": "page_check_soul_zones.png",
149-
"roiFront": "49,105,298,405",
150-
"roiBack": "49,105,298,405",
149+
"roiFront": "49,186,298,237",
150+
"roiBack": "49,186,298,237",
151151
"method": "Template matching",
152152
"threshold": 0.8,
153153
"description": "description"

‎tasks/HeroTest/as/image.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"itemName": "two",
1313
"imageName": "as_two.png",
1414
"roiFront": "819,685,95,26",
15-
"roiBack": "819,685,95,26",
15+
"roiBack": "819,685,200,26",
1616
"method": "Template matching",
1717
"threshold": 0.8,
1818
"description": "进入活动第二步"

‎tasks/HeroTest/assets.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class HeroTestAssets:
1414
# 进入活动第一步
1515
I_ONE = RuleImage(roi_front=(633,106,88,105), roi_back=(633,106,88,105), threshold=0.7, method="Template matching", file="./tasks/HeroTest/as/as_one.png")
1616
# 进入活动第二步
17-
I_TWO = RuleImage(roi_front=(819,685,95,26), roi_back=(819,685,95,26), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_two.png")
17+
I_TWO = RuleImage(roi_front=(819,685,95,26), roi_back=(819,685,200,26), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_two.png")
1818
# 点击鬼兵演武
1919
I_GBB = RuleImage(roi_front=(95,344,37,131), roi_back=(95,344,37,131), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_gbb.png")
2020
# 爬塔返回按钮

‎tasks/Hyakkiyakou/assets.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ class HyakkiyakouAssets:
164164
I_FRIEND_SAME_2_RECALL = RuleImage(roi_front=(168,126,100,60), roi_back=(152,112,133,80), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
165165
# 回归活动使用
166166
I_FRIEND_REMOTE_2_RECALL = RuleImage(roi_front=(296,122,100,56), roi_back=(278,115,131,81), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
167+
# description
168+
I_FRIEND_RYOU_1 = RuleImage(roi_front=(328,128,80,45), roi_back=(328,128,80,45), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_ryou_1.png")
169+
# description
170+
I_FRIEND_RYOU_2 = RuleImage(roi_front=(328,128,80,45), roi_back=(328,128,80,45), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_ryou_2.png")
167171

168172

169173
# Ocr Rule Assets

‎tasks/Hyakkiyakou/hya/hya_friend_ryou_1.png‎

5.38 KB
Loading

‎tasks/Hyakkiyakou/hya/hya_friend_ryou_2.png‎

6.1 KB
Loading

‎tasks/Hyakkiyakou/hya/image5.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,23 @@
7070
"method": "Template matching",
7171
"threshold": 0.8,
7272
"description": "回归活动使用"
73+
},
74+
{
75+
"itemName": "friend_ryou_1",
76+
"imageName": "hya_friend_ryou_1.png",
77+
"roiFront": "328,128,80,45",
78+
"roiBack": "328,128,80,45",
79+
"method": "Template matching",
80+
"threshold": 0.8,
81+
"description": "description"
82+
},
83+
{
84+
"itemName": "friend_ryou_2",
85+
"imageName": "hya_friend_ryou_2.png",
86+
"roiFront": "328,128,80,45",
87+
"roiBack": "328,128,80,45",
88+
"method": "Template matching",
89+
"threshold": 0.8,
90+
"description": "description"
7391
}
7492
]

0 commit comments

Comments
 (0)