sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-10 02:57:00 +08:00
Code Activity

Fix: Check exp_info first if battle_status has been clicked (#2774)

Browse Source
This commit is contained in:
LmeSzinc
2023-07-02 15:54:26 +08:00
parent 27acff08af
commit 85ec86ba1c
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/combat/combat.py
View File

@@ -425,17 +425,26 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
continue continue
if self.handle_get_items(drop=drop): if self.handle_get_items(drop=drop):
continue continue
if not exp_info and self.handle_battle_status(drop=drop):
battle_status = True
continue
if self.handle_popup_confirm('COMBAT_STATUS'): if self.handle_popup_confirm('COMBAT_STATUS'):
if battle_status and not exp_info: if battle_status and not exp_info:
logger.info('Locking a new ship') logger.info('Locking a new ship')
self.config.GET_SHIP_TRIGGERED = True self.config.GET_SHIP_TRIGGERED = True
continue continue
if self.handle_exp_info(): if not battle_status:
exp_info = True if not exp_info and self.handle_battle_status(drop=drop):
continue battle_status = True
continue
if self.handle_exp_info():
exp_info = True
continue
else:
# Check exp_info first if battle_status has been clicked.
if self.handle_exp_info():
exp_info = True
continue
if not exp_info and self.handle_battle_status(drop=drop):
battle_status = True
continue
if self.handle_urgent_commission(drop=drop): if self.handle_urgent_commission(drop=drop):
continue continue
if self.handle_guild_popup_cancel(): if self.handle_guild_popup_cancel():