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

Opt: Get Zone instance in map init, instead of map size

Browse Source
This commit is contained in:
LmeSzinc
2021-04-04 20:51:26 +08:00
parent bddb946b46
commit 51f51bb006
3 changed files with 35 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/os/globe_zone.py
View File

@@ -91,6 +91,10 @@ class ZoneManager:
Returns:
Zone:
"""
def parse_name(n):
n = str(n).replace(' ', '').lower()
return n
self._load_zone_info()
if isinstance(name, Zone):
return name
@@ -99,8 +103,9 @@ class ZoneManager:
elif isinstance(name, str) and name.isdigit():
return self.zones[name]
else:
for m in self.zones.values():
if name == m.cn or name == m.en or name == m.jp:
return m
name = parse_name(name)
for zone in self.zones.values():
if name == parse_name(zone.cn) or name == parse_name(zone.en) or name == parse_name(zone.jp):
return zone
logger.warning(f'Unable to find OS globe zone: {name}')
raise ScriptError(f'Unable to find OS globe zone: {name}')