mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-23 17:55:56 +08:00
Fix: Handle AUTO_SEARCH_REWARD in question_goto()
This commit is contained in:
@@ -528,6 +528,11 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
|
|||||||
def question_goto(self, has_fleet_step=False):
|
def question_goto(self, has_fleet_step=False):
|
||||||
logger.hr('Question goto')
|
logger.hr('Question goto')
|
||||||
while 1:
|
while 1:
|
||||||
|
# A game bug that AUTO_SEARCH_REWARD from the last cleared zone popups
|
||||||
|
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
|
||||||
|
self.device.screenshot()
|
||||||
|
continue
|
||||||
|
|
||||||
# Update local view
|
# Update local view
|
||||||
# Not screenshots taking, reuse the old one
|
# Not screenshots taking, reuse the old one
|
||||||
self.update_os()
|
self.update_os()
|
||||||
|
|||||||
@@ -169,11 +169,14 @@ class MapEventHandler(EnemySearchingHandler):
|
|||||||
self._os_in_map_confirm_timer.reset()
|
self._os_in_map_confirm_timer.reset()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def ensure_no_map_event(self):
|
def ensure_no_map_event(self, skip_first_screenshot=True):
|
||||||
self._os_in_map_confirm_timer.reset()
|
self._os_in_map_confirm_timer.reset()
|
||||||
|
|
||||||
while 1:
|
while 1:
|
||||||
self.device.screenshot()
|
if skip_first_screenshot:
|
||||||
|
skip_first_screenshot = False
|
||||||
|
else:
|
||||||
|
self.device.screenshot()
|
||||||
|
|
||||||
if self.handle_map_event():
|
if self.handle_map_event():
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user