sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-29 17:58:23 +08:00
Code Activity

Merge pull request #1828 from LmeSzinc/bug_fix

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2022-11-07 00:59:52 +08:00
committed by GitHub
parent 7afb5e25ec 6fbc76e6a4
commit 4ed9fbc23e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/campaign/gems_farming.py
View File

@@ -232,7 +232,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
ship = self.get_common_rarity_cv()
if ship:
self._ship_change_confirm(ship[0].button)
self._ship_change_confirm(min(ship, key=lambda s: (s.level, -s.emotion)).button)
logger.info('Change flagship success')
return True
@@ -259,7 +259,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
ship = self.get_common_rarity_dd()
if ship:
self._ship_change_confirm(ship[0].button)
self._ship_change_confirm(max(ship, key=lambda s: s.emotion).button)
logger.info('Change vanguard ship success')
return True

2
module/config/config_updater.py
View File

@@ -501,7 +501,7 @@ class ConfigUpdater:
def deep_load(keys):
data = deep_get(self.args, keys=keys, default={})
value = deep_get(old, keys=keys, default=data['value'])
if value is None or value == '' or data['type'] in ['lock'] or is_template:
if is_template or value is None or value == '' or data['type'] == 'lock' or data.get('display') == 'hide':
value = data['value']
value = parse_value(value, data=data)
deep_set(new, keys=keys, value=value)

2
submodule/AlasMaaBridge/module/config/config_updater.py
View File

@@ -87,7 +87,7 @@ class ConfigUpdater(config_updater.ConfigUpdater):
def deep_load(keys):
data = deep_get(self.args, keys=keys, default={})
value = deep_get(old, keys=keys, default=data['value'])
if is_template or value is None or value == '' or data['type'] in ['lock']:
if is_template or value is None or value == '' or data['type'] == 'lock' or data.get('display') == 'hide':
value = data['value']
value = parse_value(value, data=data)
deep_set(new, keys=keys, value=value)