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

Merge pull request #605 from LmeSzinc/dev

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc 2024-08-11 17:19:09 +08:00 committed by GitHub
commit 9e999b0961
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/combat/prepare.py
View File

@ -64,13 +64,13 @@ class CombatPrepare(StaminaStatus):
self.device.screenshot() self.device.screenshot()
data = self.update_stamina_status(image=self.device.image) data = self.update_stamina_status(image=self.device.image)
if timeout.reached():
break
if data.stamina is None: if data.stamina is None:
continue continue
# Confirm if it is > 240, sometimes just OCR errors # Confirm if it is > 240, sometimes just OCR errors
# if current > 240 and timeout.reached(): # if current > 240 and timeout.reached():
# break # break
if expect_reduce and timeout.reached():
break
if expect_reduce and data.stamina >= before: if expect_reduce and data.stamina >= before:
continue continue
if data.stamina <= 240: if data.stamina <= 240:

2
tasks/combat/stamina_status.py
View File

@ -20,6 +20,8 @@ class StaminaOcr(DigitCounter):
result = re.sub(r'1240$', '/240', result) result = re.sub(r'1240$', '/240', result)
# 0*0/24 -> 0/240 # 0*0/24 -> 0/240
result = re.sub(r'24$', '240', result) result = re.sub(r'24$', '240', result)
# * 50/2401+)
result = result.replace('/2401', '/240')
return result return result