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

Fix: Solve random OCR error in OpSi zone init (#504)

Browse Source
This commit is contained in:
LmeSzinc
2021-12-16 21:14:15 +08:00
parent 60568aa492
commit 6946769246
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
module/os/map_operation.py
View File

@@ -115,19 +115,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
try: try:
self.zone = self.name_to_zone(name) self.zone = self.name_to_zone(name)
except ScriptError as e: except ScriptError as e:
if self.is_zone_name_hidden: raise MapDetectionError(*e.args)
# 2021.12.09
# Safe zones don't display zone names like `NA Ocean SE Sector F - Safe zone`, only display `Safe Zone`.
# Goto globe map and calculate current zone from pinned location,
# but this requires higher level APIs.
logger.info('Zone name is hidden, get current zone from globe map instead')
if hasattr(self, 'get_current_zone_from_globe'):
self.zone = self.get_current_zone_from_globe()
else:
raise ScriptError(
'Zone name is hidden, require OperationSiren.get_current_zone_from_globe() to solve')
else:
raise MapDetectionError(*e.args)
logger.attr('Zone', self.zone) logger.attr('Zone', self.zone)
return self.zone return self.zone
@@ -168,9 +156,16 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
else: else:
timeout.reset() timeout.reset()
if not self.is_in_map(): logger.warning('Unable to get zone name, get current zone from globe map instead')
logger.warning('Trying to get zone name, but not in OS map') if hasattr(self, 'get_current_zone_from_globe'):
return self.get_current_zone() self.zone = 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')
self.get_current_zone()
logger.attr('Zone', self.zone)
return self.zone
def is_in_special_zone(self): def is_in_special_zone(self):
""" """