Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

module/exercise/combat.py

@@ -33,7 +33,9 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
                 continue
 
             # End
-            if self.is_combat_executing():
+            pause = self.is_combat_executing()
+            if pause:
+                logger.attr('BattleUI', pause)
                 break
 
     def _combat_execute(self):

module/exercise/hp_daemon.py

@@ -1,7 +1,7 @@
 from module.base.base import ModuleBase
 from module.base.timer import Timer
 from module.base.utils import color_bar_percentage
-from module.combat_ui.assets import PAUSE, PAUSE_Iridescent_Fantasy, PAUSE_New
+from module.combat_ui.assets import PAUSE, PAUSE_Christmas, PAUSE_Cyber, PAUSE_Iridescent_Fantasy, PAUSE_Neon, PAUSE_New
 from module.exercise.assets import *
 from module.logger import logger
 
@@ -61,7 +61,13 @@ class HpDaemon(ModuleBase):
         if pause == PAUSE:
             self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA.area, reverse=True)
             self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA.area, reverse=False)
-        elif pause in [PAUSE_New, PAUSE_Iridescent_Fantasy]:
+        elif pause in [
+            PAUSE_New,
+            PAUSE_Iridescent_Fantasy,
+            PAUSE_Neon,
+            PAUSE_Christmas,
+            PAUSE_Cyber,
+        ]:
             self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
             self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)
         else: