From 6d3f34ef488a6138d5fb99b3f67b35989a974e49 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sat, 17 Jun 2023 16:19:13 +0800 Subject: [PATCH] Fix: OCR_TRAILBLAZE_POWER length varies by value --- .../combat/prepare/OCR_TRAILBLAZE_POWER.png | Bin 8498 -> 10207 bytes module/ocr/ocr.py | 11 +++++++++-- tasks/combat/assets/assets_combat_prepare.py | 8 ++++---- tasks/combat/prepare.py | 13 ++++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/assets/share/combat/prepare/OCR_TRAILBLAZE_POWER.png b/assets/share/combat/prepare/OCR_TRAILBLAZE_POWER.png index 5ecfd9c558aede7e0e23cc3c0c487b13a7d4f75d..8fe06b9b76b95459ffbeb20606f92b1877e26ddb 100644 GIT binary patch delta 4921 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 delta 3194 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 diff --git a/module/ocr/ocr.py b/module/ocr/ocr.py index bf3b69372..a0964e1a8 100644 --- a/module/ocr/ocr.py +++ b/module/ocr/ocr.py @@ -133,6 +133,12 @@ class Ocr: result = 'UID' return result + def format_result(self, result): + """ + Will be overriden. + """ + return result + def ocr_single_line(self, image): # pre process start_time = time.time() @@ -142,6 +148,7 @@ class Ocr: result, _ = self.model.ocr_single_line(image) # after proces result = self.after_process(result) + result = self.format_result(result) logger.attr(name='%s %ss' % (self.name, float2str(time.time() - start_time)), text=str(result)) return result @@ -211,7 +218,7 @@ class Digit(Ocr): def __init__(self, button: ButtonWrapper, lang='ch', name=None): super().__init__(button, lang=lang, name=name) - def after_process(self, result) -> int: + def format_result(self, result) -> int: """ Returns: int: @@ -231,7 +238,7 @@ class DigitCounter(Ocr): def __init__(self, button: ButtonWrapper, lang='ch', name=None): super().__init__(button, lang=lang, name=name) - def after_process(self, result) -> tuple[int, int, int]: + def format_result(self, result) -> tuple[int, int, int]: """ Do OCR on a counter, such as `14/15`, and returns 14, 1, 15 diff --git a/tasks/combat/assets/assets_combat_prepare.py b/tasks/combat/assets/assets_combat_prepare.py index d5d8f85a4..fd114f38f 100644 --- a/tasks/combat/assets/assets_combat_prepare.py +++ b/tasks/combat/assets/assets_combat_prepare.py @@ -17,10 +17,10 @@ OCR_TRAILBLAZE_POWER = ButtonWrapper( name='OCR_TRAILBLAZE_POWER', share=Button( file='./assets/share/combat/prepare/OCR_TRAILBLAZE_POWER.png', - area=(1043, 26, 1131, 48), - search=(1023, 6, 1151, 68), - color=(43, 46, 53), - button=(1043, 26, 1131, 48), + area=(998, 26, 1130, 48), + search=(978, 6, 1150, 68), + color=(77, 76, 87), + button=(998, 26, 1130, 48), ), ) OCR_WAVE_COUNT = ButtonWrapper( diff --git a/tasks/combat/prepare.py b/tasks/combat/prepare.py index 7224d3263..866bd22b1 100644 --- a/tasks/combat/prepare.py +++ b/tasks/combat/prepare.py @@ -1,3 +1,5 @@ +import re + from module.base.timer import Timer from module.ocr.ocr import Digit, DigitCounter from tasks.base.ui import UI @@ -9,6 +11,15 @@ from tasks.combat.assets.assets_combat_prepare import ( ) +class TrailblazePowerOcr(DigitCounter): + def after_process(self, result): + result = super().after_process(result) + # The trailblaze power icon is recognized as 买 + # OCR_TRAILBLAZE_POWER includes the icon because the length varies by value + result = re.sub(r'[买米装：（）]', '', result) + return result + + class CombatPrepare(UI): def combat_set_wave(self, count=6): """ @@ -47,7 +58,7 @@ class CombatPrepare(UI): else: self.device.screenshot() - current, _, _ = DigitCounter(OCR_TRAILBLAZE_POWER).ocr_single_line(self.device.image) + current, _, _ = TrailblazePowerOcr(OCR_TRAILBLAZE_POWER).ocr_single_line(self.device.image) # Confirm if it is > 180, sometimes just OCR errors if current > 180 and timeout.reached(): break