sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 11:18:14 +08:00
Code Activity

Fix: Handle port in os_map_goto_globe()

Browse Source
This commit is contained in:
LmeSzinc
2023-04-22 00:16:00 +08:00
parent c85e69f0ce
commit ccf1464756
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/os/globe_operation.py
View File

@@ -4,6 +4,8 @@ from module.logger import logger
from module.os.assets import * from module.os.assets import *
from module.os_handler.action_point import ActionPointHandler from module.os_handler.action_point import ActionPointHandler
from module.os_handler.assets import AUTO_SEARCH_REWARD from module.os_handler.assets import AUTO_SEARCH_REWARD
from module.os_handler.port import PORT_CHECK
from module.ui.assets import BACK_ARROW
ZONE_TYPES = [ZONE_DANGEROUS, ZONE_SAFE, ZONE_OBSCURE, ZONE_ABYSSAL, ZONE_STRONGHOLD, ZONE_ARCHIVE] ZONE_TYPES = [ZONE_DANGEROUS, ZONE_SAFE, ZONE_OBSCURE, ZONE_ABYSSAL, ZONE_STRONGHOLD, ZONE_ARCHIVE]
ZONE_SELECT = [SELECT_DANGEROUS, SELECT_SAFE, SELECT_OBSCURE, SELECT_ABYSSAL, SELECT_STRONGHOLD, SELECT_ARCHIVE] ZONE_SELECT = [SELECT_DANGEROUS, SELECT_SAFE, SELECT_OBSCURE, SELECT_ABYSSAL, SELECT_STRONGHOLD, SELECT_ARCHIVE]
@@ -319,6 +321,11 @@ class GlobeOperation(ActionPointHandler):
continue continue
if self.handle_map_event(): if self.handle_map_event():
continue continue
# Accidentally entered port
if self.appear(PORT_CHECK, offset=(20, 20), interval=5):
logger.info(f'Page switch: {PORT_CHECK} -> {BACK_ARROW}')
self.device.click(BACK_ARROW)
continue
# Popup: AUTO_SEARCH_REWARD appears slowly # Popup: AUTO_SEARCH_REWARD appears slowly
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=5): if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=5):
continue continue