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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-07-26 17:34:02 +08:00
parent 55345df199 ad556cd5ba
commit 36006c6440
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/research/project.py
View File

@@ -102,7 +102,8 @@ class ResearchProject:
self.__setattr__(f'need_{result.group(1)}', True)
for item in data['output']:
result = re.search(self.REGEX_SHIP, item['name'].replace(' ', '').lower())
self.ship = result.group(1) if result else ''
if not self.ship:
self.ship = result.group(1) if result else ''
if self.ship:
self.ship_rarity = 'dr' if self.ship in self.DR_SHIP else 'pry'
break