xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-16 06:25:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Update obtain_frequent_check before deside again or exit

Browse Source
This commit is contained in:
LmeSzinc 2024-05-30 20:26:45 +08:00
parent ac7be3e950
commit a40b9d69fd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/combat/combat.py
View File

@ -296,6 +296,8 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
# Game client might slow to response COMBAT_AGAIN clicks # Game client might slow to response COMBAT_AGAIN clicks
if self.appear(COMBAT_AGAIN, interval=5): if self.appear(COMBAT_AGAIN, interval=5):
add_wave_done() add_wave_done()
# Update obtain_frequent_check
self.obtained_is_full(dungeon=self.dungeon, wave_done=self.combat_wave_done, obtain_get=False)
# Cache the result of _combat_can_again() as no expected stamina reduce during retry # Cache the result of _combat_can_again() as no expected stamina reduce during retry
if combat_can_again is None: if combat_can_again is None:
combat_can_again = self._combat_can_again() combat_can_again = self._combat_can_again()

5
tasks/combat/obtain.py
View File

@ -253,7 +253,7 @@ class CombatObtain(PlannerMixin):
self.planner_write() self.planner_write()
return items return items
def obtained_is_full(self, dungeon: DungeonList | None, wave_done=0) -> bool: def obtained_is_full(self, dungeon: DungeonList | None, wave_done=0, obtain_get=True) -> bool:
if dungeon is None: if dungeon is None:
self.obtain_frequent_check = False self.obtain_frequent_check = False
return False return False
@ -263,7 +263,8 @@ class CombatObtain(PlannerMixin):
return False return False
# Update # Update
self.obtain_get(dungeon) if obtain_get:
self.obtain_get(dungeon)
# Check progress # Check progress
row = self.planner.row_come_from_dungeon(dungeon) row = self.planner.row_come_from_dungeon(dungeon)