Selaa lähdekoodia

Merge pull request #1462 from AzurTian/dev_act

fix(ActivityShikigami): 适配新爬塔
huangrunheng 8 kuukautta sitten
vanhempi
sitoutus
99f57116db

+ 9 - 142
tasks/ActivityShikigami/README.md

@@ -24,6 +24,15 @@
 
 
 ![image-20251220104718877](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201047907.png)
 ![image-20251220104718877](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201047907.png)
 
 
+## 关于活动切换(`./as/image.json`文件)
+
+#### 图片 `climb_mode_pass` 门票爬塔标志 | `climb_mode_ap` 体力爬塔标志 | `climb_mode_switch` 切换门票爬塔和体力爬塔按钮
+
+![climb_mode_pass](https://raw.githubusercontent.com/AzurTian/ImgBed/master/blog/climb_mode_pass.png)
+
+![climb_mode_ap](https://raw.githubusercontent.com/AzurTian/ImgBed/master/blog/1.png)
+
+![climb_mode_switch](https://raw.githubusercontent.com/AzurTian/ImgBed/master/blog/2.png)
 
 
 
 
 ## 关于战斗更新 (`./fire/ocr.json`文件)
 ## 关于战斗更新 (`./fire/ocr.json`文件)
@@ -36,145 +45,3 @@
 
 
 ![image-20251220111505769](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201115927.png)
 ![image-20251220111505769](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201115927.png)
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

BIN
tasks/ActivityShikigami/as/as_battle_main_to_records.png


BIN
tasks/ActivityShikigami/as/as_check_battle_main.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_ap.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_pass.png


BIN
tasks/ActivityShikigami/as/as_climb_mode_switch.png


BIN
tasks/ActivityShikigami/as/as_confirm_skip.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_skip_button.png


BIN
tasks/ActivityShikigami/as/as_to_battle_boss.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 8 - 8
tasks/ActivityShikigami/as/click.json

@@ -1,26 +1,26 @@
 [
 [
   {
   {
     "itemName": "random_left",
     "itemName": "random_left",
-    "roiFront": "17,69,132,599",
-    "roiBack": "17,70,137,599",
+    "roiFront": "17,107,104,378",
+    "roiBack": "17,103,106,385",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "random_right",
     "itemName": "random_right",
-    "roiFront": "1133,55,131,638",
-    "roiBack": "1131,55,133,638",
+    "roiFront": "1133,110,131,408",
+    "roiBack": "1131,108,133,412",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "random_top",
     "itemName": "random_top",
-    "roiFront": "84,49,1159,93",
-    "roiBack": "85,46,1159,101",
+    "roiFront": "126,49,904,75",
+    "roiBack": "123,47,911,77",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "random_bottom",
     "itemName": "random_bottom",
-    "roiFront": "179,598,972,78",
-    "roiBack": "179,597,972,81",
+    "roiFront": "179,598,932,78",
+    "roiBack": "179,597,932,81",
     "description": "description"
     "description": "description"
   },
   },
   {
   {

+ 6 - 6
tasks/ActivityShikigami/as/image.json

@@ -20,8 +20,8 @@
   {
   {
     "itemName": "climb_mode_pass",
     "itemName": "climb_mode_pass",
     "imageName": "as_climb_mode_pass.png",
     "imageName": "as_climb_mode_pass.png",
-    "roiFront": "1142,546,21,21",
-    "roiBack": "1118,500,62,100",
+    "roiFront": "1151,534,21,21",
+    "roiBack": "1118,510,70,69",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "活动爬塔标志"
     "description": "活动爬塔标志"
@@ -29,8 +29,8 @@
   {
   {
     "itemName": "climb_mode_ap",
     "itemName": "climb_mode_ap",
     "imageName": "as_climb_mode_ap.png",
     "imageName": "as_climb_mode_ap.png",
-    "roiFront": "1091,545,22,25",
-    "roiBack": "1049,504,100,100",
+    "roiFront": "1101,532,22,25",
+    "roiBack": "1055,495,100,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "体力爬塔标志"
     "description": "体力爬塔标志"
@@ -38,8 +38,8 @@
   {
   {
     "itemName": "climb_mode_switch",
     "itemName": "climb_mode_switch",
     "imageName": "as_climb_mode_switch.png",
     "imageName": "as_climb_mode_switch.png",
-    "roiFront": "1233,543,29,26",
-    "roiBack": "1179,494,100,100",
+    "roiFront": "1237,532,29,26",
+    "roiBack": "1174,511,104,82",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

+ 14 - 5
tasks/ActivityShikigami/as/pages.json

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1184,460,47,29",
+    "roiFront": "1184,384,47,29",
     "roiBack": "1164,134,83,393",
     "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -38,7 +38,7 @@
   {
   {
     "itemName": "to_battle_main",
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "141,310,39,176",
+    "roiFront": "223,287,39,176",
     "roiBack": "100,242,238,269",
     "roiBack": "100,242,238,269",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -47,7 +47,7 @@
   {
   {
     "itemName": "to_battle_boss",
     "itemName": "to_battle_boss",
     "imageName": "as_to_battle_boss.png",
     "imageName": "as_to_battle_boss.png",
-    "roiFront": "1093,293,37,136",
+    "roiFront": "1076,241,37,136",
     "roiBack": "934,209,234,327",
     "roiBack": "934,209,234,327",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "check_battle_main",
     "itemName": "check_battle_main",
     "imageName": "as_check_battle_main.png",
     "imageName": "as_check_battle_main.png",
-    "roiFront": "34,639,39,46",
-    "roiBack": "12,597,264,105",
+    "roiFront": "842,565,39,45",
+    "roiBack": "688,499,415,203",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -88,5 +88,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.65,
     "threshold": 0.65,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "confirm_skip",
+    "imageName": "as_confirm_skip.png",
+    "roiFront": "707,442,137,38",
+    "roiBack": "656,397,231,124",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "确认跳过"
   }
   }
 ]
 ]

+ 15 - 13
tasks/ActivityShikigami/assets.py

@@ -12,13 +12,13 @@ class ActivityShikigamiAssets:
 
 
 	# Click Rule Assets
 	# Click Rule Assets
 	# description 
 	# description 
-	C_RANDOM_LEFT = RuleClick(roi_front=(17,69,132,599), roi_back=(17,70,137,599), name="random_left")
+	C_RANDOM_LEFT = RuleClick(roi_front=(17,107,104,378), roi_back=(17,103,106,385), name="random_left")
 	# description 
 	# description 
-	C_RANDOM_RIGHT = RuleClick(roi_front=(1133,55,131,638), roi_back=(1131,55,133,638), name="random_right")
+	C_RANDOM_RIGHT = RuleClick(roi_front=(1133,110,131,408), roi_back=(1131,108,133,412), name="random_right")
 	# description 
 	# description 
-	C_RANDOM_TOP = RuleClick(roi_front=(84,49,1159,93), roi_back=(85,46,1159,101), name="random_top")
+	C_RANDOM_TOP = RuleClick(roi_front=(126,49,904,75), roi_back=(123,47,911,77), name="random_top")
 	# description 
 	# description 
-	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,598,972,78), roi_back=(179,597,972,81), name="random_bottom")
+	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,598,932,78), roi_back=(179,597,932,81), name="random_bottom")
 	# description 
 	# description 
 	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
 	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
 
 
@@ -29,16 +29,16 @@ class ActivityShikigamiAssets:
 	# 还未上锁图片 
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,95), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,95), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 活动爬塔标志 
 	# 活动爬塔标志 
-	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1142,546,21,21), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
+	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1151,534,21,21), roi_back=(1118,510,70,69), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
 	# 体力爬塔标志 
 	# 体力爬塔标志 
-	I_CLIMB_MODE_AP = RuleImage(roi_front=(1091,545,22,25), roi_back=(1049,504,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
+	I_CLIMB_MODE_AP = RuleImage(roi_front=(1101,532,22,25), roi_back=(1055,495,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
 	# 切换按键 
 	# 切换按键 
-	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1233,543,29,26), roi_back=(1179,494,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_switch.png")
+	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1237,532,29,26), roi_back=(1174,511,104,82), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_switch.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入活动 
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1184,460,47,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1184,384,47,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 右上跳过按钮 
 	# 右上跳过按钮 
@@ -46,17 +46,19 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	# 红色退出 
 	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")
 	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")
 	# 进入主要的战斗界面 
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(141,310,39,176), roi_back=(100,242,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(223,287,39,176), roi_back=(100,242,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
 	# 点击进入boss战斗页面 
-	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1093,293,37,136), roi_back=(934,209,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
+	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1076,241,37,136), roi_back=(934,209,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
 	# description 
-	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(34,639,39,46), roi_back=(12,597,264,105), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(842,565,39,45), roi_back=(688,499,415,203), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
 	# description 
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(34,365,45,35), roi_back=(20,328,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(34,365,45,35), roi_back=(20,328,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	# 从main进入到式神录 
 	# 从main进入到式神录 
 	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1017,572,39,42), roi_back=(976,539,146,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1017,572,39,42), roi_back=(976,539,146,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 	# description 
 	# description 
 	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")
 	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")
+	# 确认跳过 
+	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")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
@@ -92,9 +94,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(575,16,73,29), area=(575,16,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(930,18,98,29), area=(925,12,109,40), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(783,18,57,28), area=(783,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(518,18,88,28), area=(514,12,97,38), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
 	# 活动票数(没有百分比) 

+ 4 - 4
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "575,16,73,29",
-    "roiBack": "575,16,73,29",
+    "roiFront": "930,18,98,29",
+    "roiBack": "925,12,109,40",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   },
   {
   {
     "itemName": "remain_pass",
     "itemName": "remain_pass",
-    "roiFront": "783,18,57,28",
-    "roiBack": "783,18,57,28",
+    "roiFront": "518,18,88,28",
+    "roiBack": "514,12,97,38",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 1 - 1
tasks/ActivityShikigami/page.py

@@ -19,7 +19,7 @@ from tasks.base_task import BaseTask as BT
 
 
 # 爬塔活动主要界面
 # 爬塔活动主要界面
 page_climb_act = Page(asa.I_TO_BATTLE_MAIN)
 page_climb_act = Page(asa.I_TO_BATTLE_MAIN)
-page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT]
+page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_CONFIRM_SKIP, asa.I_RED_EXIT]
 page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
 page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=[asa.I_SHI, RAA.I_TOGGLE_BUTTON], destination=page_climb_act)
 page_main.link(button=[asa.I_SHI, RAA.I_TOGGLE_BUTTON], destination=page_climb_act)
 
 

+ 14 - 28
tasks/ActivityShikigami/script_task.py

@@ -297,28 +297,16 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if self.appear_then_click(self.I_WIN, interval=2):
             if self.appear_then_click(self.I_WIN, interval=2):
                 continue
                 continue
             #  出现 “魂” 和 紫蛇皮
             #  出现 “魂” 和 紫蛇皮
-            if self.appear(self.I_REWARD):
-                logger.info('Win battle')
-                while 1:
-                    self.screenshot()
-                    # appear_reward = self.appear_then_click(self.I_REWARD)
-                    appear_reward_purple_snake_skin = self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN)
-                    appear_reward = self.appear(self.I_REWARD)
-                    if appear_reward:
-                        self.click(self.I_REWARD, interval=0.9)
-                    if not appear_reward and not appear_reward_purple_snake_skin:
-                        break
-                    if appear_reward or appear_reward_purple_snake_skin:
-                        reward_click = random.choice(
-                            [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT])
-                        self.click(reward_click, interval=1.8)
-                        continue
-                return True
+            if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) or \
+                    self.appear(self.I_REWARD_GOLD) or self.appear(self.I_REWARD_GOLD_SNAKE_SKIN):
+                self.random_reward_click(exclude_click=[self.C_RANDOM_RIGHT])
+                ok_cnt += 1
+                continue
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
-            # if ok_cnt > 0 and not self.is_in_battle(False):
-            #     self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
-            #     ok_cnt += 1
-            #     continue
+            if ok_cnt > 0 and not self.is_in_battle(False):
+                self.random_reward_click(exclude_click=[self.C_RANDOM_RIGHT])
+                ok_cnt += 1
+                continue
             # 战斗中随机滑动
             # 战斗中随机滑动
             if ok_cnt == 0 and random_click_swipt_enable:
             if ok_cnt == 0 and random_click_swipt_enable:
                 self.random_click_swipt()
                 self.random_click_swipt()
@@ -326,11 +314,12 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
 
 
     def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
     def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
         conf = self.conf.switch_soul_config
         conf = self.conf.switch_soul_config
-        conf.validate_switch_soul()
         enable_switch = getattr(conf, f"enable_switch_{self.climb_type}", False)
         enable_switch = getattr(conf, f"enable_switch_{self.climb_type}", False)
         enable_by_name = getattr(conf, f"enable_switch_{self.climb_type}_by_name", False)
         enable_by_name = getattr(conf, f"enable_switch_{self.climb_type}_by_name", False)
         if not enable_switch and not enable_by_name:
         if not enable_switch and not enable_by_name:
             return
             return
+        logger.hr('Start switch soul', 2)
+        conf.validate_switch_soul()
         self.ui_click(enter_button, stop=self.I_CHECK_RECORDS, interval=1)
         self.ui_click(enter_button, stop=self.I_CHECK_RECORDS, interval=1)
         if enable_by_name:
         if enable_by_name:
             group, team = getattr(conf, f"{self.climb_type}_group_team_name").split(",")
             group, team = getattr(conf, f"{self.climb_type}_group_team_name").split(",")
@@ -372,16 +361,13 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.screenshot()
         self.screenshot()
         remain_times = 0
         remain_times = 0
         if self.climb_type == 'pass':
         if self.climb_type == 'pass':
-            remain_times = self.O_REMAIN_PASS.ocr_digit(
-                _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_PASS))
+            remain_times = self.O_REMAIN_PASS.ocr_digit(self.device.image)
         if self.climb_type == 'ap':
         if self.climb_type == 'ap':
-            remain_times = self.O_REMAIN_AP.ocr_digit(
-                _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP))
+            remain_times = self.O_REMAIN_AP.ocr_digit(self.device.image)
         if self.climb_type == 'boss':
         if self.climb_type == 'boss':
             _, remain_times, _ = self.O_REMAIN_BOSS.ocr_digit_counter(self.device.image)
             _, remain_times, _ = self.O_REMAIN_BOSS.ocr_digit_counter(self.device.image)
         if self.climb_type == 'ap100':
         if self.climb_type == 'ap100':
-            remain_times = self.O_REMAIN_AP100.ocr_digit(
-                _prepare_image_for_ocr(self.device.image, asset=self.O_REMAIN_AP100))
+            remain_times = self.O_REMAIN_AP100.ocr_digit(self.device.image)
         return remain_times > 0
         return remain_times > 0
 
 
     def get_general_battle_conf(self) -> tasks.Component.GeneralBattle.config_general_battle.GeneralBattleConfig:
     def get_general_battle_conf(self) -> tasks.Component.GeneralBattle.config_general_battle.GeneralBattleConfig: