sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-30 07:23:52 +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

12
README.md
View File

@@ -11,14 +11,18 @@ Alas, an Azur Lane automation tool with GUI (Support CN, EN, JP, able to support
Alas, 一个带GUI的碧蓝航线脚本 (支持国服, 国际服, 日服, 可以支持其他服务器). Alas, 一个带GUI的碧蓝航线脚本 (支持国服, 国际服, 日服, 可以支持其他服务器).
**Event Updates** Support Air Raid Drills with Essex
**活动更新** 支持「复刻特别演习埃塞克斯级」
EN support, Thanks **[@whoamikyo](https://github.com/whoamikyo)** EN support, Thanks **[@whoamikyo](https://github.com/whoamikyo)**
JP support, Thanks **[@ferina8-14](https://github.com/ferina8-14)**, some features might not work JP support, Thanks **[@ferina8-14](https://github.com/ferina8-14)**, some features might not work
> **Event Announcement 活动公告**
>
> [CN] 支持活动「永夜幻光」, 请使用 dev 分支.
>
> [EN] Support event "Ink-Stained Steel Sakura Rerun".
>
> [JP] Support event 「極夜照らす幻光」, please use dev brunch.
![gui](doc/README.assets/gui.png) ![gui](doc/README.assets/gui.png)

3
module/research/project.py
View File

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