Explorar el Código

Merge pull request #1363 from runhey/dev

Automated PR 2026.01.15
huangrunheng hace 10 meses
padre
commit
3c5ded024f

+ 2 - 2
module/device/device.py

@@ -202,8 +202,8 @@ class Device(Platform, Screenshot, Control, AppControl):
         count = {}
         count = {}
         for key in self.click_record:
         for key in self.click_record:
             count[key] = count.get(key, 0) + 1
             count[key] = count.get(key, 0) + 1
-        count = sorted(count.items(), key=lambda item: item[1])
-        if count[0][1] >= 12:
+        count = sorted(count.items(), key=lambda item: item[1], reverse=True)
+        if count[0][1] >= 10:
             logger.warning(f'Too many click for a button: {count[0][0]}')
             logger.warning(f'Too many click for a button: {count[0][0]}')
             logger.warning(f'History click: {[str(prev) for prev in self.click_record]}')
             logger.warning(f'History click: {[str(prev) for prev in self.click_record]}')
             self.click_record_clear()
             self.click_record_clear()

BIN
tasks/ActivityShikigami/as/as_add_max.png


BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


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


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


BIN
tasks/ActivityShikigami/as/as_toggle_button.png


+ 15 - 42
tasks/ActivityShikigami/as/image.json

@@ -18,57 +18,30 @@
     "description": "还未上锁图片"
     "description": "还未上锁图片"
   },
   },
   {
   {
-    "itemName": "ap",
-    "imageName": "as_ap.png",
-    "roiFront": "1181,657,23,24",
-    "roiBack": "1149,631,103,71",
-    "method": "Template matching",
-    "threshold": 0.65,
-    "description": "寿司体力"
-  },
-  {
-    "itemName": "ap_activity",
-    "imageName": "as_ap_activity.png",
-    "roiFront": "1153,636,21,25",
-    "roiBack": "1124,621,84,54",
+    "itemName": "climb_mode_pass",
+    "imageName": "as_climb_mode_pass.png",
+    "roiFront": "1151,528,21,28",
+    "roiBack": "1118,500,62,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "活动体力"
+    "description": "活动爬塔标志"
   },
   },
   {
   {
-    "itemName": "switch",
-    "imageName": "as_switch.png",
-    "roiFront": "1215,551,23,23",
-    "roiBack": "1204,538,74,49",
+    "itemName": "climb_mode_ap",
+    "imageName": "as_climb_mode_ap.png",
+    "roiFront": "1100,530,22,25",
+    "roiBack": "1063,508,100,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "切换按键"
+    "description": "体力爬塔标志"
   },
   },
   {
   {
-    "itemName": "buy_jade",
-    "imageName": "as_buy_jade.png",
-    "roiFront": "1004,192,38,42",
-    "roiBack": "836,619,38,42",
+    "itemName": "climb_mode_switch",
+    "imageName": "as_climb_mode_switch.png",
+    "roiFront": "1238,531,29,26",
+    "roiBack": "1179,494,100,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "购买活动的体力"
-  },
-  {
-    "itemName": "add_max",
-    "imageName": "as_add_max.png",
-    "roiFront": "17,24,33,37",
-    "roiBack": "974,524,57,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "增加到最大"
-  },
-  {
-    "itemName": "toggle_button",
-    "imageName": "as_toggle_button.png",
-    "roiFront": "1193,463,27,25",
-    "roiBack": "1169,146,73,403",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
+    "description": "切换按键"
   }
   }
 ]
 ]

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

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1182,391,47,29",
-    "roiBack": "1164,134,83,318",
+    "roiFront": "1184,300,47,29",
+    "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "进入活动"
     "description": "进入活动"
@@ -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": "646,121,39,176",
-    "roiBack": "606,91,100,241",
+    "roiFront": "478,340,39,176",
+    "roiBack": "449,297,100,241",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
     "description": "进入主要的战斗界面"
