Fix: META specific BATTLE_STATUS should be prior to general ones (#2635)

This commit is contained in:
LmeSzinc 2023-05-27 18:46:17 +08:00
parent 4ec4decf46
commit fa4e8b956c

View File

@ -33,8 +33,6 @@ class AshCombat(Combat):
"""
if self.is_combat_executing():
return False
if super().handle_battle_status(drop=drop):
return True
if self.appear(BATTLE_STATUS, offset=(120, 20), interval=self.battle_status_click_interval):
if drop:
drop.handle_add(self)
@ -45,6 +43,8 @@ class AshCombat(Combat):
if self.appear(BATTLE_PREPARATION, offset=(30, 30), interval=2):
self.device.click(BACK_ARROW)
return True
if super().handle_battle_status(drop=drop):
return True
return False