From e08edda27d21a9b4315eea8b8bd4dfb29fcd9637 Mon Sep 17 00:00:00 2001 From: ywsabc2 Date: Sat, 14 Nov 2026 06:54:27 +0000 Subject: [PATCH] =?UTF-8?q?P1-5=20=E9=95=9C=E7=89=A2=E9=80=89=E9=98=9F?= =?UTF-8?q?=E5=AE=B9=E5=BF=8D=20OCR=20=E8=AF=AF=E8=AF=BB=E4=B8=8E=E9=98=9F?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 队名先归一:去空白、NFKC 全角转半角、改回实测误读(震颐→震颤、沉论→沉沦、编#→编队#) - 精确匹配优先;否则接受这一屏唯一的「名字+后缀」(流血队、流血(X)),多条不点 - 顶栏确认只认精确,避免把 流血2 当成 流血 - 没命中时日志打印每屏看到的名字,点了没变时打印顶栏读到的文字 Co-Authored-By: Claude Opus 5.5 --- README.md | 3 + docs/BACKLOG.md | 14 ++ docs/feedback/2026-11-14/HANDOVER.md | 5 +- lc_mcp/aalc_patches.py | 113 +++++++++++++---- tests/test_system_team_selection.py | 183 +++++++++++++++++++++++++++ 5 files changed, 290 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index bcd2e83..3d783ff 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,9 @@ MCP 初始化说明与工具描述均指导 AI 优先使用 AALC:常规日常 原值和次数一起写入恢复文件,结束或被强杀后都会写回。 - **商店清单**:上游按已不存在的 `assets/images/share/...` 列目录,必买/必卖/公式合成清单恒为空。 `mirror`/`all` 任务按各主题/语言图片根补齐(当前 5/19/31 项)。 +- **镜牢按体系名选队**:按 `team_system` 在编队列表里点同名队伍(流血/斩击/…),点完核对顶栏队名。 + 名字先归一(去空白、全角转半角、纠正 `震颐`/`沉论`/`编#` 等误读);精确匹配优先, + 否则接受这一屏唯一的"名字+后缀"(`流血队`、`流血(X)`),多条就不点。没找到时日志列出每屏看到的名字。 - **键盘寻路按节点类型**:开着简单键盘寻路时不再只按 ↑。先识别巴士右侧下一列的节点类型, 按上游权重(事件 < 商店 < 战斗 < …)依次按方向键,进不去再退回 ↑;不拖地图。`LCP_TYPED_ROAD=0` 关闭。 diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md index 6da4f3f..440d6fb 100644 --- a/docs/BACKLOG.md +++ b/docs/BACKLOG.md @@ -150,6 +150,20 @@ Dijkstra 那套(`search_road.py:735`,代价 event 1 / shop 2 / battle 4 / bo **风险**:低。只是匹配变宽,需保证「唯一命中」才点,避免选错队。 +**状态(2026-11-14 云端)**:已实现,待实机验收。 + +- 归一化 `normalize_team_name()`:去所有空白,NFKC 全角转半角(`#`→`#`、`()`→`()`),再按 `TEAM_OCR_FIXES` + 改回实测误读(`震颐`→`震颤`、`沉论`→`沉沦`、`编#`→`编队#`)。新误读往这张表里加。 +- 列表挑选 `pick_team_item()`:先找精确匹配(多个名字时按 `SYSTEM_TEAM_NAMES` 里的顺序);没有再看前缀匹配 + (名字至少两个字,后面带任意后缀),**这一屏只有一条才点**,两条以上记日志不点、继续翻页。 +- 顶栏确认只认归一后的精确匹配:「已经是这支队」的判断和点完后的确认都一样。顶栏是 `流血队` 时会回列表里确认唯一再点一次, + 避免把 `流血2` 当成 `流血`。 +- 日志:每屏没命中时打印 `第 N 屏没有 流血; 这一屏的名字: 剧情关卡/斩击/...`;点了但顶栏没变时打印顶栏读到了什么。 +- 限制:唯一性只按当前这一屏判断;相似队名分在两屏时(例如 `流血队` 在第 2 屏、`流血2` 在第 3 屏)会点先出现的那条。 + 顶栏位置仍是写死的 `TEAM_HEADER`,字号/布局变了要按日志里「顶栏读到」调整。 +- 实机验收:把「流血」改名成「流血队」跑一局,日志应出现 `编队列表里找到 流血队 @(...), 前缀匹配 流血` + 和 `已按体系名选中编队 流血队`。 + --- ## P2-6 商店必买清单本地化 diff --git a/docs/feedback/2026-11-14/HANDOVER.md b/docs/feedback/2026-11-14/HANDOVER.md index cb70d1c..c0c9224 100644 --- a/docs/feedback/2026-11-14/HANDOVER.md +++ b/docs/feedback/2026-11-14/HANDOVER.md @@ -42,7 +42,7 @@ TEAM_HEADER = (170, 520, 90, 150) # 顶栏队名位置,用来确 _team_ocr(auto) -> [(text, x, y), ...] # 整屏 OCR 后清洗,不排序 _in_list(x, y) / _in_header(x, y) # 区域判定 _scroll_team_list(auto, direction, times, distance) # +1=回顶部, -1=往下翻 -_header_is(auto, name) / _wait_header(auto, name) # 顶栏确认(3 次 × 1.2s) +_header_is(auto, names) / _wait_header(auto, names) # 顶栏确认(3 次 × 1.2s,归一后精确匹配) _select_team_by_name(auto, names, log, rounds=4) # 主流程,返回 bool install_system_team_selection(log=print) # 安装补丁,返回原始 select_battle_team ``` @@ -98,7 +98,8 @@ if task in ('mirror', 'all'): > `#1`~`#12` 已不存在。任何按 `编队#N` 找队的逻辑在这个号上都会失败,这是本次问题的根。 > -> 队名改动后必须同步 `SYSTEM_TEAM_NAMES`;补丁只做**精确匹配**(`text == name`),不做子串。 +> 队名改动后最好同步 `SYSTEM_TEAM_NAMES`。2026-11-14 起(BACKLOG P1-5)名字先归一(空白/全半角/`震颐`→`震颤` 等误读), +> 精确匹配优先;没有精确匹配时接受这一屏**唯一**的「名字+后缀」(`流血队`),不做任意子串。顶栏确认仍只认精确。 --- diff --git a/lc_mcp/aalc_patches.py b/lc_mcp/aalc_patches.py index 169cf12..69e4920 100644 --- a/lc_mcp/aalc_patches.py +++ b/lc_mcp/aalc_patches.py @@ -16,6 +16,7 @@ import os import re import threading import time +import unicodedata from contextlib import contextmanager TEAM_TARGET = re.compile(r'(?:TEAMS|TFAMS|编队)#(\d+)', re.IGNORECASE) @@ -509,56 +510,116 @@ def _scroll_team_list(auto, direction, times=6, distance=250): time.sleep(0.35) -def _header_is(auto, name): - """顶栏当前队伍名就是 name。""" +# OCR 实测误读(2026-11-14): 震颤→震颐, 沉沦→沉论, 编队#16→编#16。归一化时按子串改回来。 +TEAM_OCR_FIXES = (('震颐', '震颤'), ('沉论', '沉沦'), ('编#', '编队#')) +TEAM_PREFIX_MIN = 2 # 前缀匹配的队名至少两个字, 免得单字名把一片都吃进来 + + +def normalize_team_name(text): + """去空白、全角转半角(NFKC: #→#、()→()、全角空格)、改回常见误读。""" + text = ''.join(unicodedata.normalize('NFKC', str(text)).split()) + for wrong, right in TEAM_OCR_FIXES: + text = text.replace(wrong, right) + return text + + +def team_name_match(text, names): + """'exact' = 归一后等于某个名字; 'prefix' = 某个名字后面带了后缀(流血队、流血(X)); 否则 None。""" + text = normalize_team_name(text) + wanted = [normalize_team_name(name) for name in names] + if text in wanted: + return 'exact' + if any(len(name) >= TEAM_PREFIX_MIN and text.startswith(name) for name in wanted): + return 'prefix' + return None + + +def pick_team_item(items, names): + """从列表条目 [(文本, x, y)] 里挑要点的那条, 返回 (条目, 理由) 或 (None, 理由)。 + + 精确匹配优先, 多个名字时按 names 的顺序; 没有精确匹配才看前缀, 且这一屏只能有一条, + 两条以上宁可不点(点错队比没选上更糟: 后面整局都用错的队)。 + """ + for name in names: + for item in items: + if team_name_match(item[0], (name,)) == 'exact': + return item, '精确匹配 %s' % name + prefixed = {} + for item in items: + if team_name_match(item[0], names) == 'prefix': + prefixed.setdefault(normalize_team_name(item[0]), item) + if len(prefixed) == 1: + return next(iter(prefixed.values())), '前缀匹配 %s' % '/'.join(names) + if prefixed: + return None, '前缀匹配到多条(%s), 不点' % '/'.join(sorted(prefixed)) + return None, '' + + +def _list_names(items): + """这一屏列表里的名字, 从上到下(失败日志用)。""" + return [normalize_team_name(text) for text, x, y in sorted(items, key=lambda item: item[2])] + + +def _header_texts(auto): + """顶栏区域读到的文字; 截图失败返回 None。""" if auto.take_screenshot() is None: - return False - return any(text == name and _in_header(x, y) for text, x, y in _team_ocr(auto)) + return None + return [text for text, x, y in _team_ocr(auto) if _in_header(x, y)] -def _wait_header(auto, name, tries=3, delay=1.2): +def _header_is(auto, names): + """顶栏当前队伍名(归一后)恰好是 names 之一。只认精确: 顶栏是 "流血2" 时不能当成 "流血"。""" + return any(team_name_match(text, names) == 'exact' for text in _header_texts(auto) or ()) + + +def _wait_header(auto, names, tries=3, delay=1.2): """点完之后顶栏要过一两帧才刷新, 多等几次。""" for _ in range(tries): time.sleep(delay) - if _header_is(auto, name): + if _header_is(auto, names): return True return False def _select_team_by_name(auto, names, log=print, rounds=4): - """在编队列表里按名字点选。成功返回 True, 没找到返回 False。""" + """在编队列表里按名字点选。成功返回 True, 没找到返回 False。 + + 名字先归一化(空白/全半角/常见误读); 精确匹配优先, 否则接受唯一的"名字+后缀"。 + 没找到时把每一屏看到的名字打进日志。 + """ if auto.take_screenshot() is None: return False if not auto.find_element('teams/identify_assets.png'): log('[lc_mcp] 不在编队界面, 跳过按名字选队') return False - for name in names: # 已经是这支队就不用动列表 - if _header_is(auto, name): - log('[lc_mcp] patch: 当前已经是编队 %s, 无需切换' % name) - return True + current = [normalize_team_name(t) for t in _header_texts(auto) or () + if team_name_match(t, names) == 'exact'] + if current: # 已经是这支队就不用动列表; 带后缀的队名要回列表里确认唯一后再点 + log('[lc_mcp] patch: 当前已经是编队 %s, 无需切换' % current[0]) + return True auto.mouse_click(1, 1) time.sleep(0.3) _scroll_team_list(auto, +1) # 先回到顶部 - for round_index in range(rounds): + for round_index in range(1, rounds + 1): if auto.take_screenshot() is None: + log('[lc_mcp] 第 %d 屏截图失败' % round_index) continue - items = _team_ocr(auto) - hit = None - for name in names: - for text, x, y in items: - if text == name and _in_list(x, y): - hit = (name, x, y) - break - if hit: - break + items = [item for item in _team_ocr(auto) if _in_list(item[1], item[2])] + hit, reason = pick_team_item(items, names) if hit: - name, x, y = hit - log('[lc_mcp] 编队列表里找到 %s @(%d,%d)' % (name, x, y)) + text, x, y = hit + label = normalize_team_name(text) + log('[lc_mcp] 编队列表里找到 %s @(%d,%d), %s' % (label, x, y, reason)) auto.mouse_action_with_pos([x, y], offset=False) - if _wait_header(auto, name): - log('[lc_mcp] patch: 已按体系名选中编队 %s' % name) + if _wait_header(auto, (label,)): + log('[lc_mcp] patch: 已按体系名选中编队 %s' % label) return True - log('[lc_mcp] 点了 %s 但顶栏没变, 继续往下翻' % name) + log('[lc_mcp] 点了 %s 但顶栏没变(顶栏读到: %s), 继续往下翻' + % (label, '/'.join(normalize_team_name(t) for t in _header_texts(auto) or ()) or '无')) + else: + log('[lc_mcp] 第 %d 屏没有 %s%s; 这一屏的名字: %s' + % (round_index, '/'.join(names), ', ' + reason if reason else '', + '/'.join(_list_names(items)) or '(空)')) _scroll_team_list(auto, -1, times=3) log('[lc_mcp] 编队列表里没找到 %s(共 %d 轮)' % ('/'.join(names), rounds)) return False diff --git a/tests/test_system_team_selection.py b/tests/test_system_team_selection.py index 513687a..f80a0f8 100644 --- a/tests/test_system_team_selection.py +++ b/tests/test_system_team_selection.py @@ -76,6 +76,189 @@ class TeamOcrTest(unittest.TestCase): self.assertEqual(aalc_patches._team_ocr(auto), [('斩击', 1.0, 2.0)]) +class NormalizeTeamNameTest(unittest.TestCase): + + def test_known_ocr_misreads_are_fixed(self): + # 2026-11-14 实测误读样本 + self.assertEqual(aalc_patches.normalize_team_name('震颐'), '震颤') + self.assertEqual(aalc_patches.normalize_team_name('沉论'), '沉沦') + self.assertEqual(aalc_patches.normalize_team_name('编#16'), '编队#16') + self.assertEqual(aalc_patches.normalize_team_name('编队#16'), '编队#16') + + def test_spaces_and_full_width_forms(self): + self.assertEqual(aalc_patches.normalize_team_name(' 流\u3000血 '), '流血') + self.assertEqual(aalc_patches.normalize_team_name('流血(X)'), '流血(X)') + self.assertEqual(aalc_patches.normalize_team_name('编队#20'), '编队#20') + + +class TeamNameMatchTest(unittest.TestCase): + + def test_exact_prefix_and_miss(self): + match = aalc_patches.team_name_match + self.assertEqual(match('流血', ('流血',)), 'exact') + self.assertEqual(match('流血队', ('流血',)), 'prefix') + self.assertEqual(match('流血(X)', ('流血',)), 'prefix') + self.assertIsNone(match('编队#13', ('流血',))) + self.assertIsNone(match('出血', ('流血',))) + self.assertIsNone(match('血', ('流血',))) + + def test_misread_text_matches_configured_name(self): + self.assertEqual(aalc_patches.team_name_match('震颐', aalc_patches.SYSTEM_TEAM_NAMES['tremor']), 'exact') + self.assertEqual(aalc_patches.team_name_match('沉论队', aalc_patches.SYSTEM_TEAM_NAMES['sinking']), + 'prefix') + + def test_single_character_names_never_prefix_match(self): + self.assertIsNone(aalc_patches.team_name_match('流血', ('流',))) + self.assertEqual(aalc_patches.team_name_match('流', ('流',)), 'exact') + + +class PickTeamItemTest(unittest.TestCase): + + def test_exact_beats_prefix(self): + items = [('流血队', 130, 400), ('流血', 130, 450)] + self.assertEqual(aalc_patches.pick_team_item(items, ('流血',))[0], ('流血', 130, 450)) + + def test_names_order_decides_between_exact_hits(self): + items = [('呼吸', 130, 400), ('呼吸法', 130, 450)] + self.assertEqual(aalc_patches.pick_team_item(items, ('呼吸法', '呼吸'))[0], ('呼吸法', 130, 450)) + + def test_unique_prefix_is_picked(self): + hit, reason = aalc_patches.pick_team_item([('斩击', 130, 330), ('流血队', 130, 490)], ('流血',)) + self.assertEqual(hit, ('流血队', 130, 490)) + self.assertIn('前缀', reason) + + def test_one_team_matching_two_names_is_still_unique(self): + hit, _ = aalc_patches.pick_team_item([('呼吸法队', 130, 400)], ('呼吸法', '呼吸')) + self.assertEqual(hit, ('呼吸法队', 130, 400)) + + def test_ambiguous_prefix_is_not_clicked(self): + hit, reason = aalc_patches.pick_team_item([('流血队', 130, 400), ('流血2', 130, 450)], ('流血',)) + self.assertIsNone(hit) + self.assertIn('流血2/流血队', reason) + + def test_nothing_matches(self): + self.assertEqual(aalc_patches.pick_team_item([('斩击', 130, 330)], ('流血',)), (None, '')) + + +class _OcrPairs: + """OCR 结果里同名文本可以出现两次(列表和顶栏), 用 items() 返回成对列表来模拟。""" + + def __init__(self, pairs): + self.pairs = pairs + + def items(self): + return list(self.pairs) + + +class _FakeTeamScreen: + """编队界面: 列表按 3 次下拖翻一屏, 点哪条顶栏就变成哪条。""" + + def __init__(self, screens, header='剧情关卡', click_changes_header=True): + self.screens = screens + self.header = header + self.click_changes_header = click_changes_header + self.swipes_down = 0 + self.clicks = [] + + @property + def page(self): + return min(self.swipes_down // 3, len(self.screens) - 1) + + def take_screenshot(self): + return object() + + def find_element(self, *args, **kwargs): + return True + + def mouse_click(self, *args): + pass + + def mouse_swipe_for_team_scroll(self, x, y, dy, duration): + self.swipes_down = 0 if dy > 0 else self.swipes_down + 1 + + def _run_ocr_for_text(self, my_crop=None): + pairs = [(text, [130.0, 320.0 + 50 * row]) for row, text in enumerate(self.screens[self.page])] + if self.header: + pairs.append((self.header, [242.0, 125.0])) + return _OcrPairs(pairs) + + def mouse_action_with_pos(self, pos, offset=False): + self.clicks.append(tuple(pos)) + if self.click_changes_header: + row = int(round((pos[1] - 320.0) / 50)) + self.header = self.screens[self.page][row] + + +class SelectTeamByNameTest(unittest.TestCase): + + TOP = ['剧情关卡', '斩击', '突刺', '打击', '烧伤'] + MIDDLE = ['流血', '震颤', '破裂', '沉沦', '呼吸法'] + BOTTOM = ['充能', '编队#13', '编队#14'] + + def setUp(self): + self.lines = [] + patcher = mock.patch.object(aalc_patches.time, 'sleep') + patcher.start() + self.addCleanup(patcher.stop) + + def select(self, auto, names): + return aalc_patches._select_team_by_name(auto, names, log=self.lines.append) + + @property + def log(self): + return '\n'.join(self.lines) + + def test_renamed_team_with_suffix_is_selected(self): + auto = _FakeTeamScreen([self.TOP, ['流血队', '震颤', '破裂'], self.BOTTOM]) + self.assertTrue(self.select(auto, ('流血',))) + self.assertEqual(auto.header, '流血队') + self.assertEqual(len(auto.clicks), 1) + self.assertIn('已按体系名选中编队 流血队', self.log) + + def test_misread_list_entry_is_selected(self): + auto = _FakeTeamScreen([self.TOP, ['流血', '震颐', '破裂', '沉论'], self.BOTTOM]) + self.assertTrue(self.select(auto, ('沉沦',))) + self.assertEqual(auto.header, '沉论') + self.assertIn('选中编队 沉沦', self.log) + + def test_current_team_needs_no_switch(self): + auto = _FakeTeamScreen([self.TOP, self.MIDDLE], header='沉论') + self.assertTrue(self.select(auto, ('沉沦',))) + self.assertEqual(auto.clicks, []) + self.assertIn('当前已经是编队 沉沦', self.log) + + def test_current_team_with_suffix_is_confirmed_in_the_list(self): + # 顶栏 "流血队" 只是前缀命中, 不能直接当成目标; 列表里唯一后再点一次 + auto = _FakeTeamScreen([self.TOP, ['流血队', '震颤']], header='流血队') + self.assertTrue(self.select(auto, ('流血',))) + self.assertEqual(len(auto.clicks), 1) + self.assertNotIn('无需切换', self.log) + + def test_exact_team_wins_over_current_suffixed_team(self): + auto = _FakeTeamScreen([self.TOP, ['流血2', '流血', '震颤']], header='流血2') + self.assertTrue(self.select(auto, ('流血',))) + self.assertEqual(auto.header, '流血') + + def test_missing_team_logs_every_screen_and_never_clicks(self): + auto = _FakeTeamScreen([self.TOP, self.MIDDLE, self.BOTTOM]) + self.assertFalse(self.select(auto, ('编队#999',))) + self.assertEqual(auto.clicks, []) + self.assertIn('第 1 屏没有 编队#999; 这一屏的名字: 剧情关卡/斩击/突刺/打击/烧伤', self.log) + self.assertIn('第 3 屏没有 编队#999; 这一屏的名字: 充能/编队#13/编队#14', self.log) + self.assertIn('没找到 编队#999(共 4 轮)', self.log) + + def test_ambiguous_suffixes_are_not_clicked(self): + auto = _FakeTeamScreen([['流血队', '流血2', '斩击']]) + self.assertFalse(self.select(auto, ('流血',))) + self.assertEqual(auto.clicks, []) + self.assertIn('前缀匹配到多条(流血2/流血队), 不点', self.log) + + def test_header_not_changing_is_reported(self): + auto = _FakeTeamScreen([self.TOP, self.MIDDLE], click_changes_header=False) + self.assertFalse(self.select(auto, ('流血',))) + self.assertIn('点了 流血 但顶栏没变(顶栏读到: 剧情关卡)', self.log) + + class _FakeMirror: def __init__(self, team_setting, team_num): self.system = team_setting['system']