WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-09 05:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Opt: Skip wait_loading at the last dock_filter_set

Browse Source
This commit is contained in:
LmeSzinc 2024-07-03 23:14:26 +08:00
parent c3d20e9366
commit 78600a323d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
module/retire/dock.py
View File

@ -52,9 +52,10 @@ class Dock(Equipment):
self.ui_click(DOCK_FILTER, appear_button=DOCK_CHECK, check_button=DOCK_FILTER_CONFIRM,
skip_first_screenshot=True)
def dock_filter_confirm(self):
def dock_filter_confirm(self, wait_loading=True):
self.ui_click(DOCK_FILTER_CONFIRM, check_button=DOCK_CHECK, skip_first_screenshot=True)
self.handle_dock_cards_loading()
if wait_loading:
self.handle_dock_cards_loading()
@cached_property
def dock_filter(self) -> Setting:
@ -102,7 +103,15 @@ class Dock(Equipment):
)
return setting
def dock_filter_set(self, sort='level', index='all', faction='all', rarity='all', extra='no_limit'):
def dock_filter_set(
self,
sort='level',
index='all',
faction='all',
rarity='all',
extra='no_limit',
wait_loading=True
):
"""
A faster filter set function.
@ -121,7 +130,7 @@ class Dock(Equipment):
"""
self.dock_filter_enter()
self.dock_filter.set(sort=sort, index=index, faction=faction, rarity=rarity, extra=extra)
self.dock_filter_confirm()
self.dock_filter_confirm(wait_loading=wait_loading)
def dock_select_one(self, button, skip_first_screenshot=True):
"""

2
module/retire/retirement.py
View File

@ -321,7 +321,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
self._retirement_confirm()
self._have_kept_cv = _
self.dock_filter_set()
self.dock_filter_set(wait_loading=False)
return total

2
module/ui/setting.py
View File

@ -122,7 +122,7 @@ class Setting:
"""
status = self._product_setting_status(**kwargs)
logger.info(f'Setting {self.name} options, {dict_to_kv(kwargs)}')
logger.info(f'Setting options {self.name}, {dict_to_kv(kwargs)}')
skip_first_screenshot = True
retry = Timer(1, count=2)
timeout = Timer(10, count=20).start()