mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-13 19:05:16 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -582,9 +582,9 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
||||
|
||||
while 1:
|
||||
filter_obj.load(string)
|
||||
common_cv = list(dict.fromkeys(
|
||||
common_ship = list(dict.fromkeys(
|
||||
[str(name[0]) for name in filter_obj.filter if name[0].upper() in templates]))
|
||||
if not common_cv:
|
||||
if not common_ship:
|
||||
logger.warning(f'Invalid filter set: "{string}". Set to default filter.')
|
||||
string = default
|
||||
self.config.cross_set(keys=key, value=default)
|
||||
@@ -592,8 +592,8 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
|
||||
|
||||
# End
|
||||
if output:
|
||||
logger.attr('Filter sort', ' > '.join(common_cv))
|
||||
return common_cv
|
||||
logger.attr('Filter sort', ' > '.join(common_ship))
|
||||
return common_ship
|
||||
|
||||
def retirement_get_common_rarity_cv_in_page(self):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user