sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 06:18:21 +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-09-01 17:17:24 +00:00
parent 9348ca8dca 17842593a6
commit 59c8b8b41f
18 changed files with 27 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/os_combat/combat.py
View File

@@ -118,6 +118,8 @@ class Combat(Combat_, MapEventHandler):
Returns:
bool:
"""
if getattr(self, '_disable_handle_get_items', False):
return False
if self.appear(GET_ITEMS_1, offset=5, interval=self.battle_status_click_interval):
if drop:
drop.handle_add(self, before=2)
@@ -159,7 +161,12 @@ class Combat(Combat_, MapEventHandler):
self.__os_combat_drop = drop
if expected_end is None:
expected_end = self._os_combat_expected_end
super().combat_status(drop=drop, expected_end=expected_end)
# disable handle_get_items and use only handle_map_get_items
self._disable_handle_get_items = True
try:
super().combat_status(drop=drop, expected_end=expected_end)
finally:
self._disable_handle_get_items = False
def combat(self, *args, save_get_items=False, **kwargs):
"""