mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-09 12:49:03 +08:00
Fix: Clicking BACK_ARROW at combat loading
This commit is contained in:
parent
07bf9d9947
commit
bd108dc35f
@ -20,7 +20,7 @@ from module.os.assets import FLEET_EMP_DEBUFF, MAP_EXIT, MAP_GOTO_GLOBE, STRONGH
|
|||||||
from module.os.camera import OSCamera
|
from module.os.camera import OSCamera
|
||||||
from module.os.map_base import OSCampaignMap
|
from module.os.map_base import OSCampaignMap
|
||||||
from module.os_ash.ash import OSAsh
|
from module.os_ash.ash import OSAsh
|
||||||
from module.os_combat.combat import Combat
|
from module.os_combat.combat import Combat, BATTLE_PREPARATION, SIREN_PREPARATION
|
||||||
from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER
|
from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER
|
||||||
from module.os_shop.assets import PORT_SUPPLY_CHECK
|
from module.os_shop.assets import PORT_SUPPLY_CHECK
|
||||||
from module.ui.assets import BACK_ARROW
|
from module.ui.assets import BACK_ARROW
|
||||||
@ -713,8 +713,13 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
|
|||||||
|
|
||||||
# Re-enter boss accidentally
|
# Re-enter boss accidentally
|
||||||
if pause_interval.reached():
|
if pause_interval.reached():
|
||||||
if self.combat_appear():
|
if self.appear(BATTLE_PREPARATION):
|
||||||
logger.info(f'combat_appear -> {BACK_ARROW}')
|
logger.info(f'{BATTLE_PREPARATION} -> {BACK_ARROW}')
|
||||||
|
self.device.click(BACK_ARROW)
|
||||||
|
pause_interval.reset()
|
||||||
|
continue
|
||||||
|
if self.appear(SIREN_PREPARATION, offset=(20, 20)):
|
||||||
|
logger.info(f'{SIREN_PREPARATION} -> {BACK_ARROW}')
|
||||||
self.device.click(BACK_ARROW)
|
self.device.click(BACK_ARROW)
|
||||||
pause_interval.reset()
|
pause_interval.reset()
|
||||||
continue
|
continue
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user