From 261a9f98bc08bc005b569c96c4ed6cb5def92186 Mon Sep 17 00:00:00 2001 From: W1NDes Date: Mon, 14 Jul 2025 15:26:10 +0800 Subject: [PATCH] =?UTF-8?q?Fix(ShipIr):=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=9C=A8=E4=BB=85=E6=9C=89=E4=B8=A4=E8=A1=8C=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/ship_ir/ship_ir.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/ship_ir/ship_ir.py b/module/ship_ir/ship_ir.py index 1a29454ab..1c80fa3c4 100644 --- a/module/ship_ir/ship_ir.py +++ b/module/ship_ir/ship_ir.py @@ -9,8 +9,9 @@ from module.ship_ir.handbook import Handbook HANDBOOK_SCROLL = Scroll(HANDBOOK_SCROLL_AREA, color=(244, 208, 66)) SHIP_NAME_BUTTON = ButtonGrid(origin=(200, 448), delta=(164 + 1 / 3, 226), button_shape=(135,21), grid_shape=(6, 2), name='SHIP_NAME') +SHIP_NAME_BUTTON_2 = ButtonGrid(origin=(200, 511), delta=(164 + 1 / 3, 226), button_shape=(135,21), grid_shape=(6, 1), name='SHIP_NAME_2') -CHECK_FILTER1 = ["全部","全阵营","彩色","无限制"] +CHECK_FILTER1 = ["轻巡","皇家","超稀有","无限制"] CHECK_FILTER2 = ["","白鹰","精锐","无限制"] CHECK_FILTER3 = ["","重樱","全部","无限制"] CHECK_FILTER4 = ["","白鹰","金色","无限制"] @@ -65,6 +66,11 @@ class ShipIr(Handbook): if ship_name and ship_name not in recognized_names: recognized_names.append(ship_name) logger.info(f'识别为：{ship_name}') + for button in SHIP_NAME_BUTTON_2.buttons:#仅有两行时的方案 + ship_name = self.name_ocr(button) + if ship_name and ship_name not in recognized_names: + recognized_names.append(ship_name) + logger.info(f'识别为：{ship_name}') return recognized_names def summon_namebar_list(self,rarity):