From d1052df93292616a01950aee3c8e0d520e075685 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:55:36 +0800 Subject: [PATCH] Revert "tmp: [JP] LevelOcr" This reverts commit a24a7fcfd1dc3aff8edc79694b6e2c686e897bf2. --- module/combat/level.py | 23 ++++++----------------- module/retire/dock.py | 10 ++-------- module/retire/scanner.py | 8 +------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/module/combat/level.py b/module/combat/level.py index fdbcd5f6d..8350f998d 100644 --- a/module/combat/level.py +++ b/module/combat/level.py @@ -1,5 +1,3 @@ -import module.config.server as server - from module.base.base import ModuleBase from module.base.button import * from module.base.decorator import Config @@ -43,7 +41,7 @@ class Level(ModuleBase): @Config.when(SERVER='jp') def _lv_grid(self): - return ButtonGrid(origin=(34, 128), delta=(0, 100), button_shape=(68, 19), grid_shape=(1, 6)) + return ButtonGrid(origin=(58, 128), delta=(0, 100), button_shape=(46, 19), grid_shape=(1, 6)) @Config.when(SERVER=None) def _lv_grid(self): @@ -127,20 +125,11 @@ class LevelOcr(Digit): image = cv2.subtract(255, cv2.multiply(image, 255 / (255 - luma_bg))) # Find 'L' to strip 'LV.'. # Return an empty image if 'L' is not found. - if server.server != 'jp': - letter_l = np.nonzero(image[9:15, :].max(axis=0) < 127)[0] - if len(letter_l): - first_digit = letter_l[0] + 17 - if first_digit + 3 < 46: # LV_GRID_MAIN.button_shape[0] = 46 - return image[:, first_digit:] - else: - letter_l = np.nonzero(image[5:11, :].max(axis=0) < 63)[0] - if len(letter_l): - first_digit = letter_l[0] + 23 # maximal size in dock and minimal size in sea grid - if first_digit + 3 < 70: # LV_GRID_MAIN.button_shape[0] = 46 - image = image[:, first_digit:] - image = cv2.copyMakeBorder(image, 2, 2, 2, 2, cv2.BORDER_CONSTANT, value=(255, 255, 255)) - return image + letter_l = np.nonzero(image[9:15, :].max(axis=0) < 127)[0] + if len(letter_l): + first_digit = letter_l[0] + 17 + if first_digit + 3 < 46: # LV_GRID_MAIN.button_shape[0] = 46 + return image[:, first_digit:] return np.array([[255]], dtype=np.uint8) def after_process(self, result): diff --git a/module/retire/dock.py b/module/retire/dock.py index d3a61b437..91815c100 100644 --- a/module/retire/dock.py +++ b/module/retire/dock.py @@ -1,5 +1,3 @@ -import module.config.server as server - from module.base.button import ButtonGrid from module.base.decorator import cached_property from module.base.timer import Timer @@ -22,12 +20,8 @@ DOCK_FAVOURITE.add_status('off', check_button=COMMON_SHIP_FILTER_DISABLE) CARD_GRIDS = ButtonGrid( origin=(93, 76), delta=(164 + 2 / 3, 227), button_shape=(138, 204), grid_shape=(7, 2), name='CARD') CARD_RARITY_GRIDS = CARD_GRIDS.crop(area=(0, 0, 138, 5), name='RARITY') -if server.server != 'jp': - CARD_LEVEL_GRIDS = CARD_GRIDS.crop(area=(77, 5, 138, 27), name='LEVEL') - CARD_EMOTION_GRIDS = CARD_GRIDS.crop(area=(23, 29, 48, 52), name='EMOTION') -else: - CARD_LEVEL_GRIDS = CARD_GRIDS.crop(area=(74, 5, 136, 27), name='LEVEL') - CARD_EMOTION_GRIDS = CARD_GRIDS.crop(area=(31, 29, 61, 52), name='EMOTION') +CARD_LEVEL_GRIDS = CARD_GRIDS.crop(area=(77, 5, 138, 27), name='LEVEL') +CARD_EMOTION_GRIDS = CARD_GRIDS.crop(area=(23, 29, 48, 52), name='EMOTION') DOCK_SCROLL = Scroll(DOCK_SCROLL, color=(247, 211, 66), name='DOCK_SCROLL') diff --git a/module/retire/scanner.py b/module/retire/scanner.py index 7f00fd0c4..4b45380c6 100644 --- a/module/retire/scanner.py +++ b/module/retire/scanner.py @@ -5,8 +5,6 @@ from typing import Any, Dict, List, Tuple, Union import cv2 import numpy as np -import module.config.server as server - from module.base.button import ButtonGrid from module.base.utils import color_similar, crop, get_color, limit_in from module.combat.level import LevelOcr @@ -134,12 +132,8 @@ class EmotionScanner(Scanner): super().__init__() self._results = [] self.grids = CARD_EMOTION_GRIDS - if server.server != 'jp': - self.ocr_model = EmotionDigit(self.grids.buttons, + self.ocr_model = EmotionDigit(self.grids.buttons, name='DOCK_EMOTION_OCR', threshold=176) - else: - self.ocr_model = EmotionDigit(self.grids.buttons, - name='DOCK_EMOTION_OCR', threshold=221) def _scan(self, image) -> List: return self.ocr_model.ocr(image)