Skip to content

Commit fc68a2a

Browse files
runheyrunhey
authored
Merge pull request #1916 from runhey/dev
Dev
2 parents 3ffe7d3 + b3d6fe9 commit fc68a2a

69 files changed

Lines changed: 225 additions & 300 deletions

Some content is hidden

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

‎tasks/AbyssShadows/script_task.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,13 @@ def run_general_battle_back(self, Monster_type: str) -> bool:
547547
self.screenshot()
548548
if self.appear_then_click(self.I_EXIT, interval=2):
549549
continue
550-
if self.appear_then_click(self.I_EXIT_ENSURE, interval=2):
550+
if self.appear_then_click(self.I_UI_CONFIRM, interval=2):
551551
continue
552552
if self.appear_then_click(self.I_WIN, interval=2):
553553
continue
554554
if self.appear(self.I_ABYSS_NAVIGATION):
555555
break
556-
logger.info(f"Click {self.I_EXIT_ENSURE.name}")
556+
logger.info(f"Click {self.I_UI_CONFIRM.name}")
557557

558558
return True
559559

‎tasks/ActivityShikigami/as/as_lock.png‎

-273 Bytes
Loading

‎tasks/ActivityShikigami/as/as_shi.png‎

-54 Bytes
Loading

‎tasks/ActivityShikigami/as/as_to_battle_main.png‎

-11.5 KB
Loading

‎tasks/ActivityShikigami/as/as_to_battle_main_2.png‎

-7.62 KB
Loading

‎tasks/ActivityShikigami/as/image.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"imageName": "as_lock.png",
55
"roiFront": "825,657,28,25",
66
"roiBack": "739,432,440,266",
7-
"method": "Template matching",
7+
"method": "Multi-scale template matching",
88
"threshold": 0.5,
99
"description": "上锁图标"
1010
},

