sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Opt: Not raising GameStuckError if get battle status C or D

Browse Source 
Because the detection of battle status is color detection which may go wrong
This commit is contained in:
LmeSzinc 2021-02-28 16:40:01 +08:00
parent 32f882b424
commit 1b604e3ae5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/combat/combat.py
View File

@ -252,7 +252,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
return True return True
if self.appear_then_click(BATTLE_STATUS_A, screenshot=save_get_items, genre='status', if self.appear_then_click(BATTLE_STATUS_A, screenshot=save_get_items, genre='status',
interval=self.battle_status_click_interval): interval=self.battle_status_click_interval):
logger.warning('Battle status: A') logger.warning('Battle status A')
self.device.send_notification('Battle finished', 'Battle status: A') self.device.send_notification('Battle finished', 'Battle status: A')
if not save_get_items: if not save_get_items:
self.device.sleep((0.25, 0.5)) self.device.sleep((0.25, 0.5))
@ -268,11 +268,12 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
interval=self.battle_status_click_interval): interval=self.battle_status_click_interval):
logger.warning('Battle Status C') logger.warning('Battle Status C')
self.device.send_notification('Battle finished', 'Battle status: C') self.device.send_notification('Battle finished', 'Battle status: C')
raise GameStuckError('Battle status: C') # raise GameStuckError('Battle status C')
if self.appear_then_click(BATTLE_STATUS_D, screenshot=save_get_items, genre='status', if self.appear_then_click(BATTLE_STATUS_D, screenshot=save_get_items, genre='status',
interval=self.battle_status_click_interval): interval=self.battle_status_click_interval):
logger.warning('Battle Status D') logger.warning('Battle Status D')
raise GameStuckError('Battle Status D') self.device.send_notification('Battle finished', 'Battle status: D')
# raise GameStuckError('Battle Status D')
return False return False