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

Fix: COMBAT_TEAM_SUPPORT is clicked before support_set()

Browse Source
This commit is contained in:
LmeSzinc 2024-03-27 23:13:14 +08:00
parent fe6030617f
commit bf5f8fd3c7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/combat/combat.py
View File

@ -81,7 +81,15 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
""" """
logger.hr('Combat prepare') logger.hr('Combat prepare')
skip_first_screenshot = True skip_first_screenshot = True
pre_set_team = bool(support_character) if support_character:
# To set team before support set
pre_set_team = True
# Block COMBAT_TEAM_PREPARE before support set
support_set = False
else:
pre_set_team = False
support_set = True
logger.info([support_character, pre_set_team, support_set])
trial = 0 trial = 0
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@ -99,14 +107,15 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
raise RequestHumanTakeover raise RequestHumanTakeover
# Click # Click
if self.appear(COMBAT_TEAM_SUPPORT) and support_character: if support_character and self.appear(COMBAT_TEAM_SUPPORT):
if pre_set_team: if pre_set_team:
self.team_set(team) self.team_set(team)
pre_set_team = False pre_set_team = False
continue continue
self.support_set(support_character) self.support_set(support_character)
support_set = True
continue continue
if self.appear(COMBAT_TEAM_PREPARE, interval=2): if support_set and self.appear(COMBAT_TEAM_PREPARE, interval=2):
self.team_set(team) self.team_set(team)
self.device.click(COMBAT_TEAM_PREPARE) self.device.click(COMBAT_TEAM_PREPARE)
self.interval_reset(COMBAT_TEAM_PREPARE) self.interval_reset(COMBAT_TEAM_PREPARE)