Просмотр исходного кода

fix(AreaBoss): Handle fox battle scene settlement #1967

neptine 3 недель назад
Родитель
Сommit
8563207769
3 измененных файлов с 30 добавлено и 14 удалено
  1. 5 1
      module/device/device.py
  2. 15 7
      tasks/AreaBoss/script_task.py
  3. 10 6
      tasks/Component/GeneralBattle/battle_wait.py

+ 5 - 1
module/device/device.py

@@ -12,7 +12,11 @@ from module.base.timer import Timer
 from module.config.utils import get_server_next_update
 from module.config.utils import get_server_next_update
 from module.device.app_control import AppControl
 from module.device.app_control import AppControl
 from module.device.control import Control
 from module.device.control import Control
-from module.device.desktop_device import DesktopDevice
+if IS_WINDOWS:
+    from module.device.desktop_device import DesktopDevice
+else:
+    class DesktopDevice:
+        pass
 from module.device.platform2 import Platform
 from module.device.platform2 import Platform
 from module.device.screenshot import Screenshot
 from module.device.screenshot import Screenshot
 from module.exception import (GameNotRunningError,
 from module.exception import (GameNotRunningError,

+ 15 - 7
tasks/AreaBoss/script_task.py

@@ -10,6 +10,8 @@ import re
 from module.atom.click import RuleClick
 from module.atom.click import RuleClick
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.GeneralBattle.battle import Battle
+from tasks.Component.GeneralBattle.battle_wait import battle_wait_strategy, battle_wait_options
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_area_boss, page_shikigami_records
 from tasks.GameUi.page import page_area_boss, page_shikigami_records
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
@@ -21,7 +23,7 @@ from module.atom.image import RuleImage
 from typing import List
 from typing import List
 
 
 
 
-class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
+class ScriptTask(Battle, GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
 
     def _get_dynamic_boss_count(self) -> int:
     def _get_dynamic_boss_count(self) -> int:
         """
         """
@@ -159,10 +161,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             return False
             return False
 
 
         # 如果已经打过该BOSS,直接跳过不打了
         # 如果已经打过该BOSS,直接跳过不打了
-        if self.is_group_ranked():
-            logger.warning("There is no boss could be challenged")
-            self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
-            return True
+        # if self.is_group_ranked():
+        #     logger.warning("There is no boss could be challenged")
+        #     self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
+        #     return True
 
 
         # 根据 reward_floor 决定模式
         # 根据 reward_floor 决定模式
         if reward_floor in (AreaBossFloor.ONE, AreaBossFloor.TEN):
         if reward_floor in (AreaBossFloor.ONE, AreaBossFloor.TEN):
@@ -193,8 +195,12 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 continue
                 continue
             if not self.appear(self.I_AB_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
             if not self.appear(self.I_AB_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
                 break
                 break
-
-        return self.run_general_battle(self.config.area_boss.general_battle)
+        strategies, options = self.loadout_from_config(self.config.area_boss.general_battle)
+        options['completion'].check_imgs = [self.I_FIRE, self.I_FILTER]
+        self.loadout_show((strategies, options))  # 使用的是默认的策略: strategies
+        with battle_wait_options(**options):
+            win = self.battle_wait()
+            return win
 
 
     def setup_ultra(self, floor: AreaBossFloor = AreaBossFloor.ONE) -> bool:
     def setup_ultra(self, floor: AreaBossFloor = AreaBossFloor.ONE) -> bool:
         # 确定进入鬼王界面
         # 确定进入鬼王界面
@@ -493,6 +499,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             return 1
             return 1
         else:
         else:
             return 0  # 如果交集的字符少于2个,可以根据需要返回其他值
             return 0  # 如果交集的字符少于2个,可以根据需要返回其他值
+
+
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device

+ 10 - 6
tasks/Component/GeneralBattle/battle_wait.py

@@ -1100,6 +1100,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         print('=' * 64)
         print('=' * 64)
         time.sleep(0.6)
         time.sleep(0.6)
 
 
+    def refresh_long_time(self) -> None:
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+
     # ------------------------------------------------------------------------------------------------------------------
     # ------------------------------------------------------------------------------------------------------------------
     # build in
     # build in
     # ------------------------------------------------------------------------------------------------------------------
     # ------------------------------------------------------------------------------------------------------------------
@@ -1107,8 +1111,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         self.C_REWARD_1.name = 'C_REWARD'
         self.C_REWARD_1.name = 'C_REWARD'
         self.C_REWARD_2.name = 'C_REWARD'
         self.C_REWARD_2.name = 'C_REWARD'
         self.C_REWARD_3.name = 'C_REWARD'
         self.C_REWARD_3.name = 'C_REWARD'
-        self.device.stuck_record_add('BATTLE_STATUS_S')
-        self.device.click_record_clear()
+        self.refresh_long_time()
         logger.info('Start battle process')
         logger.info('Start battle process')
         return HookSignal.DONE
         return HookSignal.DONE
 
 
@@ -1248,6 +1251,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         if pri_options.lock_team or self.is_in_real_battle(False):
         if pri_options.lock_team or self.is_in_real_battle(False):
             logger.info('Prepare stage finish')
             logger.info('Prepare stage finish')
             state.done = True
             state.done = True
+            self.refresh_long_time()
             return runtime.hook_enabled_update(
             return runtime.hook_enabled_update(
                 enable=('green', 'red', 'echo'),
                 enable=('green', 'red', 'echo'),
                 disable=('prepare', 'preset'),
                 disable=('prepare', 'preset'),
@@ -1290,7 +1294,6 @@ class BattleWait(BaseTask, GeneralBattleAssets):
             return HookSignal.CONTINUE
             return HookSignal.CONTINUE
         if not pri_options.preset_enable or state.done:
         if not pri_options.preset_enable or state.done:
             return HookSignal.CONTINUE
             return HookSignal.CONTINUE
-
         logger.info("Preset is enable")
         logger.info("Preset is enable")
         # 点击预设按钮
         # 点击预设按钮
         while 1:
         while 1:
@@ -1478,6 +1481,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
             # 点击绿标
             # 点击绿标
             self.device.click(x, y)
             self.device.click(x, y)
         state.done = True
         state.done = True
+        self.refresh_long_time()
         return runtime.hook_enabled_update(
         return runtime.hook_enabled_update(
             enable=(),
             enable=(),
             disable=('green',),
             disable=('green',),
@@ -1521,8 +1525,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
     # custom
     # custom
     # ------------------------------------------------------------------------------------------------------------------
     # ------------------------------------------------------------------------------------------------------------------
     def _bw_success_soul(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
     def _bw_success_soul(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
-        state = pri.per_battle
-        options = pri.options
+        state: PerBattleSuccess = pri.per_battle
+        options: OptionSuccessDefault = pri.options
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
         if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
             raise TypeError("battle wait option 'success' must be an OptionSuccessDefault")
             raise TypeError("battle wait option 'success' must be an OptionSuccessDefault")
         if state.click_stage_1 is None:
         if state.click_stage_1 is None:
@@ -1565,7 +1569,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
         return HookSignal.CONTINUE
         return HookSignal.CONTINUE
 
 
     @cached_property
     @cached_property
-    def exclude_click_activity(self, areas: list[str] = None) -> RuleClickExclude:
+    def exclude_click_activity(self) -> RuleClickExclude:
         inputs = []
         inputs = []
         for area in ['C_END_MESSAGE_RIGHT_TOP', 'C_END_ACTIVITY_REWARD']:
         for area in ['C_END_MESSAGE_RIGHT_TOP', 'C_END_ACTIVITY_REWARD']:
             click = getattr(self, area, None)
             click = getattr(self, area, None)