镜牢入场前切队 + 选队页守卫;补回归结果与问题需求台账

Browse Source
实机回归发现: 镜牢入场时 AALC 直接点「进入」, 根本不走 select_battle_team,
用的是游戏记住的旧队伍; 「星之恩惠」页满屏星星又会让「选队星级」模板误命中。

- aalc_patches: 点「进入」前若在选队页且顶栏不是目标队, 先按体系名切队(充能优先,
  没有就震颤); 新增选队页守卫(只有出现「恩惠」字样才忽略星级模板); 选队扫描从每轮
  3 次拖动改为 1 次(3 次会整屏跳过, 实测漏掉「充能」)
- tests: 44→45 个用例, 覆盖偏好顺序、星之恩惠判定、守卫行为
- docs: REGRESSION-RESULTS.md(勾选结果), ISSUES.md(问题/需求台账),
  BACKLOG 状态表, HANDOVER 补「拉取后必须重启服务」

单测: 641 passed。实机: 2026-11-15 01:51 入场精确选中「充能」。
This commit is contained in:
Codex Agent
2026-11-15 02:03:27 +08:00
parent 908713b922
commit 599282729c
8 changed files with 497 additions and 36 deletions
+81 -4
View File
@@ -29,6 +29,16 @@ class SystemTeamNamesTest(unittest.TestCase):
self.assertIn('呼吸法', aalc_patches.SYSTEM_TEAM_NAMES['poise']) self.assertIn('呼吸法', aalc_patches.SYSTEM_TEAM_NAMES['poise'])
self.assertIn('呼吸', aalc_patches.SYSTEM_TEAM_NAMES['poise']) self.assertIn('呼吸', aalc_patches.SYSTEM_TEAM_NAMES['poise'])
def test_preferences_point_at_real_systems_and_names(self):
# 2026-11-14 用户指定: 充能优先, 没有就退到震颤
for system, names in aalc_patches.TEAM_PREFERENCES.items():
self.assertIn(system, aalc_patches.SYSTEM_TEAM_NAMES)
self.assertTrue(names, system)
for name in names:
self.assertIsInstance(name, str)
self.assertTrue(name.strip())
self.assertEqual(aalc_patches.TEAM_PREFERENCES['charge'], ('震颤',))
class RegionTest(unittest.TestCase): class RegionTest(unittest.TestCase):
@@ -167,7 +177,7 @@ class PickTeamItemTest(unittest.TestCase):
class _FakeTeamScreen: class _FakeTeamScreen:
"""编队界面: 列表按 3 次下拖翻一屏, 点哪条顶栏就变成哪条。""" """编队界面: 每下拖一次翻一屏(实测一次拖动 ≈ 5~6 行), 点哪条顶栏就变成哪条。"""
def __init__(self, screens, header='剧情关卡', click_changes_header=True): def __init__(self, screens, header='剧情关卡', click_changes_header=True):
self.screens = screens self.screens = screens
@@ -178,7 +188,7 @@ class _FakeTeamScreen:
@property @property
def page(self): def page(self):
return min(self.swipes_down // 3, len(self.screens) - 1) return min(self.swipes_down, len(self.screens) - 1)
def take_screenshot(self): def take_screenshot(self):
return object() return object()
@@ -273,13 +283,25 @@ class SelectTeamByNameTest(unittest.TestCase):
self.assertTrue(self.select(auto, ('流血',))) self.assertTrue(self.select(auto, ('流血',)))
self.assertEqual(auto.header, '流血') self.assertEqual(auto.header, '流血')
def test_name_order_is_priority_not_screen_order(self):
# 首选项「充能」在最后一屏, 次选「震颤」在第二屏 —— 应先翻到充能
auto = _FakeTeamScreen([self.TOP, self.MIDDLE, self.BOTTOM])
self.assertTrue(self.select(auto, ('充能', '震颤')))
self.assertEqual(auto.header, '充能')
def test_falls_back_to_second_name(self):
# 列表里没有「充能」, 第二顺位「震颤」应该被选中
auto = _FakeTeamScreen([self.TOP, ['流血', '震颤', '破裂'], ['编队#13', '编队#14']])
self.assertTrue(self.select(auto, ('充能', '震颤')))
self.assertEqual(auto.header, '震颤')
def test_missing_team_logs_every_screen_and_never_clicks(self): def test_missing_team_logs_every_screen_and_never_clicks(self):
auto = _FakeTeamScreen([self.TOP, self.MIDDLE, self.BOTTOM]) auto = _FakeTeamScreen([self.TOP, self.MIDDLE, self.BOTTOM])
self.assertFalse(self.select(auto, ('编队#999',))) self.assertFalse(self.select(auto, ('编队#999',)))
self.assertEqual(auto.clicks, []) self.assertEqual(auto.clicks, [])
self.assertIn('第 1 屏没有 编队#999; 这一屏的名字: 剧情关卡/斩击/突刺/打击/烧伤', self.log) self.assertIn('第 1 屏没有 编队#999; 这一屏的名字: 剧情关卡/斩击/突刺/打击/烧伤', self.log)
self.assertIn('第 3 屏没有 编队#999; 这一屏的名字: 充能/编队#13/编队#14', self.log) self.assertIn('第 3 屏没有 编队#999; 这一屏的名字: 充能/编队#13/编队#14', self.log)
self.assertIn('没找到 编队#999(共 4 轮)', self.log) self.assertIn('没找到 编队#999(共 6 轮)', self.log)
def test_ambiguous_suffixes_are_not_clicked(self): def test_ambiguous_suffixes_are_not_clicked(self):
auto = _FakeTeamScreen([['流血队', '流血2', '斩击']]) auto = _FakeTeamScreen([['流血队', '流血2', '斩击']])
@@ -296,7 +318,7 @@ class SelectTeamByNameTest(unittest.TestCase):
args, kwargs = self.records.call_args args, kwargs = self.records.call_args
self.assertEqual(args, ('team', None, 'not_found')) self.assertEqual(args, ('team', None, 'not_found'))
self.assertEqual(kwargs['seen'][0], self.TOP) self.assertEqual(kwargs['seen'][0], self.TOP)
self.assertEqual(len(kwargs['seen']), 4) self.assertEqual(len(kwargs['seen']), 6)
def test_header_not_changing_is_reported(self): def test_header_not_changing_is_reported(self):
auto = _FakeTeamScreen([self.TOP, self.MIDDLE], click_changes_header=False) auto = _FakeTeamScreen([self.TOP, self.MIDDLE], click_changes_header=False)
@@ -366,6 +388,13 @@ class InstallSystemTeamSelectionTest(unittest.TestCase):
self.assertEqual(sel.call_args[0][1], ('流血',)) self.assertEqual(sel.call_args[0][1], ('流血',))
self.assertEqual(self.calls, []) # 成功后不再走编号回退 self.assertEqual(self.calls, []) # 成功后不再走编号回退
def test_charge_looks_for_charge_then_tremor(self):
self.install()
self.mirror_mod.Mirror({'system': 'charge'}, 1)
with mock.patch.object(aalc_patches, '_select_team_by_name', return_value=True) as sel:
self.mirror_mod.select_battle_team(1)
self.assertEqual(sel.call_args[0][1], ('充能', '震颤'))
def test_name_search_failure_does_not_fall_back_to_number(self): def test_name_search_failure_does_not_fall_back_to_number(self):
# 这号没有 编队#1, 静默回退到编号会选中错的队, 必须显式失败 # 这号没有 编队#1, 静默回退到编号会选中错的队, 必须显式失败
self.install() self.install()
@@ -394,3 +423,51 @@ class InstallSystemTeamSelectionTest(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
class TeamScreenDetectionTest(unittest.TestCase):
def setUp(self):
engine = SimpleNamespace(ocr=SimpleNamespace(run=lambda screen: screen.read()))
modules = mock.patch.dict(sys.modules, {'module': types.ModuleType('module'), 'module.ocr': engine})
modules.start()
self.addCleanup(modules.stop)
def test_team_screen_detected_by_names(self):
auto = _FakeTeamScreen([['剧情关卡', '斩击', '突刺', '打击', '烧伤']])
self.assertTrue(aalc_patches._looks_like_team_screen(auto))
def test_starlight_screen_is_not_team_screen(self):
# 星之恩惠页: 满屏星星会让「选队星级」模板命中, 但左侧不是队名列表
auto = _FakeTeamScreen([['+', '卫星商店', '可免费进行商店关键词刷新1次', '获得1件1级饰品']],
header='西西弗的星之恩惠')
self.assertFalse(aalc_patches._looks_like_team_screen(auto))
class TeamScreenGuardTest(unittest.TestCase):
def install(self):
auto = mock.Mock()
def fake_find(target, *args, **kwargs):
return (640, 360) if target == aalc_patches.TEAM_SCREEN_STARS else False
auto.find_element = fake_find
auto_mod = types.ModuleType('module.automation')
auto_mod.auto = auto
patcher = mock.patch.dict(sys.modules, {'module': types.ModuleType('module'),
'module.automation': auto_mod})
patcher.start()
self.addCleanup(patcher.stop)
aalc_patches.install_team_screen_guard(log=lambda *_: None)
return auto
def test_stars_ignored_on_starlight_screen(self):
auto = self.install()
with mock.patch.object(aalc_patches, '_is_starlight_screen', return_value=True):
self.assertFalse(auto.find_element(aalc_patches.TEAM_SCREEN_STARS))
def test_stars_kept_on_real_team_screen(self):
auto = self.install()
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.assertFalse(auto.find_element('mirror/other.png'))