From 625fdcd250164446996dc49ea90fa88e1b7f0e4a Mon Sep 17 00:00:00 2001 From: ywsabc2 Date: Thu, 22 Oct 2026 00:55:35 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=A4=8D=E6=A0=B8=E5=8F=91=E7=8E=B0=E7=9A=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A7=E5=88=B6=E4=B8=8E=E7=BB=93=E6=9E=9C=E8=AF=AF?= =?UTF-8?q?=E5=88=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/WATCH.md | 15 ++-- docs/review_20261022.md | 44 ++++++++++ lc_mcp/tasks.py | 10 +-- scripts/auto_cycle.py | 106 +++++++++++++++--------- scripts/convert_modules.py | 40 +++++----- scripts/lc_ui.py | 4 +- scripts/levelup.py | 18 +++-- tests/test_auto_cycle.py | 137 +++++++++++++++++++++++++++++--- tests/test_convert_modules.py | 44 ++++++++-- tests/test_levelup.py | 34 ++++++++ tests/test_stall_no_progress.py | 23 ++++++ 12 files changed, 384 insertions(+), 93 deletions(-) create mode 100644 docs/review_20261022.md diff --git a/README.md b/README.md index 79e47ca..43f2c7b 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ vendor\aalc\.venv\Scripts\python.exe -X utf8 scripts\jev_client.py ⛔ **第 3 道防线曾经整条哑掉**(2026-10-16 发现)。OCR 把标签 `LUNACY` 读成 > `UNACY`(首字母被吃掉),而代码写的是 `'LUNACY' in text` —— `UNACY` 不包含 @@ -178,8 +178,11 @@ Interval : PT4H # 10:03 / 14:03 / 18:03 / 22:03 / 02:03 / 06:03 | 情况 | 结论 | |---|---| | 前后一致 | 没变 | -| 后读数在已知读法集合里 | 判为 OCR 抖动,不算消费 | -| 后读数不在集合里 | 出现没见过的值,值得人工看一眼 | +| 前后读数都在已知读法集合里 | 按已知 OCR 抖动处理,不单凭此告警 | +| 变化涉及已知集合以外的读数 | 需人工核查,包括新余额变回集合内读数的情况 | + +取数时标签和余额来自同一帧;读完 5 帧后取唯一众数,至少出现 2 次,平票则返回未知。 +这能减少偶发误读,不能消除系统性误读。 **守不住的部分就承认守不住,别拿一个会误报的判据充数** —— 误报会让人去查一笔 根本没发生的消费,比"没检测到"更糟。 diff --git a/docs/review_20261022.md b/docs/review_20261022.md new file mode 100644 index 0000000..ec4905a --- /dev/null +++ b/docs/review_20261022.md @@ -0,0 +1,44 @@ +# 2026-10-22 自动运行代码复核 + +上游更新已单独提交为 `4e5d63a`:AALC 子模块从 `b0f4393` 更新到 `e1d1749`。 +本次围绕自动运行、模块合成、人格升级和任务状态进行复核。 + +## 依据与范围 + +- 最近的完整实机归档是 `docs/feedback/2026-10-13/results/`,含 10 份任务日志和 3 份轮次报告。 +- `docs/WATCH.md` 补充了 10 月 16~17 日的 OCR、显示会话和模块轨迹记录。 +- 当前 Linux 环境没有 `~/lc_mcp` 实机运行目录。本次使用仓库归档和离线复现,没有连接或操作 Windows 游戏。 +- 10 月 17 日跨轮模块减少已由用户确认为人工升阶消费,不能据此推断合成丢档。 + +## 已确认与修复 + +| 优先级 | 触发条件与原行为 | 修复与验证 | +|---|---|---| +| P1 | 缺模块弹窗出现时,`auto_cycle.py` 在 AALC 仍运行时点 Cancel;协议拒绝输入,但调用方不检查返回值,仍记为已处理 | 轮询只读识别,连续 3 次出现才停止任务,停止成功后重新识别并发送 Cancel。停止或点击失败不记成功,也不重跑。用真实 `Server` 和假引擎验证互斥顺序 | +| P1 | 升级子脚本返回非零或抛出异常,但 `lc_ui.run()` 丢弃退出码;输出没有 `FAIL` 时会报告“无需升级” | 升级和网格子脚本启用退出码检查;异常写入轮次失败报告,保留 stdout/stderr。测试实际启动一个崩溃子进程 | +| P1 | `levelup.cmd_progress()` 所有详情均打不开、或详情等级读不到时,仍可能退出 0;升级成功但同步失败也退出 0 | 未核实的等级不退回网格猜测;未核实候选和同步失败返回非零,确认全部候选达标才正常跳过 | +| P2 | 狂气读取遇到前两次同值就提前返回;合成脚本还用不同帧的标签和数字配对 | 采完所有帧后取唯一众数,平票返回未知;每次只读取一帧并在其中找标签和数字。刷取脚本同时支持 `UNACY` 和 0~99 的余额 | +| P2 | 合成前是新余额、合成后落入旧 OCR 值集合时,仅凭后值就跳过告警 | 前后都属于已知读法才按已知抖动处理;集合之外的变化提示核查,不直接宣称发生消费 | +| P2 | 合成后模组数小于合成前,末尾分支仍返回成功,合成数量为负 | 下降明确返回失败,数量为 0;报告不再把负数当已合成。重复调用主流程时清除上一轮字段 | +| P2 | 任务完全停止写日志时,文件 mtime 不再增长,“无进展秒数”也被冻结 | 在线判定使用当前时间;离线回放可传入观察时刻。回放真实卡死 daily、健康 daily 和镜牢日志,确认区分正确 | +| P3 | 实机报告指出 Windows Python 3.13 的测试发现命令存在导入问题;值守说明仍混用旧的 OCR 判据 | README 改用 `unittest discover -s tests -t tests`,值守手册同步当前免费页签和 OCR 判据 | + +10 月 13 日领奖日志的 `ModuleNotFoundError: No module named 'config'` 已由此次 AALC +更新中的 `218c6f7` 修复:`tasks/daily/get_prize.py` 使用 `from module.config import cfg`。 +无需在本仓库再加运行时补丁。 + +## 验证与限制 + +测试使用 Python 3.12 / Linux,374 项全部通过(16.813 秒),比更新前增加 22 项。 +覆盖真实协议输入互斥、失败子进程、OCR 帧序列、负合成数量、重复轮次状态,以及归档日志回放。 +`git diff --check` 通过。全套验证命令: + +```sh +python3 -m unittest discover -s tests -t tests +git diff --check +``` + +仍需在 Windows 实机核验新版 AALC 的领奖、镜牢和实际截图行为。多帧投票无法消除稳定的 +OCR 误读;已知读法集合只来自该账号历史观测,不是通用余额验证。狂气消费限制仍依赖 +免费合成页签和 `set_lunacy_to_enkephalin: 0`。720 客户区模板匹配退化的历史证据也仍成立, +没有自动修改游戏配置或分辨率。 diff --git a/lc_mcp/tasks.py b/lc_mcp/tasks.py index 040382e..193fec9 100644 --- a/lc_mcp/tasks.py +++ b/lc_mcp/tasks.py @@ -92,19 +92,17 @@ def last_progress_epoch(path): return last -def log_stalls(path): +def log_stalls(path, now=None): """统计日志尾部的卡死信号, 达到阈值的返回 {名称: 次数}。""" lines = tail(path, ERROR_SCAN_LINES) counts = {name: sum(marker in line for line in lines) for name, marker in STALL_MARKERS.items()} stalls = {name: n for name, n in counts.items() if n >= STALL_THRESHOLD} - # 无进展判据: 用日志自身的最后写入时间当"现在", 避免与调用方时钟不一致 + # 必须随真实时间推进: 进程卡住不再写日志时, mtime 也会冻结。 + # 离线复核历史日志时可显式传入当时的 now。 progress = last_progress_epoch(path) if progress is not None: - try: - idle = os.path.getmtime(path) - progress - except OSError: - idle = 0 + idle = (time.time() if now is None else now) - progress if idle >= STALL_NO_PROGRESS_S: stalls['no_progress'] = int(idle) return stalls diff --git a/scripts/auto_cycle.py b/scripts/auto_cycle.py index eddf772..2f86c10 100644 --- a/scripts/auto_cycle.py +++ b/scripts/auto_cycle.py @@ -13,6 +13,7 @@ import argparse import json import os +import subprocess import time from lc_ui import HERE, PY, click, drag, items, keypress, probe, run @@ -127,31 +128,37 @@ def ensure_team1(): return False -def clear_blocking_modal(): - """清掉挡在 AALC 前面的模态框, 返回清掉的说明或 None。 - - 2026-10-13 实测: Enkephalin Modules 不足时游戏弹出 - "You don't have enough Enkephalin Modules. / Would you like to go assemble some?" - 而 AALC 的 Luxcavation 流程不认这个框 —— 它一直在后面点被挡住的 Enter 按钮, - 每次都要等满 10 分钟被 no_progress 判据救回来。点 Cancel 拒绝去组装, - AALC 就会自己往下走(该关卡过不去, 它会降级试下一关)。 - - 只在轮询里做这件事, 不碰 AALC 自己的识别; 模态框本来就挡住了一切输入, - 点它的 Cancel 不会造成误操作。 - """ +def blocking_module_modal(): + """只读识别缺模组弹窗, 返回 Cancel 中心。AALC 运行期间不发送输入。""" its = items() - txt = ' '.join(i.get('text', '') for i in its).replace(' ', '') - if 'enoughEnkephalinModules' not in txt: + txt = ''.join(''.join(i.get('text', '').split()) for i in its).lower() + if 'enoughenkephalinmodules' not in txt: return None for it in its: if 'cancel' in it.get('text', '').lower(): w = it.get('w') or 0 h = it.get('h') or 0 - click(it['x'] + w / 2.0, it['y'] + h / 2.0) - return 'Enkephalin Modules 不足 -> 点 Cancel' + return it['x'] + w / 2.0, it['y'] + h / 2.0 return None +def clear_blocking_modal(): + """任务停止后重新识别并取消缺模组弹窗; 点击被拒绝时不能报成功。""" + pos = blocking_module_modal() + if pos is None: + return None + result = click(*pos) + if not result.get('ok'): + raise RuntimeError('取消缺模组弹窗失败: %s' % result.get('error', result)) + return 'Enkephalin Modules 不足 -> 已发送 Cancel' + + +def stop_running_task(): + result = probe('stop_task') + if not result.get('ok'): + raise RuntimeError('停止 AALC 任务失败: %s' % result.get('error', result)) + + # 同一轮里连着这么多次看到"模组不足", 就不是偶发了, 是资源真的见底 RESOURCE_OUT_LIMIT = 3 @@ -160,10 +167,13 @@ def poll_task(task, timeout_s, sleep=time.sleep): """轮询到任务结束。返回 (ok, 说明, 是否因卡死被停)。""" t0 = time.time() stalled = 0 - cleared = 0 + resource_polls = 0 while time.time() - t0 < timeout_s: sleep(POLL_S) st = probe('task_status', {'lines': 1}) + if st.get('ok') is False or not st.get('state'): + stop_running_task() + raise RuntimeError('无法读取任务状态: %s' % st.get('error', st)) s = st.get('state') el = int(time.time() - t0) if s != 'running': @@ -173,25 +183,28 @@ def poll_task(task, timeout_s, sleep=time.sleep): return False, '%s: %s' % (s, st['errors'][-1]), False return s == 'succeeded', 'state=%s elapsed=%ds' % (s, el), False try: - msg = clear_blocking_modal() + modal = blocking_module_modal() except Exception as e: # 清道夫不该拖垮轮询 - msg = None - log(' [warn] 清模态框时出错: %s' % e) - if msg: - cleared += 1 - log(' [fix] %s (%d/%d)' % (msg, cleared, RESOURCE_OUT_LIMIT)) - if cleared >= RESOURCE_OUT_LIMIT: + modal = None + log(' [warn] 读取缺模组弹窗时出错: %s' % e) + resource_polls = resource_polls + 1 if modal is not None else 0 + if resource_polls: + log(' 缺模组弹窗连续出现 (%d/%d)' % (resource_polls, RESOURCE_OUT_LIMIT)) + if resource_polls >= RESOURCE_OUT_LIMIT: # 反复缺模组 = 体力/模组真的见底了。继续点下去只是空转到超时, # 浪费掉这一轮的时间(实测每次都烧满 10 分钟)。直接收工, 等下一轮。 - probe('stop_task') + stop_running_task() + msg = clear_blocking_modal() + if msg: + log(' [fix] %s' % msg) return False, 'RESOURCE_OUT', False stalled = stalled + 1 if st.get('stall') else 0 if stalled >= STALL_POLLS: - probe('stop_task') + stop_running_task() return False, '卡死(%s), 已停止任务 elapsed=%ds' % (st['stall'], el), True if el % 600 < POLL_S: log(' ...%s running %ds' % (task, el)) - probe('stop_task') + stop_running_task() return False, '超时 %ds' % timeout_s, False @@ -213,7 +226,7 @@ def run_aalc(task, params, timeout_s, retries=STALL_RETRIES, sleep=time.sleep): def report_grid(): - out = run([PY, '-X', 'utf8', LEVELUP, 'list']) + out = run([PY, '-X', 'utf8', LEVELUP, 'list'], check=True) return out.strip() @@ -228,35 +241,36 @@ def read_lunacy(reads=5, pause=1.0): 2. **同一个画面上数字本身就会抖**: 放大 6 倍肉眼确认余额是 6388, 而 OCR 在 同一画面连读 5 次得到 6388 四次、8859 一次。8859 被当成基线后, 之后正确 的 6388 反而被判成"已消耗"并中止整轮 —— 一次误读就能造成一次误报。 - 所以取众数(至少出现 2 次才采信), 而不是"最后读到什么就是什么"。 + 所以读完所有帧再取唯一众数(至少出现 2 次才采信), 平票返回 None。 曾经试过"只在主界面取数", 但那样几乎总是读不到(轮次开始/结束时常停在副本、 - 网格、结算页), 守卫直接跳过 —— 防线等于没有。众数投票已经能压住误读, - 覆盖率更重要。 + 网格、结算页), 守卫直接跳过。多帧投票只能减少偶发误读, 无法证明消费。 """ votes = {} for attempt in range(reads): its = items() lab = None for it in its: - if 'LUNACY' in it.get('text', '').upper(): + if 'NACY' in it.get('text', '').upper(): lab = it break if lab: best = None for it in its: t = it.get('text', '').strip() - if t.isdigit() and len(t) >= 3: + if t.isdigit(): dy = it.get('y', 0) - lab.get('y', 0) dx = abs(it.get('x', 0) - lab.get('x', 0)) if 0 < dy < 70 and dx < 130: best = int(t) if best is not None: votes[best] = votes.get(best, 0) + 1 - if votes[best] >= 2: - return best if attempt < reads - 1: time.sleep(pause) + ranked = sorted(votes, key=votes.get, reverse=True) + if ranked and votes[ranked[0]] >= 2: + if len(ranked) == 1 or votes[ranked[0]] > votes[ranked[1]]: + return ranked[0] return None @@ -279,7 +293,7 @@ def lunacy_guard(): f.write(str(cur)) return True, '记录狂气基线 %d' % cur if cur < base: - return False, '狂气从 %d 降到 %d —— 已消耗, 立即停止' % (base, cur) + return False, '狂气读数从 %d 降到 %d, 需人工核查(OCR 也可能误读), 本轮暂停' % (base, cur) if cur > base: with open(LUNACY_BASELINE, 'w', encoding='utf-8') as f: f.write(str(cur)) @@ -316,9 +330,23 @@ def main(argv=None): json.dump(report, f, ensure_ascii=False, indent=2) return code + try: + return run_cycle(args, step, finish) + except (OSError, RuntimeError, subprocess.SubprocessError) as e: + if isinstance(e, subprocess.CalledProcessError): + output = (e.stdout or '') + (e.stderr or '') + for line in output.splitlines(): + log(' ' + line) + step('执行异常', False, '%s: %s' % (type(e).__name__, e)) + return finish(1, '本轮失败: 执行异常') + finally: + _log_file = None + + +def run_cycle(args, step, finish): log('=== 一轮开始 ===') if not step('狂气校验', *lunacy_guard()): - return finish(1, '中止: 狂气被消耗, 按用户要求不得使用') + return finish(1, '中止: 狂气读数下降, 需人工核查') # 先把预设列表拉回顶部并选中 TEAMS #1——AALC 只朝列表下方找, 停在底部会找不到 if not ensure_team1(): @@ -344,7 +372,7 @@ def main(argv=None): # AALC 任务结束后在主界面, 这里才是能读到 LUNACY 的时机 time.sleep(8) if not step('狂气校验(刷后)', *lunacy_guard()): - return finish(1, '中止: 狂气被消耗, 按用户要求不得使用') + return finish(1, '中止: 狂气读数下降, 需人工核查') if not goto_identities(): # 镜牢超时被强杀时游戏还停在副本里, 这时进不去网格是正常的, 不是缺陷。 @@ -358,7 +386,7 @@ def main(argv=None): log('对队内低于 Lv.%d 的人格升级 + 同步' % args.target) # 用 progress 而非 weakest: 网格 OCR 会把 LV14 读成 Lv.1, # progress 会逐个打开详情页以真实等级判断目标。 - out = run([PY, '-X', 'utf8', LEVELUP, 'progress', str(args.target), '--uptie']) + out = run([PY, '-X', 'utf8', LEVELUP, 'progress', str(args.target), '--uptie'], check=True) lines = out.strip().splitlines() for line in lines: log(' ' + line) diff --git a/scripts/convert_modules.py b/scripts/convert_modules.py index ad6a545..cb03a5a 100644 --- a/scripts/convert_modules.py +++ b/scripts/convert_modules.py @@ -19,7 +19,7 @@ 1. **绝不消费狂气**。Use Lunacy 页签的坐标 USE_LUNACY_TAB 在代码里只用于 "确认自己没点到它", 任何点击路径都不会碰它。 2. **不打任何关卡**。全程只碰底栏模组图标和合成面板。 - 3. 合成前后各读一次狂气, 不一致就报错退出(宁可不合成, 也不冒险)。 + 3. 记录合成前后狂气读数; 已知 OCR 抖动以外的变化需要人工核查。 """ import argparse import json @@ -243,7 +243,7 @@ def panel_open(txt): LABEL_KEY = 'NACY' # 见下: LUNACY 的首字母常被 OCR 吃掉, 只认后半段 -def find_lunacy_label(): +def find_lunacy_label(its=None): """找狂气标签所在的那个 OCR 元素。 ⛔ 实测坑(2026-10-16 11:11): OCR 把 "LUNACY" 读成了 **"UNACY"** —— 首字母 L @@ -254,7 +254,8 @@ def find_lunacy_label(): 改成认后半段 "NACY": LUNACY / UNACY / 甚至 NACY 都能命中, 而这个词根 在游戏界面里不会出现在别处。 """ - its = items() + if its is None: + its = items() for it in its: if LABEL_KEY in it.get('text', '').upper(): return it @@ -272,30 +273,30 @@ def read_lunacy(reads=5, pause=1.0): 两个实测坑: 1. 标签首字母会被 OCR 吃掉(LUNACY -> UNACY), 所以不能整词匹配, 见 find_lunacy_label。 - 2. 数字是像素风艺术字, OCR 很容易把 6 认成 9、3 认成 8 —— 实测同一个画面上 - 真实 6636 会被读成 9699、真实 6388 被读成 8859。所以取众数, 并且合成前后 - 各读一次做**相对**比对(同一画面同一字体, 误读方式一致), 这样即使绝对值 - 读错, 也能发现"数字变了"。 + 2. 读完所有帧再取唯一众数(至少出现两次), 平票返回 None。标签和数字必须来自 + 同一帧。OCR 的系统性误读仍可能存在, 前后不同不能直接证明消费。 """ votes = {} for i in range(reads): its = items() - lab = find_lunacy_label() + lab = find_lunacy_label(its) if lab: best = None for it in its: t = it.get('text', '').strip() - if t.isdigit() and len(t) >= 3: + if t.isdigit(): dy = it.get('y', 0) - lab.get('y', 0) dx = abs(it.get('x', 0) - lab.get('x', 0)) if 0 < dy < 70 and dx < 130: best = int(t) if best is not None: votes[best] = votes.get(best, 0) + 1 - if votes[best] >= 2: - return best if i < reads - 1: time.sleep(pause) + ranked = sorted(votes, key=votes.get, reverse=True) + if ranked and votes[ranked[0]] >= 2: + if len(ranked) == 1 or votes[ranked[0]] > votes[ranked[1]]: + return ranked[0] return None @@ -307,8 +308,8 @@ def read_lunacy(reads=5, pause=1.0): # 只点了模组图标和面板内的 » / 确认, 根本没碰 Use Lunacy 页签, 没有任何消费)。 # # 能站得住的判断只有两种: -# * 后读数落在"已知读法"集合里 -> 视为没变(可能只是换了个误读法) -# * 后读数不在集合里 -> 出现了从没见过的值, 值得人工看一眼 +# * 前后读数都落在"已知读法"集合里 -> 可能只是换了个误读法 +# * 变化涉及集合以外的读数 -> 需要人工核查 # 真正的防线是结构性的(只点 Modules 页签, 且 Use Lunacy 坐标被测试盯着), # 这里只是补一层"数字有没有变成陌生值"的旁证。 LUNACY_KNOWN_READINGS = (6636, 9699, 6388, 8859) @@ -320,11 +321,11 @@ def lunacy_verdict(before, after): return False, '读数不完整(%s -> %s), 本次未做比对' % (before, after) if before == after: return False, '前后读数一致 %s' % after - if after in LUNACY_KNOWN_READINGS: - return False, ('前后读法不同(%s -> %s), 但 %s 是已知读法之一, 判为 OCR 抖动, ' - '不算消费' % (before, after, after)) - return True, ('读数 %s -> %s, 而 %s 不在已知读法 %s 里, 需人工核查' - % (before, after, after, list(LUNACY_KNOWN_READINGS))) + if before in LUNACY_KNOWN_READINGS and after in LUNACY_KNOWN_READINGS: + return False, ('前后均为已知读法(%s -> %s), 可能为 OCR 抖动, 不单凭此判定消费' + % (before, after)) + return True, ('读数 %s -> %s, 前后至少一项不在已知读法 %s 里, 需人工核查' + % (before, after, list(LUNACY_KNOWN_READINGS))) def read_owned(retries=3, pause=2.0): @@ -638,6 +639,8 @@ def _convert_attempt(): after = read_owned() if after is None: return False, '合成后读不到模组数, 无法确认结果(合成前为 %d)' % before, 0 + if after < before: + return False, '模组读数下降(%d -> %d), 无法确认合成结果' % (before, after), 0 if after == before: # 走到这里时调用方已经确认体力 >= 20, 所以"体力不足"不是可能的原因, # 写进去只会把排查方向带偏。真实原因只有这两种。 @@ -665,6 +668,7 @@ def main(argv=None): args = ap.parse_args(argv) t_start = time.time() + _result.clear() _result.update({'started': time.strftime('%Y-%m-%d %H:%M:%S'), 'steps': []}) def done(code, why): diff --git a/scripts/lc_ui.py b/scripts/lc_ui.py index 393a688..12d0fff 100644 --- a/scripts/lc_ui.py +++ b/scripts/lc_ui.py @@ -33,9 +33,9 @@ BASE_W, BASE_H = 1600, 900 _scale = None -def run(cmd): +def run(cmd, *, check=False): r = subprocess.run(cmd, capture_output=True, text=True, - encoding='utf-8', errors='replace', **NO_WINDOW) + encoding='utf-8', errors='replace', check=check, **NO_WINDOW) return (r.stdout or '') + (r.stderr or '') diff --git a/scripts/levelup.py b/scripts/levelup.py index a2c8498..77f554d 100644 --- a/scripts/levelup.py +++ b/scripts/levelup.py @@ -411,6 +411,7 @@ def cmd_progress(target=34, uptie=True, max_try=6): if not team: print('未找到队内(SELECTED)人格') return 1 + unreadable = 0 for ci, ri, cx, ry, ocr_lvl, sel, nm in team[:max_try]: print('--- 候选 col=%d row=%d (网格读作 Lv.%s %s)' % (ci, ri, ocr_lvl, nm)) # 长按前先清残留弹窗: 一张卡没关干净, 后面每张都会被挡住 @@ -422,13 +423,16 @@ def cmd_progress(target=34, uptie=True, max_try=6): txt = screen_text(items) if not detail_page_open(txt): print(' 长按未打开详情, 跳过') + unreadable += 1 continue true_lvl, true_name, _ = read_detail(hint=ocr_lvl) print(' 详情页: %s 真实等级=%s' % (true_name, true_lvl)) if true_lvl is None: - # 详情页读不到时退回网格值——网格会误读, 但总比跳过整张卡好 - print(' 详情页读不到等级, 退回网格值 Lv.%s' % ocr_lvl) - true_lvl = ocr_lvl + print(' 详情页读不到等级, 无法确认是否需要升级, 跳过') + unreadable += 1 + click(*BACK) + time.sleep(2.5) + continue if true_lvl >= target: print(' 已达目标 Lv.%d, 跳过' % target) click(*BACK) @@ -436,6 +440,7 @@ def cmd_progress(target=34, uptie=True, max_try=6): continue ok, desc = do_level_up(hint=true_lvl) print(' 升级: %s (%s)' % ('OK' if ok else ('SKIP' if ok is None else 'FAIL'), desc)) + ok2 = True if uptie: ok2, desc2 = do_uptie() print(' 同步: %s (%s)' % ('OK' if ok2 else 'FAIL', desc2)) @@ -446,8 +451,11 @@ def cmd_progress(target=34, uptie=True, max_try=6): if not ('IDENTITIES' in txt and 'Facades' in txt): click(*BACK) time.sleep(2.5) - return 0 if ok else 1 - print('前 %d 个候选都不需要升级或无法读取' % max_try) + return 0 if ok and ok2 else 1 + if unreadable: + print('FAIL: %d 个候选未能核实详情等级, 不能判定为无需升级' % unreadable) + return 1 + print('已核实的 %d 个候选均达到目标等级, 无需升级' % len(team[:max_try])) return 0 diff --git a/tests/test_auto_cycle.py b/tests/test_auto_cycle.py index 486da80..c993e20 100644 --- a/tests/test_auto_cycle.py +++ b/tests/test_auto_cycle.py @@ -1,5 +1,7 @@ from pathlib import Path +import json import sys +import tempfile import unittest from unittest import mock @@ -54,6 +56,7 @@ class RunAalcTest(unittest.TestCase): def run_aalc(self, mcp, **kw): with mock.patch.object(auto_cycle, 'probe', mcp.probe), \ + mock.patch.object(auto_cycle, 'blocking_module_modal', return_value=None), \ mock.patch.object(auto_cycle, 'log', lambda m: None): return auto_cycle.run_aalc('daily', {}, 3600, sleep=lambda s: None, **kw) @@ -62,9 +65,12 @@ class RunAalcTest(unittest.TestCase): clock = FakeTime(step) patches = [mock.patch.object(auto_cycle, 'probe', mcp.probe), mock.patch.object(auto_cycle, 'log', lambda m: None), - mock.patch.object(auto_cycle.time, 'time', clock.time)] + mock.patch.object(auto_cycle.time, 'time', clock.time), + mock.patch.object(auto_cycle, 'clear_blocking_modal', return_value='已发送 Cancel')] if clear is not None: - patches.append(mock.patch.object(auto_cycle, 'clear_blocking_modal', clear)) + patches.append(mock.patch.object(auto_cycle, 'blocking_module_modal', clear)) + else: + patches.append(mock.patch.object(auto_cycle, 'blocking_module_modal', return_value=None)) for p in patches: p.start() try: @@ -108,11 +114,11 @@ class RunAalcTest(unittest.TestCase): self.assertFalse(ok) self.assertEqual(info, 'RESOURCE_OUT') self.assertFalse(stalled) - # 只清了 RESOURCE_OUT_LIMIT 次就停, 而不是一路点到超时 + # 连续观察到 RESOURCE_OUT_LIMIT 次就停, 不在任务运行时点击 self.assertIn('stop_task', self.tools(mcp)) def test_occasional_modal_does_not_end_the_task(self): - """偶发一次模态框不该收工 —— 点掉继续跑才对。""" + """偶发一次模态框不该收工, 继续观察任务。""" seq = ['x'] mcp = FakeMcp() mcp.current = [RUNNING] @@ -122,6 +128,33 @@ class RunAalcTest(unittest.TestCase): # 跑到超时收工, 而不是被当成资源耗尽 self.assertIn('超时', info) + def test_separate_shortage_sightings_are_not_consecutive(self): + seq = iter(['x', None, 'x', None, 'x', None]) + mcp = FakeMcp() + mcp.current = [RUNNING] * 6 + [DONE] + ok, info, _ = self.poll(mcp, 3600, clear=lambda: next(seq)) + self.assertTrue(ok, info) + self.assertNotIn('stop_task', self.tools(mcp)) + + def test_failed_stop_prevents_retry(self): + mcp = FakeMcp([STALL, STALL], [DONE]) + original = mcp.probe + + def probe(tool, args=None): + result = original(tool, args) + return {'ok': False, 'error': '进程未退出'} if tool == 'stop_task' else result + + mcp.probe = probe + with self.assertRaisesRegex(RuntimeError, '停止 AALC 任务失败'): + self.run_aalc(mcp) + self.assertEqual(self.tools(mcp), ['run_task', 'stop_task']) + + def test_status_error_stops_the_task_before_reporting_failure(self): + mcp = FakeMcp([{'ok': False, 'error': '连接中断'}]) + with self.assertRaisesRegex(RuntimeError, '无法读取任务状态'): + self.run_aalc(mcp) + self.assertEqual(self.tools(mcp), ['run_task', 'stop_task']) + def test_preflight_failure_is_not_retried(self): failed = {'state': 'failed', 'exit_code': 3, 'errors': ['[ERROR] [lc_mcp] preflight: 队伍 1 的 sinner_order 没有罪人']} @@ -177,9 +210,8 @@ class BlockingModalTest(unittest.TestCase): 2026-10-13 实测: 模组不足时游戏弹 "You don't have enough Enkephalin Modules. / Would you like to go assemble some?" - AALC 的 Luxcavation 流程不认它, 一直在后面点被挡住的 Enter 按钮, 每次卡满 - 10 分钟才被 no_progress 判据救回来。清道夫点 Cancel 之后 AALC 就能继续降级 - 试下一关。 + AALC 的 Luxcavation 流程不认它, 一直在后面点被挡住的 Enter 按钮。 + 连续观察到缺资源后先停止任务, 再重新识别并点 Cancel。 """ MODAL = [{'text': "You don't have enough Enkephalin Modules.", 'x': 554, 'y': 404, 'w': 460, 'h': 24}, @@ -190,7 +222,8 @@ class BlockingModalTest(unittest.TestCase): def test_clicks_cancel_centre(self): clicked = [] with mock.patch.object(auto_cycle, 'items', lambda: list(self.MODAL)), \ - mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))): + mock.patch.object(auto_cycle, 'click', + lambda x, y: (clicked.append((x, y)) or {'ok': True})): msg = auto_cycle.clear_blocking_modal() self.assertIn('Cancel', msg) # 点的是识别框中心, 不是左上角 —— 实测点左上角常常落空 @@ -201,7 +234,8 @@ class BlockingModalTest(unittest.TestCase): grid = [{'text': 'TEAMS#1', 'x': 100, 'y': 300}, {'text': 'IDENTITIES', 'x': 200, 'y': 300}] with mock.patch.object(auto_cycle, 'items', lambda: grid), \ - mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))): + mock.patch.object(auto_cycle, 'click', + lambda x, y: (clicked.append((x, y)) or {'ok': True})): self.assertIsNone(auto_cycle.clear_blocking_modal()) self.assertEqual(clicked, []) @@ -211,13 +245,77 @@ class BlockingModalTest(unittest.TestCase): {'text': 'Cancel', 'x': 30, 'y': 40, 'w': 10, 'h': 10}] clicked = [] with mock.patch.object(auto_cycle, 'items', lambda: modal), \ - mock.patch.object(auto_cycle, 'click', lambda x, y: clicked.append((x, y))): + mock.patch.object(auto_cycle, 'click', + lambda x, y: (clicked.append((x, y)) or {'ok': True})): self.assertIsNotNone(auto_cycle.clear_blocking_modal()) self.assertEqual(clicked, [(35, 45)]) + def test_rejected_click_is_not_reported_as_cleared(self): + with mock.patch.object(auto_cycle, 'items', return_value=self.MODAL), \ + mock.patch.object(auto_cycle, 'click', return_value={'ok': False, 'error': '先 stop_task'}): + with self.assertRaisesRegex(RuntimeError, '先 stop_task'): + auto_cycle.clear_blocking_modal() + + def test_real_protocol_receives_cancel_only_after_task_stops(self): + # 使用真实 Server 的输入互斥逻辑, 避免假 click 掩盖“运行中点击被拒绝”。 + from lc_mcp.fake_engine import FakeEngine + from lc_mcp.protocol import Server + runner = mock.Mock() + runner.info = {'task': 'daily'} + runner.running.return_value = True + runner.status.return_value = {'ok': True, 'state': 'running'} + + def stop(): + runner.running.return_value = False + return {'ok': True, 'state': 'stopped'} + + runner.stop.side_effect = stop + engine = FakeEngine(frames=[self.MODAL]) + server = Server(engine, runner) + click_states = [] + + def click(x, y): + click_states.append(runner.running()) + return server.call_tool('click', {'x': x, 'y': y}) + + with mock.patch.object(auto_cycle, 'probe', lambda tool, args=None: server.call_tool(tool, args or {})), \ + mock.patch.object(auto_cycle, 'items', lambda: server.call_tool('get_state', {})['items']), \ + mock.patch.object(auto_cycle, 'click', click), \ + mock.patch.object(auto_cycle, 'log'), \ + mock.patch.object(auto_cycle.time, 'time', FakeTime().time): + ok, info, stalled = auto_cycle.poll_task('daily', 3600, sleep=lambda s: None) + self.assertEqual((ok, info, stalled), (False, 'RESOURCE_OUT', False)) + self.assertEqual(click_states, [False]) + self.assertEqual(engine.actions, [('click', 637, 612, 1)]) + runner.stop.assert_called_once() + + +class CycleReportTest(unittest.TestCase): + + def test_crashed_levelup_is_a_failed_report_with_diagnostics(self): + with tempfile.TemporaryDirectory() as tmp: + script = Path(tmp, 'broken_levelup.py') + script.write_text('raise RuntimeError("levelup crashed")\n', encoding='utf-8') + with mock.patch.multiple(auto_cycle, PY=sys.executable, LEVELUP=str(script)), \ + mock.patch.object(auto_cycle, 'lunacy_guard', return_value=(True, '读数一致')), \ + mock.patch.object(auto_cycle, 'ensure_team1', return_value=True), \ + mock.patch.object(auto_cycle, 'run_aalc', return_value=(True, '已完成')), \ + mock.patch.object(auto_cycle, 'goto_identities', return_value=True), \ + mock.patch.object(auto_cycle, 'report_grid', return_value='grid'), \ + mock.patch.object(auto_cycle.time, 'sleep'), \ + mock.patch('builtins.print'): + code = auto_cycle.main(['--report-dir', tmp]) + report = json.loads(next(Path(tmp).glob('cycle_*.json')).read_text(encoding='utf-8')) + output = next(Path(tmp).glob('cycle_*.log')).read_text(encoding='utf-8') + self.assertEqual(code, 1) + self.assertFalse(report['ok']) + self.assertIn('levelup crashed', output) + self.assertNotIn('无需升级', output) + self.assertIsNone(auto_cycle._log_file) + class LunacyReadTest(unittest.TestCase): - """狂气校验是"不许消费"的唯一防线, 读不到就是没校验, 所以要重试。 + """狂气 OCR 是辅助核查, 读不到就是没校验, 所以要重试。 2026-10-13 实测更麻烦的一种情况: 同一个画面上 OCR 会给出**两个不同的值** (放大 6 倍肉眼确认余额是 6388, 而连读 5 次得到 6388 四次、8859 一次)。 @@ -250,6 +348,23 @@ class LunacyReadTest(unittest.TestCase): mock.patch.object(auto_cycle.time, 'sleep', lambda s: None): self.assertEqual(auto_cycle.read_lunacy(), 6388) + def test_first_pair_does_not_override_later_majority(self): + with mock.patch.object(auto_cycle, 'items', self._frames([8859, 8859, 6388, 6388, 6388])), \ + mock.patch.object(auto_cycle.time, 'sleep'): + self.assertEqual(auto_cycle.read_lunacy(), 6388) + + def test_tied_readings_are_unknown(self): + with mock.patch.object(auto_cycle, 'items', self._frames([8859, 8859, 6388, 6388, None])), \ + mock.patch.object(auto_cycle.time, 'sleep'): + self.assertIsNone(auto_cycle.read_lunacy()) + + def test_truncated_label_and_low_balance_are_read(self): + frame = [{'text': 'UNACY', 'x': 671, 'y': 795}, + {'text': '0', 'x': 664, 'y': 823}] + with mock.patch.object(auto_cycle, 'items', return_value=frame), \ + mock.patch.object(auto_cycle.time, 'sleep'): + self.assertEqual(auto_cycle.read_lunacy(), 0) + def test_retries_until_the_label_shows_up(self): with mock.patch.object(auto_cycle, 'items', self._frames([None, None, 5864, 5864, 5864])), \ mock.patch.object(auto_cycle.time, 'sleep', lambda s: None): diff --git a/tests/test_convert_modules.py b/tests/test_convert_modules.py index fe72f78..e78a05c 100644 --- a/tests/test_convert_modules.py +++ b/tests/test_convert_modules.py @@ -131,11 +131,7 @@ class ReadEnkephalinTest(QuietLogMixin, unittest.TestCase): class LunacyReadTest(QuietLogMixin, unittest.TestCase): - """狂气数字是像素艺术字, OCR 会误读(实测 6636 读成 9699)。 - - 所以脚本不对绝对值下结论, 只做**前后相对比对**: 同一个画面同一套字体, - 误读方式一致, 两次读数不同就说明数字真的变了。 - """ + """狂气数字会有多种 OCR 误读; 同帧取数、多帧投票仍只提供核查线索。""" def _frames(self, values): seq = list(values) @@ -156,6 +152,25 @@ class LunacyReadTest(QuietLogMixin, unittest.TestCase): mock.patch.object(cm.time, 'sleep', lambda s: None): self.assertIsNone(cm.read_lunacy()) + def test_first_pair_does_not_override_later_majority(self): + with mock.patch.object(cm, 'items', self._frames([8859, 8859, 6388, 6388, 6388])), \ + mock.patch.object(cm.time, 'sleep'): + self.assertEqual(cm.read_lunacy(), 6388) + + def test_label_and_balance_must_come_from_the_same_frame(self): + # 数字和标签从未同时出现, 跨帧拼接会伪造一个有效读数。 + frames = [[{'text': '9999', 'x': 664, 'y': 823}], + [{'text': 'LUNACY', 'x': 670, 'y': 795}]] * 5 + with mock.patch.object(cm, 'items', side_effect=frames) as sample, \ + mock.patch.object(cm.time, 'sleep'): + self.assertIsNone(cm.read_lunacy()) + self.assertEqual(sample.call_count, 5) + + def test_tied_readings_are_unknown(self): + with mock.patch.object(cm, 'items', self._frames([8859, 8859, 6388, 6388, 1000])), \ + mock.patch.object(cm.time, 'sleep'): + self.assertIsNone(cm.read_lunacy()) + class EnkephalinGateTest(QuietLogMixin, unittest.TestCase): """体力读数是"要不要合成"的闸门, 读不到时不能贸然去点合成。 @@ -305,6 +320,10 @@ class LunacyVerdictTest(unittest.TestCase): suspicious2, _ = cm.lunacy_verdict(4000, 3000) self.assertTrue(suspicious2) + def test_new_balance_must_not_be_silently_folded_into_old_readings(self): + suspicious, _ = cm.lunacy_verdict(10000, 6636) + self.assertTrue(suspicious) + class LunacyFalseAlarmTest(QuietLogMixin, unittest.TestCase): """整轮跑下来: 已知读法抖动不该让这一轮 FAIL。""" @@ -388,6 +407,13 @@ class ConvertAttemptVerifiedTest(QuietLogMixin, unittest.TestCase): self.assertFalse(ok) self.assertIn('没变', info) + def test_decrease_is_not_a_successful_negative_conversion(self): + seq = [35] + ok, info, got = self._attempt(lambda: seq.pop(0) if seq else 33) + self.assertFalse(ok) + self.assertEqual(got, 0) + self.assertIn('读数下降', info) + def test_unchanged_message_does_not_blame_enkephalin(self): """走到这一步时体力 >= 20 已经确认过, 所以"体力不足"不可能是原因。 @@ -601,6 +627,14 @@ class CliRoutingTest(QuietLogMixin, unittest.TestCase): self.assertEqual(code, 0) self.assertEqual(closed, [], '--keep-game 时不该关游戏') + def test_a_skipped_run_does_not_reuse_previous_lunacy_result(self): + cm._result.update(lunacy_after=9699, lunacy_checked=True, converted=True) + code, _, _ = self._main([]) # 体力不足, 不合成也不做后读。 + self.assertEqual(code, 0) + self.assertNotIn('lunacy_after', cm._result) + self.assertNotIn('lunacy_checked', cm._result) + self.assertFalse(cm._result['converted']) + def test_report_is_written_with_the_expected_fields(self): """报告字段要齐全 —— 值守就靠 lunacy_* 和 converted 那几项下结论。""" import json diff --git a/tests/test_levelup.py b/tests/test_levelup.py index 42175fe..875aca4 100644 --- a/tests/test_levelup.py +++ b/tests/test_levelup.py @@ -46,6 +46,40 @@ class ScaleTest(unittest.TestCase): self.assertEqual(calls, [('get_state', None), ('click', {'x': 120, 'y': 120, 'times': 1})]) +class ProgressResultTest(unittest.TestCase): + + def run_progress(self, detail=True, level=40, uptie=True): + card = (0, 0, 300, 400, 40, True, 'identity') + with mock.patch.object(levelup, 'state', return_value={'items': []}), \ + mock.patch.object(levelup, 'scan_grid', return_value=[card]), \ + mock.patch.object(levelup, 'dismiss_modal', return_value=True), \ + mock.patch.object(levelup, 'long_press'), \ + mock.patch.object(levelup, 'click'), \ + mock.patch.object(levelup, 'detail_page_open', return_value=detail), \ + mock.patch.object(levelup, 'read_detail', return_value=(level, 'identity', None)), \ + mock.patch.object(levelup, 'do_level_up', return_value=(True, '等级增加')) as upgrade, \ + mock.patch.object(levelup, 'do_uptie', return_value=(uptie, '同步结果')), \ + mock.patch.object(levelup.time, 'sleep'), \ + mock.patch('builtins.print'): + code = levelup.cmd_progress(target=34) + return code, upgrade.call_count + + def test_unopened_details_are_not_a_successful_noop(self): + self.assertEqual(self.run_progress(detail=False), (1, 0)) + + def test_unreadable_details_do_not_trust_grid_level(self): + self.assertEqual(self.run_progress(level=None), (1, 0)) + + def test_verified_max_level_is_a_successful_noop(self): + self.assertEqual(self.run_progress(level=40), (0, 0)) + + def test_failed_uptie_is_a_failed_command(self): + self.assertEqual(self.run_progress(level=30, uptie=False), (1, 1)) + + def test_successful_upgrade_and_uptie(self): + self.assertEqual(self.run_progress(level=30), (0, 1)) + + class Screens: """按顺序返回预设画面的假 state(), 记录点击。""" diff --git a/tests/test_stall_no_progress.py b/tests/test_stall_no_progress.py index b040fa2..8b27046 100644 --- a/tests/test_stall_no_progress.py +++ b/tests/test_stall_no_progress.py @@ -9,9 +9,11 @@ AALC 把镜牢入口误认成经验本界面, 把 home/luxcavation_assets.png 修法是加一条与日志内容无关的判据: 里程碑(开始执行/结束执行)多久没前进。 """ import os +import gzip import tempfile import time import unittest +from pathlib import Path from lc_mcp import tasks @@ -61,6 +63,13 @@ class NoProgressStall(unittest.TestCase): ]) self.assertNotIn('no_progress', tasks.log_stalls(p)) + def test_frozen_log_does_not_freeze_stall_clock(self): + old = tasks.STALL_NO_PROGRESS_S + 120 + p = self._make(['[INFO] %s [AALC] 开始执行 一次纽本' % _stamp(old)]) + frozen = time.time() - old + os.utime(p, (frozen, frozen)) + self.assertIn('no_progress', tasks.log_stalls(p)) + def test_no_milestone_at_all_is_not_reported(self): """一条里程碑都没有时不下结论(可能只是还没走到), 避免误杀启动阶段。""" p = self._make([ @@ -86,6 +95,20 @@ class NoProgressStall(unittest.TestCase): self.assertGreater(os.path.getsize(p), 64 * 1024) # 确定超出了 tail() 的 64KB 窗口 self.assertIn('no_progress', tasks.log_stalls(p)) + def test_archived_windows_runs_distinguish_stalled_and_healthy_tasks(self): + root = Path(__file__).resolve().parents[1] / 'docs/feedback/2026-10-13/results/runs' + for name, stalled in [('task_20261013_124337_daily.log.gz', True), + ('task_20261013_132845_daily.log.gz', False), + ('task_20261013_135050_mirror.log.gz', False)]: + with self.subTest(log=name): + with gzip.open(root / name, 'rt', encoding='utf-8') as f: + lines = f.read().splitlines() + stamp = next(tasks.TIMESTAMP_RE.search(line).group(1) + for line in reversed(lines) if tasks.TIMESTAMP_RE.search(line)) + observed_at = time.mktime(time.strptime(stamp, '%Y-%m-%d %H:%M:%S')) + path = self._make(lines) + self.assertEqual('no_progress' in tasks.log_stalls(path, now=observed_at), stalled) + if __name__ == '__main__': unittest.main()