Parcourir la source

feat(HeroTest): buff未匹配到目标时随机选择兜底,避免卡死

- 新增click_random_buff,4个buff槽位随机点击其一
- hero1_skill_wait/hero2_skill_wait未命中目标buff时调用兜底后再点确认
Johnnylov il y a 3 mois
Parent
commit
158dc7db47
1 fichiers modifiés avec 14 ajouts et 4 suppressions
  1. 14 4
      tasks/HeroTest/script_task.py

+ 14 - 4
tasks/HeroTest/script_task.py

@@ -4,6 +4,7 @@
 from datetime import datetime, timedelta, time
 from datetime import datetime, timedelta, time
 import random  # type: ignore
 import random  # type: ignore
 from typing import Callable
 from typing import Callable
+from module.atom.click import RuleClick
 
 
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
@@ -128,8 +129,9 @@ class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
                 # https://github.com/runhey/OnmyojiAutoScript/issues/1671
                 # https://github.com/runhey/OnmyojiAutoScript/issues/1671
                 if timer.reached_and_reset():
                 if timer.reached_and_reset():
                     if self.appear(self.I_BCMJ_SKILL_ADD_CONFIRM):
                     if self.appear(self.I_BCMJ_SKILL_ADD_CONFIRM):
-                        logger.warning('No skill selected for 10s, panel still open, retrying')
-                        continue
+                        logger.warning('No skill selected for 10s, panel still open, click a random buff')
+                        self.click_random_buff()
+                        break
                     logger.warning('Skill selection panel closed unexpectedly, exit')
                     logger.warning('Skill selection panel closed unexpectedly, exit')
                     break
                     break
 
 
@@ -175,8 +177,9 @@ class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
             self.screenshot()
             self.screenshot()
             if timer.reached_and_reset():
             if timer.reached_and_reset():
                 if self.appear(self.I_BCMJ_SKILL_ADD_CONFIRM):
                 if self.appear(self.I_BCMJ_SKILL_ADD_CONFIRM):
-                    logger.warning('No skill selected for 10s, panel still open, retrying')
-                    continue
+                    logger.warning('No skill selected for 10s, panel still open, click a random buff')
+                    self.click_random_buff()
+                    break
                 logger.warning('Skill selection panel closed unexpectedly, exit')
                 logger.warning('Skill selection panel closed unexpectedly, exit')
                 break
                 break
             if any(self.appear_then_click(ts, interval=1) for ts in target_skills):
             if any(self.appear_then_click(ts, interval=1) for ts in target_skills):
@@ -184,6 +187,13 @@ class ScriptTask(GameUi, GeneralBattle, HeroTestAssets, SwitchSoul):
         self.ui_click_until_disappear(self.I_BCMJ_SKILL_ADD_CONFIRM, interval=1.5)
         self.ui_click_until_disappear(self.I_BCMJ_SKILL_ADD_CONFIRM, interval=1.5)
         return True
         return True
 
 
+    def click_random_buff(self):
+        """兜底: 4个buff都未匹配到目标时, 随机点击一个槽位, 避免卡死"""
+        logger.warning('No target buff matched, click a random buff')
+        slot = random.choice([(60, 320, 200, 140), (380, 320, 200, 140),
+                              (700, 320, 200, 140), (1020, 320, 200, 140)])
+        self.click(RuleClick(roi_front=slot, roi_back=slot, name='buff_random'), interval=1)
+
     def switch_hero(self, layer: Layer):
     def switch_hero(self, layer: Layer):
         """切换英杰"""
         """切换英杰"""
         self.ui_goto_page(pages.page_hero_test)
         self.ui_goto_page(pages.page_hero_test)