sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 19:05:57 +08:00
Code Activity

Fix: OSDaemon.combat_status() should accept end 'no_searching' (#5066)

Browse Source
This commit is contained in:
guoh064
2025-08-30 22:06:27 +08:00
committed by GitHub
parent 58ea4a1fe1
commit 9ccf678ef3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/os_combat/combat.py
View File

@@ -157,7 +157,9 @@ class Combat(Combat_, MapEventHandler):
def combat_status(self, drop=None, expected_end=None): def combat_status(self, drop=None, expected_end=None):
self.__os_combat_drop = drop self.__os_combat_drop = drop
super().combat_status(drop=drop, expected_end=self._os_combat_expected_end) if expected_end is None:
expected_end = self._os_combat_expected_end
super().combat_status(drop=drop, expected_end=expected_end)
def combat(self, *args, save_get_items=False, **kwargs): def combat(self, *args, save_get_items=False, **kwargs):
""" """