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

Fix: Handle map events in os_map_goto_globe

Browse Source
This commit is contained in:
LmeSzinc
2022-01-09 14:52:57 +08:00
parent ed45d4895f
commit b38694ab1f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/os/globe_operation.py
View File

@@ -233,17 +233,26 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
in: is_in_map in: is_in_map
out: is_in_globe out: is_in_globe
""" """
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
def additional(): if self.appear_then_click(MAP_GOTO_GLOBE, offset=(200, 5), interval=2):
continue
if self.handle_map_event():
continue
# Popup: Leaving current zone will terminate meowfficer searching. # Popup: Leaving current zone will terminate meowfficer searching.
# Searching reward will be shown after entering another zone. # Searching reward will be shown after entering another zone.
if self.handle_popup_confirm('GOTO_GLOBE'): if self.handle_popup_confirm('GOTO_GLOBE'):
return True return True
return False
self.ui_click(MAP_GOTO_GLOBE, check_button=self.is_in_globe, offset=(200, 5), additional=additional, # End
retry_wait=2, skip_first_screenshot=skip_first_screenshot) if self.is_in_globe():
break
skip_first_screenshot = True
confirm_timer = Timer(1, count=2).start() confirm_timer = Timer(1, count=2).start()
unpinned = 0 unpinned = 0
while 1: while 1: