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

Fix: Character trial ended at page_main

Browse Source
This commit is contained in:
LmeSzinc 2024-04-18 23:00:49 +08:00
parent 82f5e8b6ab
commit fa209e1cf5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
route/daily/HimekoTrial.py
View File

@ -16,7 +16,13 @@ class Route(RouteBase, Combat, CharacterTrial):
def wait_next_skill(self, expected_end=None, skip_first_screenshot=True): def wait_next_skill(self, expected_end=None, skip_first_screenshot=True):
# Ended at START_TRIAL # Ended at START_TRIAL
def combat_end(): def combat_end():
return self.match_template_color(START_TRIAL) if self.match_template_color(START_TRIAL):
logger.info('Trial ended at START_TRIAL')
return True
if self.is_in_main():
logger.warning('Trial ended at is_in_main()')
return True
return False
return super().wait_next_skill(expected_end=combat_end, skip_first_screenshot=skip_first_screenshot) return super().wait_next_skill(expected_end=combat_end, skip_first_screenshot=skip_first_screenshot)

6
tasks/combat/skill.py
View File

@ -13,7 +13,7 @@ class CombatSkill(UI):
if not self.appear(IN_SKILL): if not self.appear(IN_SKILL):
return False return False
if not self.image_color_count(IN_SKILL, color=(255, 255, 255), threshold=221, count=50): if not self.image_color_count(IN_SKILL, color=(255, 255, 255), threshold=180, count=50):
return False return False
return True return True
@ -51,6 +51,10 @@ class CombatSkill(UI):
logger.info(f'Skill used: {button} (icon changed)') logger.info(f'Skill used: {button} (icon changed)')
break break
if self.is_in_main():
logger.warning('_skill_click ended at is_in_main')
break
def _is_skill_active(self, button): def _is_skill_active(self, button):
flag = self.image_color_count(button, color=(220, 196, 145), threshold=221, count=50) flag = self.image_color_count(button, color=(220, 196, 145), threshold=221, count=50)
return flag return flag