From 2480bbacd68739e1aba08f34ed2cee350cf73ffa Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Fri, 13 Sep 2024 18:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E6=A3=80=E6=9F=A5FPS?= =?UTF-8?q?=E5=AD=97=E6=A0=B7=E6=8A=A5=E9=94=99=20=E9=99=8D=E4=BD=8E?= =?UTF-8?q?=E7=BB=B4=E9=87=8C=E5=A5=88=E5=87=BA=E5=9C=BA=E4=BC=98=E5=85=88?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/char/Verina.py | 3 +++ src/combat/CombatCheck.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/char/Verina.py b/src/char/Verina.py index ea719c7..deac050 100644 --- a/src/char/Verina.py +++ b/src/char/Verina.py @@ -18,3 +18,6 @@ class Verina(BaseChar): def count_base_priority(self): return - 1 + + def count_echo_priority(self): + return 0 diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index 5721df0..fab74ed 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -1,8 +1,8 @@ -import re import time import cv2 +import re from ok.color.Color import find_color_rectangles, get_mask_in_color_range, is_pure_black from ok.feature.Box import find_boxes_by_name from ok.logging.Logger import get_logger @@ -237,6 +237,10 @@ class CombatCheck: def find_boss_lv_text(self): texts = self.ocr(box=self.box_of_screen(1269 / 3840, 10 / 2160, 2533 / 3840, 140 / 2160, hcenter=True), target_height=540, name='boss_lv_text') + fps_text = find_boxes_by_name(texts, + re.compile(r'FPS', re.IGNORECASE)) + if fps_text: + raise Exception('FPS text detected on screen, please close any FPS overlay!') boss_lv_texts = find_boxes_by_name(texts, [re.compile(r'(?i)^L[Vv].*')]) if len(boss_lv_texts) > 0: