sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 05:08:19 +08:00
Code Activity

Fix: Combat appear check should before enemy searching check

Browse Source
This commit is contained in:
LmeSzinc
2022-11-13 02:06:08 +08:00
parent 26aa797a72
commit 5e4ea44c68
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
module/os/fleet.py
View File

@@ -320,21 +320,6 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
confirm_timer.reset()
continue
# Enemy searching
if not enemy_searching_appear and self.enemy_searching_appear():
enemy_searching_appear = True
confirm_timer.reset()
continue
else:
if enemy_searching_appear:
self.handle_enemy_flashing()
self.device.sleep(0.3)
logger.info('Enemy searching appeared.')
enemy_searching_appear = False
result.add('search')
if self.is_in_map():
self.enemy_searching_color_initial()
# Combat
if self.combat_appear():
# Use ui_back() for testing, because there are too few abyssal loggers every month.
@@ -352,6 +337,22 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
result.add('akashi')
continue
# Enemy searching
if not enemy_searching_appear and self.enemy_searching_appear():
enemy_searching_appear = True
confirm_timer.reset()
continue
else:
if enemy_searching_appear:
self.handle_enemy_flashing()
self.device.sleep(0.3)
logger.info('Enemy searching appeared.')
enemy_searching_appear = False
confirm_timer.reset()
result.add('search')
if self.is_in_map():
self.enemy_searching_color_initial()
# Arrive
# Check colors, because screen goes black when something is unlocking.
if self.is_in_map() and IN_MAP.match_appear_on(self.device.image):