sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 10:27:21 +08:00
Code Activity

Fix: handle raid remain like "915/", "1515"

Browse Source
This commit is contained in:
LmeSzinc
2026-02-19 02:15:25 +08:00
parent 986d825a81
commit 0a4f2a89fc
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/raid/raid.py
View File

@@ -15,6 +15,15 @@ from module.ui.assets import RAID_CHECK
from module.ui.page import page_rpg_stage from module.ui.page import page_rpg_stage
class RaidCounterPostMixin(DigitCounter):
def after_process(self, result):
# fix result like "915/", "1515"
result = result.strip('/')
if result.isdigit() and len(result) > 2 and result.endswith('15'):
result = f'{result[:-2]}/15'
return result
class RaidCounter(DigitCounter): class RaidCounter(DigitCounter):
def pre_process(self, image): def pre_process(self, image):
image = super().pre_process(image) image = super().pre_process(image)
@@ -163,7 +172,7 @@ def raid_ocr(raid, mode):
if mode == 'ex': if mode == 'ex':
return Digit(button, letter=(255, 239, 215), threshold=128) return Digit(button, letter=(255, 239, 215), threshold=128)
else: else:
return DigitCounter(button, lang='cnocr', letter=(154, 148, 133), threshold=128) return RaidCounterPostMixin(button, lang='cnocr', letter=(154, 148, 133), threshold=128)
def pt_ocr(raid): def pt_ocr(raid):