mirror of
https://github.com/LmeSzinc/StarRailCopilot.git
synced 2024-11-22 00:35:34 +00:00
Fix: Early access dungeon exited at COMBAT_PREPARE
This commit is contained in:
parent
c034a10595
commit
292b123a3d
@ -324,6 +324,9 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
|
|||||||
if self.is_in_main():
|
if self.is_in_main():
|
||||||
logger.info('Combat finishes at page_main')
|
logger.info('Combat finishes at page_main')
|
||||||
return True
|
return True
|
||||||
|
if self.appear(COMBAT_PREPARE):
|
||||||
|
logger.info('Combat finishes at COMBAT_PREPARE')
|
||||||
|
return True
|
||||||
if self.is_combat_executing():
|
if self.is_combat_executing():
|
||||||
logger.info('Combat finishes at another combat')
|
logger.info('Combat finishes at another combat')
|
||||||
return False
|
return False
|
||||||
@ -427,6 +430,7 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
|
|||||||
if self._combat_should_reenter():
|
if self._combat_should_reenter():
|
||||||
continue
|
continue
|
||||||
if finish:
|
if finish:
|
||||||
|
self.combat_exit()
|
||||||
break
|
break
|
||||||
# Reset combat_wave_cost, so handle_combat_interact() won't activate before handle_combat_prepare()
|
# Reset combat_wave_cost, so handle_combat_interact() won't activate before handle_combat_prepare()
|
||||||
self.combat_wave_cost = 10
|
self.combat_wave_cost = 10
|
||||||
|
Loading…
Reference in New Issue
Block a user