‎tasks/ActivityShikigami/as/pages.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
{
3939
"itemName": "to_battle_main",
4040
"imageName": "as_to_battle_main.png",
41-
"roiFront": "302,178,98,111",
42-
"roiBack": "223,110,238,269",
41+
"roiFront": "220,247,97,44",
42+
"roiBack": "172,122,238,269",
4343
"method": "Template matching",
4444
"threshold": 0.8,
4545
"description": "进入主要的战斗界面"
@@ -83,8 +83,8 @@
8383
{
8484
"itemName": "to_battle_main_2",
8585
"imageName": "as_to_battle_main_2.png",
86-
"roiFront": "15,94,247,38",
87-
"roiBack": "2,68,311,100",
86+
"roiFront": "819,458,103,33",
87+
"roiBack": "799,431,142,87",
8888
"method": "Template matching",
8989
"threshold": 0.65,
9090
"description": "description"

‎tasks/ActivityShikigami/assets.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ActivityShikigamiAssets:
2525

2626
# Image Rule Assets
2727
# 上锁图标
28-
I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,432,440,266), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
28+
I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,432,440,266), threshold=0.5, method="Multi-scale template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
2929
# 还未上锁图片
3030
I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,426,444,276), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
3131
# 活动爬塔标志
@@ -46,7 +46,7 @@ class ActivityShikigamiAssets:
4646
# 红色退出
4747
I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
4848
# 进入主要的战斗界面
49-
I_TO_BATTLE_MAIN = RuleImage(roi_front=(302,178,98,111), roi_back=(223,110,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
49+
I_TO_BATTLE_MAIN = RuleImage(roi_front=(220,247,97,44), roi_back=(172,122,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
5050
# 点击进入boss战斗页面
5151
I_TO_BATTLE_BOSS = RuleImage(roi_front=(1111,248,37,136), roi_back=(979,142,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
5252
# description
@@ -56,30 +56,30 @@ class ActivityShikigamiAssets:
5656
# 从main进入到式神录
5757
I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1001,558,39,42), roi_back=(966,534,140,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
5858
# description
59-
I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
59+
I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(819,458,103,33), roi_back=(799,431,142,87), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
6060
# 确认跳过
6161
I_CONFIRM_SKIP = RuleImage(roi_front=(707,442,137,38), roi_back=(656,397,231,124), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_confirm_skip.png")
6262

6363

6464
# Image Rule Assets
6565
# description
66-
I_PASS_1 = RuleImage(roi_front=(359,295,100,53), roi_back=(68,203,1138,369), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
66+
I_PASS_1 = RuleImage(roi_front=(594,330,37,58), roi_back=(462,310,337,91), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
6767
# description
68-
I_PASS_2 = RuleImage(roi_front=(645,224,92,57), roi_back=(98,205,1076,366), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_2.png")
68+
I_PASS_2 = RuleImage(roi_front=(625,335,31,44), roi_back=(562,326,182,66), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_2.png")
6969
# description
70-
I_PASS_3 = RuleImage(roi_front=(648,227,91,55), roi_back=(103,162,1077,416), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
70+
I_PASS_3 = RuleImage(roi_front=(1178,620,71,61), roi_back=(1149,606,111,92), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_3.png")
7171
# description
72-
I_PASS_4 = RuleImage(roi_front=(586,424,100,58), roi_back=(99,194,1080,398), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
73-
# 箱子
74-
I_PASS_5 = RuleImage(roi_front=(946,415,65,48), roi_back=(97,194,1036,398), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
72+
I_PASS_4 = RuleImage(roi_front=(482,499,58,54), roi_back=(448,439,126,137), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_4.png")
73+
# 第一个
74+
I_PASS_5 = RuleImage(roi_front=(421,286,65,48), roi_back=(419,287,69,51), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_5.png")
7575
# 印记
76-
I_PASS_6 = RuleImage(roi_front=(668,221,54,50), roi_back=(107,159,1012,394), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_6.png")
76+
I_PASS_6 = RuleImage(roi_front=(548,333,54,50), roi_back=(547,335,58,52), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_6.png")
7777
# description
78-
I_PASS_7 = RuleImage(roi_front=(329,233,51,51), roi_back=(95,180,1056,394), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_7.png")
78+
I_PASS_7 = RuleImage(roi_front=(672,381,51,51), roi_back=(668,377,59,60), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_7.png")
7979
# 印记选中间的
80-
I_PASS_8 = RuleImage(roi_front=(579,276,100,100), roi_back=(577,296,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_8.png")
81-
# description
82-
I_PASS_9 = RuleImage(roi_front=(558,643,160,44), roi_back=(480,601,306,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_9.png")
80+
I_PASS_8 = RuleImage(roi_front=(794,333,62,63), roi_back=(791,334,70,67), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_8.png")
81+
# 第五个
82+
I_PASS_9 = RuleImage(roi_front=(929,285,50,40), roi_back=(921,278,70,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_9.png")
8383
# 印记选左边的
8484
I_PASS_10 = RuleImage(roi_front=(279,309,100,100), roi_back=(291,305,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_10.png")
8585
# 印记选右边的
@@ -94,9 +94,9 @@ class ActivityShikigamiAssets:
9494
# 挑战
9595
O_FIRE = RuleOcr(roi=(1135,599,85,49), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
9696
# 体力的数量检测
97-
O_REMAIN_AP = RuleOcr(roi=(584,17,63,27), area=(583,16,63,30), mode="Digit", method="Default", keyword="", name="remain_ap")
97+
O_REMAIN_AP = RuleOcr(roi=(777,16,63,27), area=(776,15,63,30), mode="Digit", method="Default", keyword="", name="remain_ap")
9898
# 活动体力的剩余检测
99-
O_REMAIN_PASS = RuleOcr(roi=(791,18,50,29), area=(791,18,49,28), mode="Digit", method="Default", keyword="", name="remain_pass")
99+
O_REMAIN_PASS = RuleOcr(roi=(1153,24,50,29), area=(1153,26,49,28), mode="Digit", method="Default", keyword="", name="remain_pass")
100100
# 还有多少次购买体力的机会
101101
O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
102102
# 活动票数（没有百分比）

‎tasks/ActivityShikigami/fire/fire_pass_1.png‎

-4.04 KB
Loading

‎tasks/ActivityShikigami/fire/fire_pass_2.png‎

-7.1 KB
Loading

0 commit comments

Comments
 (0)