From cac07d48ab91b3f65a63d1509fd614c1a9b69ee2 Mon Sep 17 00:00:00 2001 From: Zuosizhu <2839299264@qq.com> Date: Thu, 18 Jul 2024 08:28:51 +0800 Subject: [PATCH] Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors --- module/equipment/equipment.py | 2 +- module/equipment/equipment_change.py | 2 +- module/equipment/fleet_equipment.py | 2 +- module/exercise/equipment.py | 2 +- module/hard/equipment.py | 2 +- module/retire/dock.py | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/equipment/equipment.py b/module/equipment/equipment.py index e477814b3..e5b5adb09 100644 --- a/module/equipment/equipment.py +++ b/module/equipment/equipment.py @@ -564,7 +564,7 @@ def equip_redirect_inherit_to_old() -> bool: return False -class Equipment(EquipmentOld if equip_redirect_inherit_to_old() else EquipmentNew): +class Equipment(EquipmentOld if equip_redirect_inherit_to_old() else EquipmentOld): def __init__(self, *args, **kwargs): if isinstance(self, EquipmentOld): logger.info("use EquipmentOld") diff --git a/module/equipment/equipment_change.py b/module/equipment/equipment_change.py index d1e45a4b3..918298758 100644 --- a/module/equipment/equipment_change.py +++ b/module/equipment/equipment_change.py @@ -315,7 +315,7 @@ class EquipmentChangeNew(Equipment): return -class EquipmentChange(EquipmentChangeOld if gl.gl_get("g_current_task", "") == "GemsFarming" else EquipmentChangeNew): +class EquipmentChange(EquipmentChangeOld if gl.gl_get("g_current_task", "") == "GemsFarming" else EquipmentChangeOld): def __init__(self, *args, **kwargs): if isinstance(self, EquipmentChangeOld): logger.info("use EquipmentChangeOld") diff --git a/module/equipment/fleet_equipment.py b/module/equipment/fleet_equipment.py index ae128c690..41d68686d 100644 --- a/module/equipment/fleet_equipment.py +++ b/module/equipment/fleet_equipment.py @@ -79,7 +79,7 @@ class FleetEquipmentNew(EquipmentChange): self.ui_back(FLEET_CHECK) -class FleetEquipment(DailyEquipment if gl.gl_get("g_current_task", "") == "GemsFarming" else FleetEquipmentNew): +class FleetEquipment(DailyEquipment if gl.gl_get("g_current_task", "") == "GemsFarming" else FleetEquipmentOld): def __init__(self, *args, **kwargs): if isinstance(self, DailyEquipment): logger.info("use DailyEquipment") diff --git a/module/exercise/equipment.py b/module/exercise/equipment.py index 2c66ea3d1..5917fc8f4 100644 --- a/module/exercise/equipment.py +++ b/module/exercise/equipment.py @@ -105,7 +105,7 @@ class ExerciseEquipmentNew(EquipmentChange): self._inactive_edit() -class ExerciseEquipment(ExerciseEquipmentOld if gl.gl_get("g_current_task", "") == "GemsFarming" else ExerciseEquipmentNew): +class ExerciseEquipment(ExerciseEquipmentOld if gl.gl_get("g_current_task", "") == "GemsFarming" else ExerciseEquipmentOld): def __init__(self, *args, **kwargs): if isinstance(self, ExerciseEquipmentOld): logger.info("use ExerciseEquipmentOld") diff --git a/module/hard/equipment.py b/module/hard/equipment.py index d1cff66c1..e1d64d851 100644 --- a/module/hard/equipment.py +++ b/module/hard/equipment.py @@ -52,7 +52,7 @@ class HardEquipmentNew(EquipmentChange): return True -class HardEquipment(HardEquipmentOld if gl.gl_get("g_current_task", "") == "GemsFarming" else HardEquipmentNew): +class HardEquipment(HardEquipmentOld if gl.gl_get("g_current_task", "") == "GemsFarming" else HardEquipmentOld): def __init__(self, *args, **kwargs): if isinstance(self, HardEquipmentOld): logger.info("use HardEquipmentOld") diff --git a/module/retire/dock.py b/module/retire/dock.py index 346b1a05b..d116ada90 100644 --- a/module/retire/dock.py +++ b/module/retire/dock.py @@ -221,7 +221,7 @@ class DockOld(Equipment): continue -class DockNew(UI): +class DockNew(Equipment): def handle_dock_cards_loading(self): # Poor implementation. self.device.sleep((1, 1.5)) @@ -245,7 +245,7 @@ class DockNew(UI): 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() @@ -295,7 +295,7 @@ class DockNew(UI): ) 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. @@ -421,7 +421,7 @@ def redirect_inherit_to_old() -> bool: return False -class Dock(DockOld if redirect_inherit_to_old() else DockNew): +class Dock(DockOld if redirect_inherit_to_old() else DockOld): def __init__(self, *args, **kwargs): if isinstance(self, DockOld): logger.info("use DockOld")