sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38:20 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2025-08-30 15:19:02 +00:00
parent 1839f83ed6 34611fb420
commit e39758c3fb
6 changed files with 41 additions and 8 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):
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):
"""