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

Merge pull request #754 from railzy/expected_end

Browse Source 
Fix: check expected end before combat status
This commit is contained in:
LmeSzinc
2021-11-18 00:13:12 +08:00
committed by GitHub
parent 501467ed4c 247420140d
commit 8cf57748e3
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/combat/combat.py
View File

@@ -381,6 +381,20 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
while 1: while 1:
self.device.screenshot() self.device.screenshot()
# Expected end
if isinstance(expected_end, str):
if expected_end == 'in_stage' and self.handle_in_stage():
break
if expected_end == 'with_searching' and self.handle_in_map_with_enemy_searching(drop=drop):
break
if expected_end == 'no_searching' and self.handle_in_map_no_enemy_searching():
break
if expected_end == 'in_ui' and self.appear(BACK_ARROW, offset=(20, 20)):
break
if callable(expected_end):
if expected_end():
break
# Combat status # Combat status
if not exp_info and self.handle_get_ship(drop=drop): if not exp_info and self.handle_get_ship(drop=drop):
continue continue
@@ -414,18 +428,6 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
if expected_end is None: if expected_end is None:
if self.handle_in_map_with_enemy_searching(drop=drop): if self.handle_in_map_with_enemy_searching(drop=drop):
break break
if isinstance(expected_end, str):
if expected_end == 'in_stage' and self.handle_in_stage():
break
if expected_end == 'with_searching' and self.handle_in_map_with_enemy_searching(drop=drop):
break
if expected_end == 'no_searching' and self.handle_in_map_no_enemy_searching():
break
if expected_end == 'in_ui' and self.appear(BACK_ARROW, offset=(20, 20)):
break
if callable(expected_end):
if expected_end():
break
def combat(self, balance_hp=None, emotion_reduce=None, auto_mode=None, submarine_mode=None, def combat(self, balance_hp=None, emotion_reduce=None, auto_mode=None, submarine_mode=None,
save_get_items=None, expected_end=None, fleet_index=1): save_get_items=None, expected_end=None, fleet_index=1):