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

Fix: UI haven't fully loaded after get_current_zone_from_globe()

Browse Source
This commit is contained in:
LmeSzinc
2022-07-12 23:58:10 +08:00
parent dbef8fb79c
commit e1f1768779
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/os/map_operation.py
View File

@@ -137,13 +137,14 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
self.config.HOMO_EDGE_COLOR_RANGE = (0, 33)
self.config.MAP_ENSURE_EDGE_INSIGHT_CORNER = ''
def zone_init(self, skip_first_screenshot=True):
def zone_init(self, fallback_init=True, skip_first_screenshot=True):
"""
Wrap get_current_zone(), set self.zone to the current zone.
This method must be called after entering a new zone.
Handle map events and the animation that zone names appear from the top.
Args:
fallback_init (bool): Whether to get zone from globe map when unable to parse zone name.
skip_first_screenshot (bool):
Returns:
@@ -184,14 +185,15 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
timeout.reset()
continue
logger.warning('Unable to get zone name, get current zone from globe map instead')
if hasattr(self, 'get_current_zone_from_globe'):
return self.get_current_zone_from_globe()
else:
logger.warning('OperationSiren.get_current_zone_from_globe() not exists')
if not self.is_in_map():
logger.warning('Trying to get zone name, but not in OS map')
return self.get_current_zone()
if fallback_init:
logger.warning('Unable to get zone name, get current zone from globe map instead')
if hasattr(self, 'get_current_zone_from_globe'):
return self.get_current_zone_from_globe()
else:
logger.warning('OperationSiren.get_current_zone_from_globe() not exists')
if not self.is_in_map():
logger.warning('Trying to get zone name, but not in OS map')
return self.get_current_zone()
def is_in_special_zone(self):
"""