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

Fix: Handle map detection error caused by OPSI_MISSION_CHECK

Browse Source
This commit is contained in:
LmeSzinc
2023-08-05 18:11:51 +08:00
parent f81d53cf68
commit b68a711d39
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/map/camera.py
View File

@@ -16,7 +16,8 @@ from module.map_detection.grid import Grid
from module.map_detection.utils import area2corner, trapezoid2area from module.map_detection.utils import area2corner, trapezoid2area
from module.map_detection.view import View from module.map_detection.view import View
from module.os.assets import GLOBE_GOTO_MAP from module.os.assets import GLOBE_GOTO_MAP
from module.os_handler.assets import AUTO_SEARCH_REWARD, GET_ADAPTABILITY, PORT_SUPPLY_CHECK from module.os_handler.assets import AUTO_SEARCH_REWARD, GET_ADAPTABILITY, MISSION_CHECK as OPSI_MISSION_CHECK, \
PORT_SUPPLY_CHECK
from module.ui.assets import BACK_ARROW from module.ui.assets import BACK_ARROW
@@ -170,6 +171,16 @@ class Camera(MapOperation):
self.ui_click(AUTO_SEARCH_REWARD, check_button=self.is_in_map, offset=(50, 50), self.ui_click(AUTO_SEARCH_REWARD, check_button=self.is_in_map, offset=(50, 50),
retry_wait=3, skip_first_screenshot=True) retry_wait=3, skip_first_screenshot=True)
return False return False
elif self.appear(OPSI_MISSION_CHECK, offset=(20, 20)):
logger.warning('Perspective error caused by OPSI_MISSION_CHECK')
if hasattr(self, 'os_mission_quit'):
self.os_mission_quit()
return False
else:
logger.warning('Cannot find method os_mission_quit(), use ui_click() instead')
self.ui_click(OPSI_MISSION_CHECK, check_button=self.is_in_map, offset=(200, 5),
skip_first_screenshot=True)
return False
elif 'opsi' in self.config.task.command.lower() and self.handle_popup_confirm('OPSI'): 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() # Always confirm popups in OpSi, same popups in os_map_goto_globe()
logger.warning('Perspective error caused by popups') logger.warning('Perspective error caused by popups')