P1-5 镜牢选队容忍 OCR 误读与队名后缀

Browse Source
- 队名先归一:去空白、NFKC 全角转半角、改回实测误读(震颐→震颤、沉论→沉沦、编#→编队#)
- 精确匹配优先;否则接受这一屏唯一的「名字+后缀」(流血队、流血(X)),多条不点
- 顶栏确认只认精确,避免把 流血2 当成 流血
- 没命中时日志打印每屏看到的名字,点了没变时打印顶栏读到的文字

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
yws
2026-11-14 06:54:27 +00:00
co-authored by Claude Opus 5.5
parent 4c0038d657
commit e08edda27d
5 changed files with 290 additions and 28 deletions
+183
View File
@@ -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']