@@ -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": "30,130,75,46",
-    "roiBack": "17,104,100,100",
+    "roiFront": "45,629,63,61",
+    "roiBack": "24,602,264,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -74,8 +74,8 @@
   {
   {
     "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": "1208,112,39,42",
-    "roiBack": "1171,86,100,100",
+    "roiFront": "1017,572,39,42",
+    "roiBack": "976,539,146,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "从main进入到式神录"
     "description": "从main进入到式神录"

+ 11 - 17
tasks/ActivityShikigami/assets.py

@@ -28,23 +28,17 @@ class ActivityShikigamiAssets:
 	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,613,276,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,613,276,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.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_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_AP = RuleImage(roi_front=(1181,657,23,24), roi_back=(1149,631,103,71), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
-	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1153,636,21,25), roi_back=(1124,621,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	# 活动爬塔标志 
+	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1151,528,21,28), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
+	# 体力爬塔标志 
+	I_CLIMB_MODE_AP = RuleImage(roi_front=(1100,530,22,25), roi_back=(1063,508,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
 	# 切换按键 
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1215,551,23,23), roi_back=(1204,538,74,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
-	# 购买活动的体力 
-	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
-	# 增加到最大 
-	I_ADD_MAX = RuleImage(roi_front=(17,24,33,37), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
-	# description 
-	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
+	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1238,531,29,26), roi_back=(1179,494,100,100), 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,391,47,29), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1184,300,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")
 	# 右上跳过按钮 
 	# 右上跳过按钮 
@@ -52,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=(646,121,39,176), roi_back=(606,91,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(478,340,39,176), roi_back=(449,297,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
 	# 点击进入boss战斗页面 
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(931,217,37,173), roi_back=(909,198,100,219), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(931,217,37,173), roi_back=(909,198,100,219), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
 	# description 
-	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(30,130,75,46), roi_back=(17,104,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(45,629,63,61), roi_back=(24,602,264,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
 	# description 
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,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=(1208,112,39,42), roi_back=(1171,86,100,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")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
@@ -96,9 +90,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=(749,18,73,29), area=(749,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(939,18,73,29), area=(939,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(959,18,57,28), area=(959,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(552,18,57,28), area=(552,18,57,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")
 	# 活动票数(没有百分比) 
 	# 活动票数(没有百分比) 

+ 5 - 6
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "749,18,73,29",
-    "roiBack": "749,18,73,29",
+    "roiFront": "939,18,73,29",
+    "roiBack": "939,18,73,29",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   },
   {
   {
     "itemName": "remain_pass",
     "itemName": "remain_pass",
-    "roiFront": "959,18,57,28",
-    "roiBack": "959,18,57,28",
+    "roiFront": "552,18,57,28",
+    "roiBack": "552,18,57,28",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -53,8 +53,7 @@
     "keyword": "",
     "keyword": "",
     "description": "boss剩余攻击次数"
     "description": "boss剩余攻击次数"
   },
   },
-
-    {
+  {
     "itemName": "remain_ap100",
     "itemName": "remain_ap100",
     "roiFront": "922,21,112,39",
     "roiFront": "922,21,112,39",
     "roiBack": "913,8,131,62",
     "roiBack": "913,8,131,62",

+ 10 - 56
tasks/ActivityShikigami/script_task.py

@@ -181,6 +181,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         logger.hr(f'Start run climb type PASS', 1)
         logger.hr(f'Start run climb type PASS', 1)
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.ui_click(self.I_TO_BATTLE_MAIN, 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)
+        self.switch_climb_mode_in_game('pass')
 
 
         ocr_limit_timer = Timer(1).start()
         ocr_limit_timer = Timer(1).start()
         click_limit_timer = Timer(4).start()
         click_limit_timer = Timer(4).start()
@@ -193,54 +194,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                 continue
                 continue
             if self.ui_reward_appear_click():
             if self.ui_reward_appear_click():
                 continue
                 continue
-            # 击败魇兽将直接前往下一层
-            # if self.appear(self.I_PASS12):
-            #     logger.info('Found魇兽将')
-            #     from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as GBC1
-            #     _battle_config = GBC1(lock_team_enable=True)
-            #     _battle_config.lock_team_enable = True
-            #     self.ui_click(self.I_PASS12, stop=self.I_PASS_13)
-            #     self.ui_click_until_disappear(self.I_PASS_13, interval=1)
-            #     self.run_general_battle(config=_battle_config)
-            #     continue
-            # 领箱子
-            if self.appear_then_click(self.I_PASS_5):
-                logger.info('Found箱子')
-                continue
-            # 印记
-            if self.appear(self.I_PASS_6):
-                logger.info('Found印记')
-                click_index = 0
-                clicks = [self.I_PASS_8, self.I_PASS_10, self.I_PASS_11]
-                self.ui_click(self.I_PASS_6, stop=self.I_UI_BACK_RED, interval=1)
-                self.screenshot()
-                if not self.appear(self.I_UI_BACK_RED):
-                    continue
-                while 1:
-                    self.screenshot()
-                    if self.ui_reward_appear_click():
-                        break
-                    if not self.appear(self.I_UI_BACK_RED):
-                        break
-                    # 按照顺序 间隔点击
-                    if self.click(clicks[click_index], interval=1):
-                        sleep(1.6)
-                        click_index += 1
-                        click_index = click_index % len(clicks)
-                    if self.appear_then_click(self.I_PASS_9, interval=1.1):
-                        logger.info('Select one done')
-                        continue
-            # 下一层
-            if self.appear_then_click(self.I_PASS_7, interval=1, threshold=0.65):
-                logger.info('Next layer')
-                continue
-            if click_limit_timer.reached():
-                click_limit_timer.reset()
-                if (self.appear_then_click(self.I_PASS_1)
-                        or self.appear_then_click(self.I_PASS_2)
-                        or self.appear_then_click(self.I_PASS_3)
-                        or self.appear_then_click(self.I_PASS_4)):
-                    continue
             if not ocr_limit_timer.reached():
             if not ocr_limit_timer.reached():
                 continue
                 continue
             ocr_limit_timer.reset()
             ocr_limit_timer.reset()
@@ -265,6 +218,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         logger.hr(f'Start run climb type AP')
         logger.hr(f'Start run climb type AP')
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.ui_click(self.I_TO_BATTLE_MAIN, 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)
+        self.switch_climb_mode_in_game('ap')
 
 
         ocr_limit_timer = Timer(1).start()
         ocr_limit_timer = Timer(1).start()
         while 1:
         while 1:
@@ -323,7 +277,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
         for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
             btn.name = "BATTLE_RANDOM"
             btn.name = "BATTLE_RANDOM"
         ok_cnt, max_retry = 0, 5
         ok_cnt, max_retry = 0, 5
-        single_start_time = datetime.now()
         while 1:
         while 1:
             sleep(random.uniform(0.5, 1.5))
             sleep(random.uniform(0.5, 1.5))
             self.screenshot()
             self.screenshot()
@@ -361,13 +314,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             #     self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
             #     self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
             #     ok_cnt += 1
             #     ok_cnt += 1
             #     continue
             #     continue
-            # # 单局到时间自动退出战斗
-            # if ok_cnt == 0 and datetime.now() - single_start_time > self.conf.general_climb.get_single_limit_time(
-            #         self.climb_type, timedelta(days=1)):
-            #     logger.attr(self.climb_type, 'Time limit arrived, close current battle')
-            #     self.exit_battle(skip_first=True)
-            #     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()
@@ -389,6 +335,14 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             self.run_switch_soul(group_team)
             self.run_switch_soul(group_team)
         self.ui_click(self.I_UI_BACK_YELLOW, stop=cur_img, interval=1)
         self.ui_click(self.I_UI_BACK_YELLOW, stop=cur_img, interval=1)
 
 
+    def switch_climb_mode_in_game(self, mode: str = 'ap'):
+        map_check = {
+            'ap': self.I_CLIMB_MODE_AP,
+            'pass': self.I_CLIMB_MODE_PASS,
+        }
+        logger.info(f'Switch climb mode to {mode}')
+        self.ui_click(self.I_CLIMB_MODE_SWITCH, stop=map_check[mode], interval=1)
+
     def lock_team(self, battle_conf: GeneralBattleConfig):
     def lock_team(self, battle_conf: GeneralBattleConfig):
         """
         """
         根据配置判断当前爬塔类型是否锁定阵容, 并执行锁定或解锁
         根据配置判断当前爬塔类型是否锁定阵容, 并执行锁定或解锁

+ 5 - 5
tasks/Hyakkiyakou/.gitignore

@@ -1,5 +1,5 @@
-
-/utils/exp_gen.py
-/temp
-/agent/tagent.py
-/agent/tfocus.py
+
+/utils/exp_gen.py
+/temp
+/agent/tagent.py
+/agent/tfocus.py

+ 22 - 14
tasks/Hyakkiyakou/README.md

@@ -1,14 +1,22 @@
-
-
-
-- agent: 砸豆子的决策模型
-- slave: 针对百鬼对接模拟器的接口
-- debugger.py: 辅助
----
-
-detector: 检测器
-
-tracker: 跟踪器
-
-
-
+
+
+
+- agent: 砸豆子的决策模型
+- slave: 针对百鬼对接模拟器的接口
+- debugger.py: 辅助
+---
+
+detector: 检测器
+
+tracker: 跟踪器
+
+xxz7528的修改:
+1.添加了根据稀有度选择鬼王的函数 in script_task
+    -然而不太管用 因为识别率比较低 但也比没有好 偶尔能识别出来特征鲜明的ssr/sp
+2.延长了完成百鬼后截图记录等待时间,避免截到一半的图 in script_task
+3.添加了没有概率up时不砸ssr/sp的逻辑 in focus.py
+4.添加了冰冻逻辑:仅当目标是ssr/sp且带概率up的时候允许砸冰冻buff,冰冻buff时只砸有概率up的ssr/sp和buff, 删除了gamma和script的冰冻判定逻辑
+    -然而目前由于识别率比较低而且会把各种式神识别成sp蝉冰雪女 这套逻辑仅是添加了 没有启用(在script_task.py里还是会决策冰冻什么都不做)
+
+
+

+ 5 - 5
tasks/Hyakkiyakou/agent/agent.py

@@ -100,9 +100,9 @@ class Agent:
                 case _ if CI.MIN_SR <= _class <= CI.MAX_SR: weight = weights[2]
                 case _ if CI.MIN_SR <= _class <= CI.MAX_SR: weight = weights[2]
                 case _ if CI.MIN_SSR <= _class <= CI.MAX_SSR: weight = 1.5 * weights[1]
                 case _ if CI.MIN_SSR <= _class <= CI.MAX_SSR: weight = 1.5 * weights[1]
                 case _ if CI.MIN_SP <= _class <= CI.MAX_SP: weight = 1.5 * weights[0]
                 case _ if CI.MIN_SP <= _class <= CI.MAX_SP: weight = 1.5 * weights[0]
-                case CI.BUFF_005:  # freeze
-                    weight = -1.
-                    _cy += 100
+                # case CI.BUFF_005:  # freeze
+                #     weight = -1.
+                #     _cy += 100
                 case _: continue
                 case _: continue
             for priority in priorities:  # 我的代码在你之上
             for priority in priorities:  # 我的代码在你之上
                 if priority == _class:
                 if priority == _class:
@@ -126,7 +126,7 @@ class Agent:
                 max_variance = variance
                 max_variance = variance
         return Focus(inputs=tracks[max_index])
         return Focus(inputs=tracks[max_index])
 
 
-    def decision(self, tracks: list[tuple], state: list) -> list:
+    def decision(self, tracks: list[tuple], state: list, freeze: bool = False) -> list:
         not_decision = [-1, -1, False, -1]
         not_decision = [-1, -1, False, -1]
         if not tracks:
         if not tracks:
             return not_decision
             return not_decision
@@ -136,7 +136,7 @@ class Agent:
         self.check_observe(tracks=tracks)
         self.check_observe(tracks=tracks)
         if self.focus is None:
         if self.focus is None:
             return not_decision
             return not_decision
-        result = self.focus.decision(tracks=tracks, strategy=self.strategy, state=[delta_time] + state)
+        result = self.focus.decision(tracks=tracks, strategy=self.strategy, state=[delta_time] + state, freeze=freeze)
         if result[2]:
         if result[2]:
             self.last_throw_time = new_time
             self.last_throw_time = new_time
             self.dbg_throw += 1
             self.dbg_throw += 1

+ 42 - 9
tasks/Hyakkiyakou/agent/focus.py

@@ -9,6 +9,9 @@ from module.logger import logger
 from oashya.labels import id2label, id2name
 from oashya.labels import id2label, id2name
 from oashya.labels import CLASSINDEX as CI
 from oashya.labels import CLASSINDEX as CI
 
 
+# get buff status
+from tasks.Hyakkiyakou.slave.hya_slave import HyaBuff
+
 
 
 class Focus:
 class Focus:
     def __init__(self, inputs: list[tuple]):
     def __init__(self, inputs: list[tuple]):
@@ -67,30 +70,42 @@ velocity: {self._v}"""
         self._h = focus._h
         self._h = focus._h
         self._v = focus._v
         self._v = focus._v
 
 
-    def decision(self, tracks, strategy, state) -> list:
+    def decision(self, tracks, strategy, state, freeze: bool = False) -> list:
 
 
-        buff_omega, buff_cx, buff_cy, buff_v, buff_class = self.omega_buff(tracks, strategy['invite_friend'])
+        buff_states = state[4:] if len(state) > 4 else []  # get buff status:state[4:] = buff_0 ~ buff_3,对应 HyaBuff
+        has_prob_up = any(b == HyaBuff.BUFF_STATE6 for b in buff_states) # 是否存在“概率UP”buff(HyaBuff.BUFF_STATE6)
+        buff_omega, buff_cx, buff_cy, buff_v, buff_class = self.omega_buff(tracks, strategy['invite_friend'], has_prob_up)
         if self._omega > buff_omega:
         if self._omega > buff_omega:
             buffed = False
             buffed = False
             target_x = self._cx + self._v * 100 - (self._w // 2)
             target_x = self._cx + self._v * 100 - (self._w // 2)
             target_y = self._cy - 40
             target_y = self._cy - 40
+            target_class = self._class # new : for class
         else:
         else:
             buffed = True
             buffed = True
             target_x = buff_cx + buff_v * 100
             target_x = buff_cx + buff_v * 100
             target_y = buff_cy - 40  # top left corner
             target_y = buff_cy - 40  # top left corner
-
-        _r = self.r(vector=state, omega=self._omega, omega_buff=self._omega_buff)
+            target_class = buff_class # new : for class
+
+        # ========= 新增:利用和 gamma() 一样的区间判断当前“打的对象”是不是 SSR/SP =========
+        is_rare_ssr_sp = False
+        if CI.MIN_SSR <= target_class <= CI.MAX_SSR and self._omega > buff_omega:
+            is_rare_ssr_sp = True
+        elif CI.MIN_SP <= target_class <= CI.MAX_SP and self._omega > buff_omega:
+            is_rare_ssr_sp = True
+        _r = self.r(vector=state, omega=self._omega, omega_buff=self._omega_buff, is_rare_ssr_sp=is_rare_ssr_sp, freeze=freeze, is_buff=buffed)
         throw = True if _r > 0 else False
         throw = True if _r > 0 else False
         # x, y, throw, number
         # x, y, throw, number
         return [target_x, target_y, throw, 10]
         return [target_x, target_y, throw, 10]
 
 
-    def omega_buff(self, tracks, invite_friend: bool) -> float:
+    def omega_buff(self, tracks, invite_friend: bool, has_prob_up: bool) -> float:
         max_omega = 0.
         max_omega = 0.
         max_cx = 0
         max_cx = 0
         max_cy = 0
         max_cy = 0
         max_v = 0
         max_v = 0
         max_class = 0
         max_class = 0
 
 
+        focus_is_ssr_sp = (CI.MIN_SSR <= self._class <= CI.MAX_SSR or CI.MIN_SP <= self._class <= CI.MAX_SP)
+
         for _id, _class, _conf, _cx, _cy, _w, _h, _v in tracks:
         for _id, _class, _conf, _cx, _cy, _w, _h, _v in tracks:
             _current_omega = 0.
             _current_omega = 0.
             match _class:
             match _class:
@@ -98,8 +113,8 @@ velocity: {self._v}"""
                 case CI.BUFF_006: _current_omega = 2.0
                 case CI.BUFF_006: _current_omega = 2.0
                 case CI.BUFF_007: _current_omega = 2.0 if invite_friend and _cx <= 1000 else 0
                 case CI.BUFF_007: _current_omega = 2.0 if invite_friend and _cx <= 1000 else 0
                 case CI.BUFF_002: _current_omega = 2.0 if self._omega >= 1.5 else 0
                 case CI.BUFF_002: _current_omega = 2.0 if self._omega >= 1.5 else 0
-                case CI.BUFF_003: _current_omega = 2.0 if self._omega >= 1.5 else 0
                 case CI.BUFF_003: _current_omega = 2.0 if self._omega >= 1.5 and _cx <= 640 else 0
                 case CI.BUFF_003: _current_omega = 2.0 if self._omega >= 1.5 and _cx <= 640 else 0
+                # case CI.BUFF_005: _current_omega = max(self._omega + 0.1, 3.0) if focus_is_ssr_sp and has_prob_up else 0 # 冻住,不许跑
                 case _: pass
                 case _: pass
             if _current_omega > max_omega:
             if _current_omega > max_omega:
                 max_omega = _current_omega
                 max_omega = _current_omega
@@ -110,12 +125,30 @@ velocity: {self._v}"""
         return max_omega, max_cx, max_cy, max_v, max_class
         return max_omega, max_cx, max_cy, max_v, max_class
             
             
     @classmethod
     @classmethod
-    def r(cls, vector: list, omega: float, omega_buff: float) -> float:
+    def r(cls, vector: list, omega: float, omega_buff: float, is_rare_ssr_sp: bool, freeze: bool = False, is_buff: bool = False) -> float:
         _omega = max(omega, omega_buff)
         _omega = max(omega, omega_buff)
-        tau = - 140 / (max(101, vector[0]) - 100)
-        upsilon = (vector[1] / 250 - vector[2] / 35)
+        tau = - 140 / (max(101, vector[0]) - 100) # 时间冷却项:避免过密投豆
+        upsilon = (vector[1] / 250 - vector[2] / 35) # 豆子数量 vs 进度:豆多进度低 -> 倾向多砸;豆少进度高 -> 惩罚多砸
         upsilon = 100 * (upsilon**2 if upsilon > 0 else - upsilon**2)
         upsilon = 100 * (upsilon**2 if upsilon > 0 else - upsilon**2)
         result = _omega + tau + upsilon - 0.6
         result = _omega + tau + upsilon - 0.6
         # print(f"total: {result:.4f} | {_omega:.4f} | {tau:.4f} | {upsilon:.4f}")
         # print(f"total: {result:.4f} | {_omega:.4f} | {tau:.4f} | {upsilon:.4f}")
+       
+        buff_states = vector[4:] if len(vector) > 4 else []  # get buff status:vector[4:] = buff_0 ~ buff_3,对应 HyaBuff
+        has_prob_up = any(b == HyaBuff.BUFF_STATE6 for b in buff_states) # 是否存在“概率UP”buff(HyaBuff.BUFF_STATE6)
+
+        # punishment:
+        #    no throwing when ssr/sp with no enhanced probability
+        if is_rare_ssr_sp and not has_prob_up:
+            result = -999.0 # stop throwing nonsense
+        
+        # punishment:
+        #   only throw ssr/sp with enhanced probability or buff when freezed
+        if freeze:
+            # if not (is_rare_ssr_sp and has_prob_up):
+            #     result = -999.0 # stop throwing nonsense
+            # if is_buff:
+            #     result = 5.0
+            result = -999.0
+            
         return result
         return result
 
 

+ 102 - 11
tasks/Hyakkiyakou/script_task.py

@@ -13,7 +13,7 @@ from cached_property import cached_property
 # Use cmd to install: ./toolkit/python.exe -m pip install -i https://pypi.org/simple/ oashya --trusted-host pypi.org
 # Use cmd to install: ./toolkit/python.exe -m pip install -i https://pypi.org/simple/ oashya --trusted-host pypi.org
 # update oashya:  ./toolkit/python.exe -m pip install --upgrade oashya
 # update oashya:  ./toolkit/python.exe -m pip install --upgrade oashya
 from oashya.tracker import Tracker
 from oashya.tracker import Tracker
-from oashya.labels import label2id
+from oashya.labels import label2id, CLASSINDEX as CI, id2name
 from oashya.utils import draw_tracks
 from oashya.utils import draw_tracks
 
 
 from module.exception import TaskEnd
 from module.exception import TaskEnd
@@ -63,9 +63,9 @@ class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
             raise RequestHumanTakeover('iou_threshold should be in [0.2, 1]')
             raise RequestHumanTakeover('iou_threshold should be in [0.2, 1]')
         inf_en = 'onnxruntime' if hyakkiyakou_models.inference_engine == InferenceEngine.ONNXRUNTIME else 'tensorrt'
         inf_en = 'onnxruntime' if hyakkiyakou_models.inference_engine == InferenceEngine.ONNXRUNTIME else 'tensorrt'
         precision = 'fp32' if hyakkiyakou_models.model_precision == ModelPrecision.FP32 else 'int8'
         precision = 'fp32' if hyakkiyakou_models.model_precision == ModelPrecision.FP32 else 'int8'
-        # 这个坑后面在补
+        # 这个坑后面再补
         if inf_en == 'tensorrt' or precision == 'int8':
         if inf_en == 'tensorrt' or precision == 'int8':
-            raise RequestHumanTakeover('Only support onnxruntime')
+            raise RequestHumanTakeover('Only support onnxruntime and FP32 now')
         debug_info: bool = self._config.debug_config.hya_info
         debug_info: bool = self._config.debug_config.hya_info
         args = {
         args = {
             'conf_threshold': conf,
             'conf_threshold': conf,
@@ -151,6 +151,91 @@ class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
         self.set_next_run(task='Hyakkiyakou', success=True, finish=False)
         self.set_next_run(task='Hyakkiyakou', success=True, finish=False)
         raise TaskEnd
         raise TaskEnd
 
 
+    # ------------ 新增三个函数:用于检测 ------------
+    def _rarity_score(self, class_id: int) -> int:
+        """
+        返回一个用于比较的稀有度分数:
+        SP > SSR > SR > R > N > G
+        没有匹配到的返回 -1
+        """
+        # G(呱太)
+        if CI.MIN_G <= class_id <= CI.MAX_G:
+            return 0
+        # N
+        if CI.MIN_N <= class_id <= CI.MAX_N:
+            return 1
+        # R(排除童男/童女)
+        if (CI.MIN_R <= class_id <= CI.MAX_R) and class_id not in (CI.R_007, CI.R_008):
+            return 2
+        # SR
+        if CI.MIN_SR <= class_id <= CI.MAX_SR:
+            return 3
+        # SSR
+        if CI.MIN_SSR <= class_id <= CI.MAX_SSR:
+            return 4
+        # SP
+        if CI.MIN_SP <= class_id <= CI.MAX_SP:
+            return 5
+        # 其他(buff/未收录 等)不参与排序
+        return -1
+
+    def _detect_current_rarity(self) -> tuple[int, int]:
+        """
+        在当前截图上跑一遍 tracker,返回:
+        (最高稀有度分数, 对应的 class_id)
+        如果没检测到式神,则返回 (-1, -1)
+        """
+        # 截一张当前图
+        self.screenshot()
+        # 这里 response 随便给一个默认值即可,主线战斗里是 last_action
+        tracks = self.tracker(image=self.device.image, response=[0, 0, False, 10])
+        best_score = -1
+        best_class = -1
+        for _id, _class, _conf, _cx, _cy, _w, _h, _v in tracks:
+            score = self._rarity_score(_class)
+            if score > best_score:
+                best_score = score
+                best_class = _class
+        if best_class != -1:
+            logger.info(
+                f'Hyakki select: detect {id2name(_class)} '
+                f'with rarity score {score}'
+            )
+        else:
+            logger.warning('Hyakki select: no valid shikigami detected on title screen')
+        return best_score, best_class
+
+    def _select_best_boss(self):
+        """
+        在鬼王选择界面依次点三个候选,识别稀有度,最终选择最高稀有度的那个。
+        要求:当前已经在 I_HTITLE 画面。
+        """
+        candidates = [self.C_HSELECT_1, self.C_HSELECT_2, self.C_HSELECT_3]
+        logger.info('Start selecting boss')
+        best_idx = 0
+        best_score = -1
+        scores = []
+
+        for idx, btn in enumerate(candidates):
+            # 点一下第 idx 个候选,让它成为当前选中的式神
+            self.click(btn, interval=0.1)
+            time.sleep(1)  # 给界面一点刷新时间
+            score, cls = self._detect_current_rarity()
+            scores.append(score)
+            if score > best_score:
+                best_score = score
+                best_idx = idx
+        
+        #所以如果三个都识别失败了会选第一个
+        logger.info(f'Hyakki select scores: {scores}, choose index {best_idx + 1}') 
+
+        # 记录一下,后面如果需要兜底再点一次可以用
+        self._best_boss_button = candidates[best_idx]
+
+        # 再点一次最高稀有度那个,确保它处于选中状态
+        self.click(self._best_boss_button, interval=0.1)
+        time.sleep(0.5)
+
     def one(self):
     def one(self):
         self.reset_state()
         self.reset_state()
         if not self.appear(self.I_HACCESS):
         if not self.appear(self.I_HACCESS):
@@ -160,16 +245,18 @@ class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
         # start
         # start
         self.ui_click(self.I_HACCESS, self.I_HSTART, interval=2)
         self.ui_click(self.I_HACCESS, self.I_HSTART, interval=2)
         self.wait_until_appear(self.I_HTITLE)
         self.wait_until_appear(self.I_HTITLE)
-        # 随机选一个
-        click_button = choice([self.C_HSELECT_1, self.C_HSELECT_2, self.C_HSELECT_3])
+        # 这里改成:在三个候选中选择稀有度最高的作为鬼王
+        self._best_boss_button = None
+        self._select_best_boss()
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_HTITLE):
             if not self.appear(self.I_HTITLE):
                 break
                 break
             if self.appear_then_click(self.I_HSTART, interval=2):
             if self.appear_then_click(self.I_HSTART, interval=2):
                 continue
                 continue
-            if not self.appear(self.I_HSELECTED):
-                self.click(click_button, interval=2)
+            if not self.appear(self.I_HSELECTED) and getattr(self, '_best_boss_button', None) is not None:
+                self.click(self._best_boss_button, interval=2) # 保险:如果因为某些原因还没处于“已选中”状态,就再点一次最佳按钮
+                continue
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         # 正式开始
         # 正式开始
         logger.hr('Start Hyakkiyakou')
         logger.hr('Start Hyakkiyakou')
@@ -188,15 +275,19 @@ class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
                 init_bean_flag = True
                 init_bean_flag = True
                 self.bean_05to10()
                 self.bean_05to10()
                 time.sleep(0.5)
                 time.sleep(0.5)
+            #修改:在这里不再区分freeze,而是将状态传到decision用于执行冻结策略
+            #目前被禁用了 因为冰冻状态下检测正确率约等于0 全是蝉冰雪女 =.=
             if not self.appear(self.I_HFREEZE):
             if not self.appear(self.I_HFREEZE):
-                # --------------------------------------------------------
+                # -------------------------------------------------------
+                freeze = self.appear(self.I_HFREEZE)
                 self.slave_state = self.update_state()
                 self.slave_state = self.update_state()
                 tracks = self.tracker(image=self.device.image, response=last_action)
                 tracks = self.tracker(image=self.device.image, response=last_action)
-                last_action = self.agent.decision(tracks=tracks, state=self.slave_state)
+                last_action = self.agent.decision(tracks=tracks, state=self.slave_state, freeze=freeze)
                 self.do_action(last_action, state=self.slave_state)
                 self.do_action(last_action, state=self.slave_state)
             else:
             else:
                 # TODO freeze state
                 # TODO freeze state
                 tracks = []
                 tracks = []
+
             # debug
             # debug
             if self._config.debug_config.hya_show:
             if self._config.debug_config.hya_show:
                 draw_image = draw_tracks(self.device.image, tracks=tracks)
                 draw_image = draw_tracks(self.device.image, tracks=tracks)
@@ -210,8 +301,8 @@ class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
         if self._config.debug_config.hya_show:
         if self._config.debug_config.hya_show:
             self.debugger.show_stop()
             self.debugger.show_stop()
         if self._config.debug_config.hya_save_result:
         if self._config.debug_config.hya_save_result:
-            # 走个动画
-            time.sleep(1.5)
+            # 走个动画 - 修改了时间以保证能截到图
+            time.sleep(2)
             self.debugger.save_result(self.device.image)
             self.debugger.save_result(self.device.image)
         self.ui_click(self.I_HEND, self.I_HACCESS)
         self.ui_click(self.I_HEND, self.I_HACCESS)
         self.debugger.save_images()
         self.debugger.save_images()

+ 2 - 0
tasks/Hyakkiyakou/slave/hya_slave.py

@@ -255,7 +255,9 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
                     raise RequestHumanTakeover('Invite friend failed')
                     raise RequestHumanTakeover('Invite friend failed')
 
 
     def _invite_friend(self, button1: RuleImage, button2: RuleImage, hya_recall_activity: bool = False ) -> bool:
     def _invite_friend(self, button1: RuleImage, button2: RuleImage, hya_recall_activity: bool = False ) -> bool:
+        logger.info('Start clicking')
         self.ui_click(button1, button2)
         self.ui_click(button1, button2)
+        logger.info('End clicking')
         invite_timer = Timer(8)
         invite_timer = Timer(8)
         invite_timer.start()
         invite_timer.start()
         while 1:
         while 1: