Kaynağa Gözat

fix(ActivityShikigami): Update

ryland 5 ay önce
ebeveyn
işleme
7b16698369

BIN
tasks/ActivityShikigami/as/as_battle_main_to_records.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_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 4 - 4
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": "1151,534,21,21",
-    "roiBack": "1118,510,70,69",
+    "roiFront": "1142,546,21,21",
+    "roiBack": "1129,510,48,69",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "活动爬塔标志"
     "description": "活动爬塔标志"
@@ -29,7 +29,7 @@
   {
   {
     "itemName": "climb_mode_ap",
     "itemName": "climb_mode_ap",
     "imageName": "as_climb_mode_ap.png",
     "imageName": "as_climb_mode_ap.png",
-    "roiFront": "1101,532,22,25",
+    "roiFront": "1093,544,20,20",
     "roiBack": "1055,495,100,100",
     "roiBack": "1055,495,100,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -38,7 +38,7 @@
   {
   {
     "itemName": "climb_mode_switch",
     "itemName": "climb_mode_switch",
     "imageName": "as_climb_mode_switch.png",
     "imageName": "as_climb_mode_switch.png",
-    "roiFront": "1237,532,29,26",
+    "roiFront": "1232,543,29,26",
     "roiBack": "1174,511,104,82",
     "roiBack": "1174,511,104,82",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,

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

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1182,379,43,29",
+    "roiFront": "1187,304,43,29",
     "roiBack": "1164,134,83,393",
     "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -38,8 +38,8 @@
   {
   {
     "itemName": "to_battle_main",
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "825,309,39,176",
-    "roiBack": "737,264,238,269",
+    "roiFront": "403,300,39,176",
+    "roiBack": "313,246,238,269",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
     "description": "进入主要的战斗界面"
@@ -56,7 +56,7 @@
   {
   {
     "itemName": "check_battle_main",
     "itemName": "check_battle_main",
     "imageName": "as_check_battle_main.png",
     "imageName": "as_check_battle_main.png",
-    "roiFront": "27,637,62,58",
+    "roiFront": "50,642,62,58",
     "roiBack": "1,510,415,203",
     "roiBack": "1,510,415,203",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -74,7 +74,7 @@
   {
   {
     "itemName": "battle_main_to_records",
     "itemName": "battle_main_to_records",
     "imageName": "as_battle_main_to_records.png",
     "imageName": "as_battle_main_to_records.png",
-    "roiFront": "999,557,39,42",
+    "roiFront": "1018,562,39,42",
     "roiBack": "966,534,140,100",
     "roiBack": "966,534,140,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,

+ 9 - 9
tasks/ActivityShikigami/assets.py

@@ -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=(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_PASS = RuleImage(roi_front=(1142,546,21,21), roi_back=(1129,510,48,69), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.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_AP = RuleImage(roi_front=(1093,544,20,20), 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=(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")
+	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1232,543,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=(1182,379,43,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=(1187,304,43,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,15 +46,15 @@ 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=(825,309,39,176), roi_back=(737,264,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(403,300,39,176), roi_back=(313,246,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=(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")
 	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=(27,637,62,58), roi_back=(1,510,415,203), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(50,642,62,58), roi_back=(1,510,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=(999,557,39,42), roi_back=(966,534,140,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
+	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1018,562,39,42), roi_back=(966,534,140,100), threshold=0.7, 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")
 	# 确认跳过 
 	# 确认跳过 
@@ -94,9 +94,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(761,25,51,30), area=(761,25,51,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(584,15,63,30), area=(584,15,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(518,18,88,28), area=(514,12,97,38), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(803,17,39,28), area=(803,17,39,28), 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": "761,25,51,30",
-    "roiBack": "761,25,51,30",
+    "roiFront": "584,15,63,30",
+    "roiBack": "584,15,63,30",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   },
   {
   {
     "itemName": "remain_pass",
     "itemName": "remain_pass",
-    "roiFront": "518,18,88,28",
-    "roiBack": "514,12,97,38",
+    "roiFront": "803,17,39,28",
+    "roiBack": "803,17,39,28",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 1 - 7
tasks/ActivityShikigami/script_task.py

@@ -151,10 +151,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.limit_time: timedelta = self.conf.general_climb.limit_time_v
         self.limit_time: timedelta = self.conf.general_climb.limit_time_v
         #
         #
         for climb_type in self.conf.general_climb.run_sequence_v:
         for climb_type in self.conf.general_climb.run_sequence_v:
-            # 2026.04.04>>>----------------------------------------------------------------
-            if climb_type not in ['ap']:
-                continue
-            # 2026.04.04<<<----------------------------------------------------------------
             # 进入到活动的主页面,不是具体的战斗页面
             # 进入到活动的主页面,不是具体的战斗页面
             self.ui_get_current_page()
             self.ui_get_current_page()
             self.ui_goto(game.page_climb_act)
             self.ui_goto(game.page_climb_act)
@@ -224,9 +220,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
         self.ui_clicks([self.I_TO_BATTLE_MAIN, self.I_TO_BATTLE_MAIN_2],
                        stop=self.I_CHECK_BATTLE_MAIN, interval=1)
                        stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
-        # 2026.04.04>>>----------------------------------------------------------------
-        # self.switch_climb_mode_in_game('ap')
-        # 2026.04.04<<<----------------------------------------------------------------
+        self.switch_climb_mode_in_game('ap')
 
 
         ocr_limit_timer = Timer(1).start()
         ocr_limit_timer = Timer(1).start()
         while 1:
         while 1: