mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-04-02 00:16:21 +08:00
Fix: Reset no searching timeout if not in map
This commit is contained in:
@@ -121,6 +121,8 @@ class EnemySearchingHandler(InfoHandler):
|
|||||||
if self.handle_in_stage():
|
if self.handle_in_stage():
|
||||||
return True
|
return True
|
||||||
if self.handle_auto_search_exit(drop=drop):
|
if self.handle_auto_search_exit(drop=drop):
|
||||||
|
timeout.limit = 10
|
||||||
|
timeout.reset()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Popups
|
# Popups
|
||||||
@@ -148,6 +150,7 @@ class EnemySearchingHandler(InfoHandler):
|
|||||||
if appeared:
|
if appeared:
|
||||||
self.handle_enemy_flashing()
|
self.handle_enemy_flashing()
|
||||||
self.device.sleep(0.3)
|
self.device.sleep(0.3)
|
||||||
|
self.device.screenshot()
|
||||||
logger.info('Enemy searching appeared.')
|
logger.info('Enemy searching appeared.')
|
||||||
break
|
break
|
||||||
self.enemy_searching_color_initial()
|
self.enemy_searching_color_initial()
|
||||||
@@ -155,7 +158,6 @@ class EnemySearchingHandler(InfoHandler):
|
|||||||
logger.info('Enemy searching timeout.')
|
logger.info('Enemy searching timeout.')
|
||||||
break
|
break
|
||||||
|
|
||||||
self.device.screenshot()
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def handle_in_map_no_enemy_searching(self, drop=None):
|
def handle_in_map_no_enemy_searching(self, drop=None):
|
||||||
@@ -173,15 +175,15 @@ class EnemySearchingHandler(InfoHandler):
|
|||||||
while 1:
|
while 1:
|
||||||
self.device.screenshot()
|
self.device.screenshot()
|
||||||
|
|
||||||
# End
|
if not self.is_in_map():
|
||||||
if timeout.reached():
|
timeout.reset()
|
||||||
break
|
|
||||||
|
|
||||||
# Stage might ends,
|
# Stage might ends,
|
||||||
# although here expects an enemy searching animation.
|
# although here expects an enemy searching animation.
|
||||||
if self.handle_in_stage():
|
if self.handle_in_stage():
|
||||||
return True
|
return True
|
||||||
if self.handle_auto_search_exit(drop=drop):
|
if self.handle_auto_search_exit(drop=drop):
|
||||||
|
timeout.reset()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Popups
|
# Popups
|
||||||
@@ -198,4 +200,9 @@ class EnemySearchingHandler(InfoHandler):
|
|||||||
timeout.reset()
|
timeout.reset()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# End
|
||||||
|
if timeout.reached():
|
||||||
|
logger.info('No enemy searching in map.')
|
||||||
|
break
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|||||||
Reference in New Issue
Block a user