按台账修镜牢: 饰品弹窗兜底、按键扫描码、卡包按体系加分
按 docs/ISSUES.md 处理本机回归后待修/待数据的条目:
- I-06/R-04 开局「获得E.G.O饰品」弹窗死循环: 确认模板连续第 3 次命中起改点
按钮中心(勾号 +76/1440), 连续 20 次还在就记 [ERROR]、抛 TaskAbort 结束任务
(上游 continue 跳过了循环计数)。单测执行上游真实 select_init_ego_gift。
- I-05/R-03 键盘寻路 0 成功: 前台按键改发带扫描码和扩展键标志的 keybd_event,
各模式按住 0.12 秒(上游注释: Unity 6 校验扫描码/扩展键); 连续 3 个节点进不去
就本次任务停用键盘寻路(方案 B)。MCP key 工具前台同样处理。LCP_KEY_HOLD=0 关。
- I-07/R-02 事件表 6 -> 9 条: 蜘蛛巢、归乡路途两段(拿「归途」), 按 wiki.gg 核对结果;
全表按本机装的零协 release 2026111301 重新核对唯一性。
- I-13 复查 5992827: 「进入」先模板确认再 OCR(原来每轮都跑一次整屏 OCR);
选队页重试重新截图; 入场切队失败记 [ERROR] 且本局不再重翻列表。
- R-01/I-08 卡包按体系加分: wiki.gg 122 个卡包(楼层/专属饰品/Featured 分类) +
零协中文名生成 lc_mcp/data/theme_pack_systems.json(scripts/build_theme_pack_systems.py);
灰机 wiki 对云端 403、BWIKI 无卡包条目, 中文社区攻略用 codex CLI 联网检索,
推荐/避开并入表的 community。选卡包时临时加到 AALC 权重上, 按当前难度只看会出现
的卡包; 审计记 system_bonus。LCP_THEME_PACK_SYSTEMS=0 关。
- 文档: ISSUES/BACKLOG/README 更新, 新增 docs/feedback/2026-11-15/REGRESSION.md
(本轮回归清单)和 theme-pack-research.md(检索记录)。
单测 703 个全过(Linux)。实机未验。
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -421,9 +421,6 @@ class InstallSystemTeamSelectionTest(unittest.TestCase):
|
|||||||
self.assertIsNone(self.install())
|
self.assertIsNone(self.install())
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
unittest.main()
|
|
||||||
|
|
||||||
class TeamScreenDetectionTest(unittest.TestCase):
|
class TeamScreenDetectionTest(unittest.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
@@ -471,3 +468,151 @@ class TeamScreenGuardTest(unittest.TestCase):
|
|||||||
with mock.patch.object(aalc_patches, '_is_starlight_screen', return_value=False):
|
with mock.patch.object(aalc_patches, '_is_starlight_screen', return_value=False):
|
||||||
self.assertEqual(auto.find_element(aalc_patches.TEAM_SCREEN_STARS), (640, 360))
|
self.assertEqual(auto.find_element(aalc_patches.TEAM_SCREEN_STARS), (640, 360))
|
||||||
self.assertFalse(auto.find_element('mirror/other.png'))
|
self.assertFalse(auto.find_element('mirror/other.png'))
|
||||||
|
|
||||||
|
|
||||||
|
class _LoadingTeamScreen(_FakeTeamScreen):
|
||||||
|
"""选队页刚加载: 第 loaded_at 张截图之前编队图标和列表都还没出来。"""
|
||||||
|
|
||||||
|
def __init__(self, screens, loaded_at=2, **kwargs):
|
||||||
|
super().__init__(screens, **kwargs)
|
||||||
|
self.loaded_at = loaded_at
|
||||||
|
self.shots = 0
|
||||||
|
|
||||||
|
def take_screenshot(self):
|
||||||
|
self.shots += 1
|
||||||
|
return object()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def loaded(self):
|
||||||
|
return self.shots >= self.loaded_at
|
||||||
|
|
||||||
|
def find_element(self, *args, **kwargs):
|
||||||
|
return self.loaded
|
||||||
|
|
||||||
|
def read(self):
|
||||||
|
if not self.loaded:
|
||||||
|
return SimpleNamespace(txts=(), boxes=[])
|
||||||
|
return super().read()
|
||||||
|
|
||||||
|
|
||||||
|
class SelectTeamScreenWaitTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.lines = []
|
||||||
|
engine = SimpleNamespace(ocr=SimpleNamespace(run=lambda screen: screen.read()))
|
||||||
|
for patcher in (mock.patch.dict(sys.modules, {'module': types.ModuleType('module'), 'module.ocr': engine}),
|
||||||
|
mock.patch.object(aalc_patches.time, 'sleep'),
|
||||||
|
mock.patch.object(aalc_patches.decisions, 'record')):
|
||||||
|
patcher.start()
|
||||||
|
self.addCleanup(patcher.stop)
|
||||||
|
|
||||||
|
def test_waits_for_a_fresh_screenshot_of_the_team_screen(self):
|
||||||
|
# 旧写法对着同一张截图认 3 次, 页面加载慢一点就报"不在编队界面"
|
||||||
|
auto = _LoadingTeamScreen([['剧情关卡', '流血', '震颤']], loaded_at=3)
|
||||||
|
self.assertTrue(aalc_patches._select_team_by_name(auto, ('流血',), log=self.lines.append))
|
||||||
|
self.assertEqual(auto.header, '流血')
|
||||||
|
|
||||||
|
def test_gives_up_when_the_team_screen_never_shows(self):
|
||||||
|
auto = _LoadingTeamScreen([['剧情关卡', '流血']], loaded_at=99)
|
||||||
|
self.assertFalse(aalc_patches._select_team_by_name(auto, ('流血',), log=self.lines.append))
|
||||||
|
self.assertIn('不在编队界面, 跳过按名字选队', '\n'.join(self.lines))
|
||||||
|
self.assertEqual(auto.clicks, [])
|
||||||
|
|
||||||
|
|
||||||
|
class _EnterScreen(_FakeTeamScreen):
|
||||||
|
"""选队页右下角有「进入」; 记下点「进入」时顶栏是哪支队, 以及整屏 OCR 跑了几次。"""
|
||||||
|
|
||||||
|
def __init__(self, screens, enter=True, **kwargs):
|
||||||
|
super().__init__(screens, **kwargs)
|
||||||
|
self.enter = enter
|
||||||
|
self.entered_with = []
|
||||||
|
self.ocr_runs = 0
|
||||||
|
|
||||||
|
def click_element(self, target, *args, click=True, **kwargs):
|
||||||
|
if target != aalc_patches.ENTER_ASSET or not self.enter:
|
||||||
|
return False
|
||||||
|
if not click:
|
||||||
|
return (1100, 650)
|
||||||
|
self.entered_with.append(self.header)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def read(self):
|
||||||
|
self.ocr_runs += 1
|
||||||
|
return super().read()
|
||||||
|
|
||||||
|
|
||||||
|
class EnterSwitchTest(unittest.TestCase):
|
||||||
|
"""镜牢入场时 AALC 直接点「进入」, 不走 select_battle_team; 补丁在点之前切队。"""
|
||||||
|
|
||||||
|
TOP = ['剧情关卡', '斩击', '突刺', '打击', '烧伤']
|
||||||
|
MIDDLE = ['流血', '震颤', '破裂', '沉沦', '呼吸法']
|
||||||
|
|
||||||
|
def install(self, auto, system='bleed'):
|
||||||
|
self.lines = []
|
||||||
|
self.mirror_mod = types.ModuleType('tasks.mirror.mirror')
|
||||||
|
self.mirror_mod.Mirror = type('Mirror', (_FakeMirror,), {})
|
||||||
|
self.mirror_mod.select_battle_team = lambda num: False
|
||||||
|
tasks_pkg, mirror_pkg = types.ModuleType('tasks'), types.ModuleType('tasks.mirror')
|
||||||
|
mirror_pkg.mirror = self.mirror_mod
|
||||||
|
engine = SimpleNamespace(ocr=SimpleNamespace(run=lambda screen: screen.read()))
|
||||||
|
for patcher in (mock.patch.dict(sys.modules, {
|
||||||
|
'tasks': tasks_pkg, 'tasks.mirror': mirror_pkg, 'tasks.mirror.mirror': self.mirror_mod,
|
||||||
|
'module': types.ModuleType('module'), 'module.ocr': engine,
|
||||||
|
'module.automation': SimpleNamespace(auto=auto)}),
|
||||||
|
mock.patch.object(aalc_patches.time, 'sleep'),
|
||||||
|
mock.patch.object(aalc_patches.decisions, 'record')):
|
||||||
|
patcher.start()
|
||||||
|
self.addCleanup(patcher.stop)
|
||||||
|
aalc_patches.install_system_team_selection(log=self.lines.append)
|
||||||
|
self.mirror_mod.Mirror({'system': system}, 1)
|
||||||
|
return auto
|
||||||
|
|
||||||
|
@property
|
||||||
|
def log(self):
|
||||||
|
return '\n'.join(self.lines)
|
||||||
|
|
||||||
|
def test_no_enter_button_means_no_ocr(self):
|
||||||
|
# 主循环每轮都会问一次「进入」; 按钮不在画面上时不该为它跑整屏 OCR
|
||||||
|
auto = self.install(_EnterScreen([self.TOP], enter=False))
|
||||||
|
for _ in range(5):
|
||||||
|
self.assertFalse(auto.click_element(aalc_patches.ENTER_ASSET))
|
||||||
|
self.assertEqual(auto.ocr_runs, 0)
|
||||||
|
|
||||||
|
def test_switches_to_the_system_team_before_entering(self):
|
||||||
|
auto = self.install(_EnterScreen([self.TOP, self.MIDDLE]))
|
||||||
|
self.assertTrue(auto.click_element(aalc_patches.ENTER_ASSET))
|
||||||
|
self.assertEqual(auto.entered_with, ['流血'])
|
||||||
|
self.assertIn('入场前切队伍: 流血', self.log)
|
||||||
|
|
||||||
|
def test_already_on_the_team_just_enters(self):
|
||||||
|
auto = self.install(_EnterScreen([self.TOP, self.MIDDLE], header='流血'))
|
||||||
|
self.assertTrue(auto.click_element(aalc_patches.ENTER_ASSET))
|
||||||
|
self.assertEqual(auto.entered_with, ['流血'])
|
||||||
|
self.assertEqual(auto.clicks, [])
|
||||||
|
self.assertNotIn('入场前切队伍:', self.log)
|
||||||
|
|
||||||
|
def test_failed_switch_is_an_error_and_is_not_retried_this_run(self):
|
||||||
|
auto = self.install(_EnterScreen([self.TOP, ['破裂', '沉沦', '编队#13']]))
|
||||||
|
self.assertTrue(auto.click_element(aalc_patches.ENTER_ASSET))
|
||||||
|
self.assertEqual(auto.entered_with, ['剧情关卡'])
|
||||||
|
self.assertIn('[ERROR] [lc_mcp] 入场前没切到 流血, 本局按游戏当前编队进入', self.log)
|
||||||
|
runs = auto.ocr_runs
|
||||||
|
self.assertTrue(auto.click_element(aalc_patches.ENTER_ASSET)) # 上游再点一次「进入」
|
||||||
|
self.assertEqual(auto.ocr_runs, runs) # 不再从头翻列表
|
||||||
|
self.mirror_mod.Mirror({'system': 'bleed'}, 1) # 下一局重新试
|
||||||
|
auto.click_element(aalc_patches.ENTER_ASSET)
|
||||||
|
self.assertGreater(auto.ocr_runs, runs)
|
||||||
|
|
||||||
|
def test_lookup_without_click_is_passed_through(self):
|
||||||
|
auto = self.install(_EnterScreen([self.TOP, self.MIDDLE]))
|
||||||
|
self.assertEqual(auto.click_element(aalc_patches.ENTER_ASSET, click=False), (1100, 650))
|
||||||
|
self.assertEqual((auto.ocr_runs, auto.entered_with), (0, []))
|
||||||
|
|
||||||
|
def test_other_targets_are_untouched(self):
|
||||||
|
auto = self.install(_EnterScreen([self.TOP]))
|
||||||
|
self.assertFalse(auto.click_element('mirror/road_to_mir/resume_assets.png'))
|
||||||
|
self.assertEqual(auto.ocr_runs, 0)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
|
|||||||
Reference in New Issue
Block a user