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

Fix: Handle MAP_PREPARATION at map detection

Browse Source
This commit is contained in:
LmeSzinc
2023-05-26 11:58:12 +08:00
parent f98137108f
commit ac6412d8c9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/map/camera.py
View File

@@ -8,6 +8,7 @@ from module.combat.assets import GET_ITEMS_1, GET_ITEMS_1_RYZA
from module.exception import CampaignEnd, GameNotRunningError, MapDetectionError
from module.handler.assets import AUTO_SEARCH_MENU_CONTINUE, GAME_TIPS
from module.logger import logger
from module.map.assets import MAP_PREPARATION
from module.map.map_base import CampaignMap, location2node
from module.map.map_operation import MapOperation
from module.map.utils import location_ensure, random_direction
@@ -141,6 +142,10 @@ class Camera(MapOperation):
elif self.is_in_stage():
logger.warning('Image is in stage')
raise CampaignEnd('Image is in stage')
elif self.appear(MAP_PREPARATION, offset=(20, 20)):
logger.warning('Image is in MAP_PREPARATION')
self.enter_map_cancel()
raise CampaignEnd('Image is in MAP_PREPARATION')
elif self.appear(AUTO_SEARCH_MENU_CONTINUE, offset=self._auto_search_menu_offset):
logger.warning('Image is in auto search menu')
self.ensure_auto_search_exit()