sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: Handle popups in OpSi map detection

Browse Source
This commit is contained in:
LmeSzinc 2022-06-11 23:14:59 +08:00
parent 412f6385e1
commit 52a6e44d53
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/map/camera.py
View File

@ -152,6 +152,10 @@ class Camera(MapOperation):
self.ui_click(AUTO_SEARCH_REWARD, check_button=self.is_in_map, offset=(50, 50),
retry_wait=3, skip_first_screenshot=True)
return False
elif 'opsi' in self.config.task.command.lower() and self.handle_popup_confirm('OPSI'):
# Always confirm popups in OpSi, same popups in os_map_goto_globe()
logger.warning('Perspective error caused by popups')
return False
elif not self.is_in_map() \
and not self.is_in_strategy_submarine_move():
if self.appear(GAME_TIPS, offset=(20, 20)):

1
module/os/globe_operation.py
View File

@ -298,6 +298,7 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=5):
continue
# Popup: Leaving current zone will terminate meowfficer searching.
# Popup: Leaving current zone will retreat submarines
# Searching reward will be shown after entering another zone.
if self.handle_popup_confirm('GOTO_GLOBE'):
continue