Skip to content

Commit bd108dc

Browse files
committed
Fix: Clicking BACK_ARROW at combat loading
1 parent 07bf9d9 commit bd108dc

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

module/os/fleet.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from module.os.camera import OSCamera
2121
from module.os.map_base import OSCampaignMap
2222
from module.os_ash.ash import OSAsh
23-
from module.os_combat.combat import Combat
23+
from module.os_combat.combat import Combat, BATTLE_PREPARATION, SIREN_PREPARATION
2424
from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER
2525
from module.os_shop.assets import PORT_SUPPLY_CHECK
2626
from module.ui.assets import BACK_ARROW
@@ -713,8 +713,13 @@ def boss_leave(self):
713713

714714
# Re-enter boss accidentally
715715
if pause_interval.reached():
716-
if self.combat_appear():
717-
logger.info(f'combat_appear -> {BACK_ARROW}')
716+
if self.appear(BATTLE_PREPARATION):
717+
logger.info(f'{BATTLE_PREPARATION} -> {BACK_ARROW}')
718+
self.device.click(BACK_ARROW)
719+
pause_interval.reset()
720+
continue
721+
if self.appear(SIREN_PREPARATION, offset=(20, 20)):
722+
logger.info(f'{SIREN_PREPARATION} -> {BACK_ARROW}')
718723
self.device.click(BACK_ARROW)
719724
pause_interval.reset()
720725
continue

0 commit comments

Comments
 (0)