复查 V1.6.2 与 11-16~11-22 补丁: 返回按钮 TypeError、事件兜底连点、截图熔断线程

Browse Source
- 返回按钮(I-15): V1.6.2 在首次引导页拿 click_element 的返回值当坐标再点, 它返回 True → TypeError,
  镜牢任务退出。install_back_button_result 只在 `x := auto.click_element(返回)` 这种调用时只找不点,
  由上游点一次; 只看真假的调用照常点; 上游源码里没有这种写法就不装
- 事件兜底(I-16): LCP_EVENT_FALLBACK=1 时每轮都抢先点第 1 项, 上游走不到判定/继续/开始战斗;
  runs 里 1014 条 fallback_first, 73 段同屏连点 10~11 次, 最长 110 次。改成每屏只点一次、与按表共用 5 次上限
- 事件点击点只在这一项自己那行 OCR 字里取(原来整屏找子串, 叙述或别的选项是它的子串时会点错)
- 截图熔断(I-17): 只在任务主线程计数和中止(retry_monitor 线程里抛只会打死那条线程, 两次熔断都记了两条);
  要求连续出错满 30 秒、至少 20 次, 一闪而过的坏帧不再停掉任务
- 卡包: 优选阈值默认 1 与注释/提交说明/实机一致(LCP_THEME_PACK_THRESHOLD=0 不动上游);
  「刷新」OCR 范围按 set_win_size/1440 缩放
- .gitignore 放行 docs/feedback/runs/**/logs/*.log(INDEX 说的过滤日志此前被 *.log 挡掉, 没进仓库)
- README 补 LCP_EVENT_FALLBACK / LCP_THEME_PACK_THRESHOLD; BACKLOG 记 V1.6.2 影响; ISSUES 加 I-15~I-17

单测: 769 passed(新增上游真实 select_battle_team 端到端: 不装补丁 TypeError, 装了点一次)。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
yws
2026-11-22 01:17:07 +00:00
co-authored by Claude Opus 5.5
parent 3982d485c4
commit 885412f0e0
11 changed files with 538 additions and 93 deletions
+18 -1
View File
@@ -242,6 +242,7 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
positions = [(300 + 300 * i, 300) for i in range(len(cards))] positions = [(300 + 300 * i, 300) for i in range(len(cards))]
weights = example_weights('theme_pack_list_cn', *(('theme_pack_list_hard_cn',) if hard else ())) weights = example_weights('theme_pack_list_cn', *(('theme_pack_list_hard_cn',) if hard else ()))
lookups = [] lookups = []
self.refreshes = refreshes = []
def find_language_text(zh, en, crop): def find_language_text(zh, en, crop):
# AALC: 按表的顺序, 第一个(去空格、不分大小写)是卡面文字子串的键 # AALC: 按表的顺序, 第一个(去空格、不分大小写)是卡面文字子串的键
@@ -257,7 +258,7 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
model=None, take_screenshot=lambda: object(), mouse_to_blank=lambda *a, **k: None, model=None, take_screenshot=lambda: object(), mouse_to_blank=lambda *a, **k: None,
find_element=lambda target, **kw: list(positions) if 'theme_pack_features' in target else False, find_element=lambda target, **kw: list(positions) if 'theme_pack_features' in target else False,
find_language_text=find_language_text, mouse_drag_down=mock.Mock(), find_language_text=find_language_text, mouse_drag_down=mock.Mock(),
click_element=lambda *a, **k: False) click_element=lambda target, *a, **k: refreshes.append(target) or True if 'refresh' in target else False)
theme_list = SimpleNamespace(preferred_thresholds=0, get_effective_theme_pack_list=lambda *a: dict(weights)) theme_list = SimpleNamespace(preferred_thresholds=0, get_effective_theme_pack_list=lambda *a: dict(weights))
ns = dict(auto=auto, TextMatchResult=Match, sleep=lambda *a: None, back_init_menu=mock.Mock(), ns = dict(auto=auto, TextMatchResult=Match, sleep=lambda *a: None, back_init_menu=mock.Mock(),
log=logging.getLogger('AALC'), theme_list=theme_list, log=logging.getLogger('AALC'), theme_list=theme_list,
@@ -340,6 +341,22 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
self.assertEqual(picked, '落泪者们') self.assertEqual(picked, '落泪者们')
self.assertEqual(lookups[0], example_weights('theme_pack_list_cn')) self.assertEqual(lookups[0], example_weights('theme_pack_list_cn'))
def test_zero_point_floor_refreshes_first_by_default(self):
# 用户 11-16「卡包均分低就刷新」: 最高 0 分时先刷新, 上游点满 4 次「刷新」后取最高分
picked, _, _ = self.play(self.FLOOR4, 'unknown_system')
self.assertEqual(picked, '落泪者们')
self.assertEqual(len(self.refreshes), 4)
self.assertIn('卡包优选阈值 0 → 1', self.log)
def test_threshold_env_zero_keeps_upstream_threshold(self):
self.play(self.FLOOR4, 'unknown_system', env={ap.THEME_PACK_THRESHOLD_ENV: '0'})
self.assertEqual(self.refreshes, [])
self.assertNotIn('卡包优选阈值', self.log)
def test_system_pack_is_taken_without_refreshing(self):
self.assertEqual(self.play(self.FLOOR4, 'charge')[0], 'WARP快车谋杀案')
self.assertEqual(self.refreshes, [])
def test_rabbit_hole_route_without_a_system(self): def test_rabbit_hole_route_without_a_system(self):
# 兔子洞编队没有体系; 困难模式 AALC 默认「绝望」「号线」都是 -5, 不加分拿 0 分的落泪者们 # 兔子洞编队没有体系; 困难模式 AALC 默认「绝望」「号线」都是 -5, 不加分拿 0 分的落泪者们
route = ap.load_rabbit_hole()['theme_packs'] route = ap.load_rabbit_hole()['theme_packs']