复查 V1.6.2 与 11-16~11-22 补丁: 返回按钮 TypeError、事件兜底连点、截图熔断线程
- 返回按钮(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:
@@ -1,6 +1,7 @@
|
||||
__pycache__/
|
||||
*.pyc
|
||||
*.log
|
||||
!docs/feedback/runs/**/logs/*.log
|
||||
*.local.json
|
||||
jev_config.json
|
||||
token
|
||||
|
||||
@@ -198,12 +198,22 @@ MCP 初始化说明与工具描述均指导 AI 优先使用 AALC:常规日常
|
||||
- **事件选项表**:事件出现选项时整屏 OCR,按同一屏其它选项的原文(零协汉化)认出 `lc_mcp/data/event_choices.json`
|
||||
里的事件,就点表里那一项;不靠事件名(汉化数据没有标题)。没收录的事件照旧交给 AALC,
|
||||
日志会打印这一屏的选项文字,便于补表。表里的选择优先于 AALC 的"有 ??? 先点 ???",小指良单通模式也一样。
|
||||
点的是这一项自己那行字的中心(读不到字才点选项框左边缘)。`LCP_EVENT_FALLBACK=1` 时没收录的事件先点第 1 项,
|
||||
每个画面只点一次,之后的判定、继续、开始战斗交给 AALC。
|
||||
- **卡包按体系加分**:选卡包时把 `lc_mcp/data/theme_pack_systems.json` 里「卡包对当局体系的加分」临时加到 AALC 的
|
||||
权重表上(不改 `theme_pack_list.yaml`):体系包(掉落以该体系饰品为主,如电闪雷鸣/动力渐盈 = 充能)、该体系专属饰品
|
||||
≥3 件、或中文社区攻略推荐这个体系走的卡包 +6,专属 2 件 +4,1 件 +1;速刷攻略说拖时间的(被遗忘者们、自动工厂、
|
||||
当碎之物)所有体系 -3。AALC 原来的 -5 也能被压过,比如充能队会选 WARP快车谋杀案;嫌激进就调小表里的 `bonus`。
|
||||
卡包数据来自 wiki.gg(`scripts/build_theme_pack_systems.py` 生成,换赛季重跑),社区推荐见
|
||||
`docs/feedback/2026-11-15/theme-pack-research.md`。`LCP_THEME_PACK_SYSTEMS=0` 关闭。
|
||||
优选阈值默认按 1 算(AALC 表里是 0):这一层最高分不到 1(没有本体系卡包)就先刷新,AALC 最多点 4 次「刷新」,
|
||||
之后仍取最高分。「刷新」按钮按 OCR 文字点,找不到再用 AALC 的模板。`LCP_THEME_PACK_THRESHOLD=0` 不改阈值。
|
||||
- **截图持续出错就结束任务**:游戏窗口被最小化或关掉后,AALC 每帧识图都出错、只记日志继续跑(11-16 空转了 4.5 小时)。
|
||||
任务主线程里识图连续出错满 30 秒(至少 20 次、中间一次都没成功)就按未完成结束(退出码 4);
|
||||
一闪而过的坏帧和 AALC 重试监控线程里的出错都不算。
|
||||
- **返回按钮(上游 V1.6.2)**:上游在首次引导页(新赛季进镜牢的几十页引导)拿 `click_element` 的返回值当坐标再点,
|
||||
它实际返回 `True`,会 `TypeError` 退出任务。补丁只在这几处把它改成"只找不点",由上游点一次;
|
||||
上游改掉这种写法后安装时查不到,就不装。
|
||||
- **兔子洞速刷**(`run_task` 加 `strategy="rabbit_hole"`):按 `lc_mcp/data/rabbit_hole.json` 的编队名选队;
|
||||
每回合按 P → 长按浮士德打开 E.G.O 列表 → OCR 找「空洞」,每场第一回合长按卡片超频、其余回合单击 → Enter;
|
||||
攻略路线上的卡包(赌徒 → 地狱鸡 → 去·海·边 → 憎恶与绝望 → 2号线)加分。长按点 `press_at` 要在实机上量,没量时不点任何东西、
|
||||
@@ -260,9 +270,11 @@ powershell -ExecutionPolicy Bypass -File scripts\install_convert_task.ps1 -Every
|
||||
| `LCP_ALLOW_LUNACY` | 未设置 | 设为 `1` 时允许预检放行 `set_lunacy_to_enkephalin` 不为 0 的配置 |
|
||||
| `LCP_TYPED_ROAD` | 未设置 | 设为 `0` 时镜牢简单键盘寻路保持上游的"只按 ↑",不按节点类型选方向 |
|
||||
| `LCP_EVENT_CHOICES` | 未设置 | 设为 `0` 时事件不查选项表;设为 JSON 文件路径时用它代替 `lc_mcp/data/event_choices.json` |
|
||||
| `LCP_EVENT_FALLBACK` | 未设置 | 设为 `1` 时选项表里没有的事件先点第 1 项(每个画面一次),之后交给 AALC |
|
||||
| `LCP_GIFT_KEYWORDS` | 未设置 | 设为 `0` 时饰品选择不按体系关键词排序;设为 JSON 文件路径时用它代替 `lc_mcp/data/gift_keywords.json` |
|
||||
| `LCP_SHOP_NAMES` | 未设置 | 设为 `0` 时商店必买只用 AALC 图标模板;设为 JSON 文件路径时用它代替 `lc_mcp/data/shop_gifts.json` |
|
||||
| `LCP_THEME_PACK_SYSTEMS` | 未设置 | 设为 `0` 时卡包只按 AALC 原权重选;设为 JSON 文件路径时用它代替 `lc_mcp/data/theme_pack_systems.json` |
|
||||
| `LCP_THEME_PACK_THRESHOLD` | 1 | 卡包优选阈值:最高分低于它先刷新。设为 `0` 时用 `theme_pack_list.yaml` 里的值 |
|
||||
| `LCP_KEY_HOLD` | 未设置 | 设为 `0` 时任务进程的按键完全走 AALC 原逻辑(前台 `pyautogui.press`、不按住) |
|
||||
| `LCP_KILL_KEY` | `end` | 任务子进程的急停键,如 `pause` / `scrolllock`;认不出的键名会报错而不是换成默认键 |
|
||||
| `LC_PY` | 当前解释器 | `levelup.py`/`auto_cycle.py` 调用 MCP 用的 Python |
|
||||
|
||||
@@ -27,6 +27,20 @@
|
||||
---
|
||||
|
||||
|
||||
## AALC 上游升级到 V1.6.2(2026-11-22 云端)
|
||||
|
||||
`vendor/aalc` 从 `2fcb1b4`(V1.6.1)升到 `ec8aa17`(V1.6.2,即上游 main),8 个非合并提交。与本仓库有关的:
|
||||
|
||||
| 上游提交 | 改了什么 | 对本仓库的影响 |
|
||||
|---|---|---|
|
||||
| `c9a884a` | 首次引导页(`first_prompt`)改成 `if back_button := auto.click_element(返回)` 再 `mouse_click(back_button[0], …)`;新增 `back2_assets.png` | **上游 bug**:`click_element` 点完返回 `True`,`True[0]` → `TypeError`,镜牢任务直接退出(`road_to_mir`、`Mirror.run`、`select_battle_team` 三处)。补丁 `install_back_button_result` 只在这种写法调用时改成只找不点,由上游点一次(ISSUES I-15) |
|
||||
| `bbe646d` | 领奖拆成 `claim_mission_rewards` / `claim_battle_pass_rewards` / `claim_mail_rewards`,删 `set_get_prize`;旧配置首次加载自动换算,通行证奖励默认关 | 本仓库不读写这几个键,`reward` 任务仍调 `to_get_reward`;三项全关时它什么都不做。实机确认要不要打开通行证奖励 |
|
||||
| `2d52dd7` | `Automation.get_template_position`、`ImageUtils.get_template_bbox`(按 `set_win_size/1440` 缩放模板坐标) | 不涉及补丁;`match_template` 没改,截图熔断照常挂 |
|
||||
| `c0e4926` | 采光、镜牢入口模板图换新 | 不涉及补丁;10-13 那次镜牢入口误认成采光(0.836)连点 18 分钟,换图后值得留意 |
|
||||
| `3293a90` | 队伍设置时间统计重置 | 不涉及 |
|
||||
|
||||
单测 769 项通过(含新加的上游真实 `select_battle_team` 端到端:不装补丁 `TypeError`,装了点一次)。
|
||||
|
||||
## AALC 上游升级到 V1.6.1(2026-11-14 云端)
|
||||
|
||||
`vendor/aalc` 从 `e1d1749`(V1.6.1-beta.11)升到 `2fcb1b4`(V1.6.1,17 个提交)。与本仓库补丁有关的:
|
||||
|
||||
+36
-1
@@ -6,7 +6,8 @@
|
||||
状态:`已修` = 代码改了且实机验证;`已修待验` = 代码改了没实机验证;
|
||||
`待修` = 有确定方案;`待数据` = 卡在缺数据/缺决策;`观察` = 暂不处理,先攒样本;`记录` = 不是缺陷。
|
||||
|
||||
最近更新:2026-11-15 14:10(本机实机:I-05 键盘 4/4 进入、I-06 软件点击兜底关掉弹窗、I-08 卡包按体系加分生效;6 连刷 6/6 完成,见 [`feedback/2026-11-15/README.md`](feedback/2026-11-15/README.md))。
|
||||
最近更新:2026-11-22 云端(AALC 升到 V1.6.2;复查 11-16~11-22 的提交,按 `feedback/runs/2026-11-15_2026-11-21` 的决策记录修 I-15~I-17)。
|
||||
上一次:2026-11-15 14:10(本机实机:I-05 键盘 4/4 进入、I-06 软件点击兜底关掉弹窗、I-08 卡包按体系加分生效;6 连刷 6/6 完成,见 [`feedback/2026-11-15/README.md`](feedback/2026-11-15/README.md))。
|
||||
上一次:2026-11-15 01:55 本机(6 连刷进行中)。
|
||||
|
||||
---
|
||||
@@ -157,6 +158,40 @@
|
||||
- **做法**:跑团期间不要把浏览器/聊天窗口拉到游戏前面。AALC 每次点击前会 setForegroundWindow,但抢回前台的窗口仍会让点击落到别处。
|
||||
- **可选加固**:驱动代理在点击失败率高时增加"点前再确认一次前台"重试(未实现)。
|
||||
|
||||
### I-15 上游 V1.6.2 首次引导页 TypeError 【已修待验】
|
||||
|
||||
- **现象(代码核对,未实机触发)**:V1.6.2 `c9a884a` 在 `road_to_mir`、`Mirror.run`、`select_battle_team` 里写
|
||||
`if back_button := auto.click_element("home/back_assets.png", ...): auto.mouse_click(back_button[0], back_button[1])`。
|
||||
`click_element` 点完返回的是 `True`(`mouse_action_with_pos` 写死),下一行 `True[0]` 抛 `TypeError`,镜牢任务退出。
|
||||
- **何时触发**:画面上有 `home/first_prompt_assets.png`(≥0.9)——首次进镜牢 / 新赛季的约 60 页引导(见 2026-10-04 记录)。
|
||||
- **修法**:`install_back_button_result`:调用方那一行是 `xxx := auto.click_element(返回按钮)` 时改成只找不点、返回坐标,
|
||||
上游下一行点一次(与 V1.6.1 一样一次);`back_init_menu` 这类只看真假的调用照常点。不碰 `mouse_click`
|
||||
(驱动点击每次重启游戏都会重绑它)。安装时查上游源码,没有这种写法就不装。
|
||||
- **验证方式**:日志开头有 `patch: 返回按钮按坐标交给上游点一次(Mirror.road_to_mir/Mirror.run/select_battle_team)`;
|
||||
遇到引导页时有 `返回按钮: 上游要拿坐标自己点, 这次只找不点`,且没有 `TypeError`。
|
||||
|
||||
### I-16 表外事件兜底每轮抢先点第 1 项,上游走不到「继续」 【已修待验】
|
||||
|
||||
- **证据**:`feedback/runs/2026-11-15_2026-11-21` 的 decisions:`event/fallback_first` 1014 条。同一屏连点 10~11 次的有 73 段,
|
||||
最长一段 110 次(11-21 13:12~13:19,「靠得更近些 | 触发遭遇战」);按表点的 18 次全是一次就过。
|
||||
- **根因**:`LCP_EVENT_FALLBACK=1` 时补丁在上游找 "???" 那一步就点第 1 项并返回"找到了",上游随即 `continue`;
|
||||
点完选项框还在画面上,于是每轮都被补丁抢走,上游后面的判定 / 继续 / 开始战斗永远轮不到,只能等 `event_chance` 减完。
|
||||
3ed1749 把点击点改成文字中心也没用(11-21 仍是 10~11 连点),点击位置不是原因。
|
||||
- **修法**:兜底每个画面(按第 1 项原文)只点一次,同一次事件和按表点击共用 5 次上限,之后交给上游。
|
||||
另把点击点限制在这一项自己那行 OCR 字里(原来整屏找子串:叙述或别的选项是它的子串时会点错,例如「离开」与「不听故事离开」)。
|
||||
- **验证方式**:`event/fallback_first` 不再连续出现同一组选项;事件平均耗时下降。
|
||||
|
||||
### I-17 截图熔断在重试监控线程里抛、阈值过敏 【已修待验】
|
||||
|
||||
- **证据**:11-17 06:25 和 11-21 19:21 两次熔断都各记了两条 `image_error/abort`(第 20、21 次,间隔 1 秒)。
|
||||
- **根因**:V1.6.1 起 `retry_monitor` 线程每 0.5 秒也调 `ImageUtils.match_template`;在那条线程里抛 `TaskAbort` 只会打死它
|
||||
(服务器重试弹窗从此没人点),任务照跑,下一秒主线程才真正中止。另外"120 秒内 20 次"在 68 次/秒的出错速度下 0.3 秒就到,
|
||||
重启游戏这类一闪而过的坏帧也会停掉整个任务。
|
||||
- **修法**:只在任务主线程计数和中止;要求连续出错满 30 秒(至少 20 次,中间没有一次识别成功)。
|
||||
- **未解决**:这两次熔断前各有约 5.5~6 小时没有任何决策记录(11-17 00:30→06:25、11-21 13:53→19:21),熔断只是收尾,
|
||||
卡住的原因要看任务日志。归档说明里的过滤日志 `logs/*.log` 被 `.gitignore` 的 `*.log` 挡掉,没进仓库;
|
||||
现已对 `docs/feedback/runs/**/logs/*.log` 放行,请在本机重新 `git add` 这批日志。
|
||||
|
||||
---
|
||||
## 二、需求清单
|
||||
|
||||
|
||||
+158
-59
@@ -13,9 +13,11 @@
|
||||
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
||||
"""
|
||||
import json
|
||||
import linecache
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import unicodedata
|
||||
@@ -1254,29 +1256,35 @@ def load_event_choices(path=EVENT_CHOICES_FILE):
|
||||
return rules
|
||||
|
||||
|
||||
def _option_click_pos(raw_lines, text, marker, scale):
|
||||
"""选项的点击点: 优先用那句话自己的中心。
|
||||
def option_rows(markers, lines, scale):
|
||||
"""把 OCR 行归到各选项框: [(左边缘位置, [(归一后的文字, x, y), ...]), ...], 从上到下。"""
|
||||
markers = sorted(markers, key=lambda m: float(m[1]))
|
||||
rows = [[] for _ in markers]
|
||||
for text, x, y in lines:
|
||||
hits = [i for i, m in enumerate(markers)
|
||||
if x >= float(m[0]) - EVENT_OPTION_LEFT * scale and abs(y - float(m[1])) <= EVENT_OPTION_ROW * scale]
|
||||
if hits:
|
||||
best = min(hits, key=lambda i: abs(y - float(markers[i][1])))
|
||||
rows[best].append((normalize_event_text(text), float(x), float(y)))
|
||||
return list(zip(markers, rows))
|
||||
|
||||
|
||||
2026-11-18 实测: 点标记(EVENT_OPTION 模板勾到的行首)事件不推进, 同一选项被点 10 次还在;
|
||||
标记常落在选项按钮的左侧装饰上, 真正可点的是文字那一行。
|
||||
"""
|
||||
target = normalize_event_text(text or '')
|
||||
if target:
|
||||
for line, x, y in raw_lines:
|
||||
norm = normalize_event_text(line)
|
||||
if norm and len(norm) >= 2 and norm in target:
|
||||
return (float(x), float(y))
|
||||
return (float(marker[0]), float(marker[1]))
|
||||
def event_options(markers, lines, scale):
|
||||
"""选项框左边缘(从上到下)与各自的文字: [(位置, 归一后的文字), ...]。"""
|
||||
markers = sorted(markers, key=lambda m: float(m[1]))
|
||||
texts = [[] for _ in markers]
|
||||
for text, x, y in lines:
|
||||
rows = [i for i, m in enumerate(markers)
|
||||
if x >= float(m[0]) - EVENT_OPTION_LEFT * scale and abs(y - float(m[1])) <= EVENT_OPTION_ROW * scale]
|
||||
if rows:
|
||||
texts[min(rows, key=lambda i: abs(y - float(markers[i][1])))].append(normalize_event_text(text))
|
||||
return [(m, ''.join(t)) for m, t in zip(markers, texts)]
|
||||
return [(m, ''.join(text for text, _, _ in row)) for m, row in option_rows(markers, lines, scale)]
|
||||
|
||||
|
||||
def option_click_pos(marker, row):
|
||||
"""选项的点击点: 这一项自己那行里最长一句字的中心; 一个字都没读到才点选项框左边缘。
|
||||
|
||||
只在这一项归到的字里找(option_rows 同一套归行): 整屏找子串会点错项,
|
||||
比如要点「不听故事离开」时, 另一项「离开」也是它的子串。
|
||||
"""
|
||||
words = [(text, x, y) for text, x, y in row if text]
|
||||
if words:
|
||||
_, x, y = max(words, key=lambda w: len(w[0]))
|
||||
return (x, y)
|
||||
return (float(marker[0]), float(marker[1]))
|
||||
|
||||
|
||||
def choose_event_option(rules, texts):
|
||||
@@ -1325,9 +1333,8 @@ def install_event_choices(log=print, env=None):
|
||||
markers = auto.find_element(EVENT_OPTION, find_type='image_with_multiple_targets', threshold=0.75)
|
||||
if not markers:
|
||||
return None
|
||||
raw_lines = _ocr_lines(auto)
|
||||
options = event_options(markers, raw_lines, cfg.set_win_size / 1440)
|
||||
texts = tuple(text for _, text in options)
|
||||
rows = option_rows(markers, _ocr_lines(auto), cfg.set_win_size / 1440)
|
||||
texts = tuple(''.join(text for text, _, _ in row) for _, row in rows)
|
||||
shown = ' | '.join('%d=%s' % (i + 1, text or '?') for i, text in enumerate(texts))
|
||||
|
||||
def once(message):
|
||||
@@ -1338,12 +1345,18 @@ def install_event_choices(log=print, env=None):
|
||||
return True
|
||||
|
||||
rule, i = choose_event_option(rules, texts)
|
||||
if rule is None and state['fallback'] and options and texts and texts[0]:
|
||||
# 2026-11-18: 上游对认不出的事件会「无法解决事件, 尝试回到初始界面」直接回主界面。
|
||||
# LCP_EVENT_FALLBACK=1 时改成点第 1 项, 至少把事件走过去。
|
||||
position = _option_click_pos(raw_lines, texts[0], options[0][0], cfg.set_win_size / 1440)
|
||||
if rule is None and state['fallback'] and texts and texts[0]:
|
||||
# LCP_EVENT_FALLBACK=1: 表里没有的事件先点第 1 项, 每个画面只点一次。
|
||||
# 点完选项框还在画面上, 后面的「判定 / 继续 / 开始战斗」得交给上游:
|
||||
# 补丁每轮都抢先点第 1 项时上游一直走不到那几步, 11-18~11-21 实机同一屏连点 10~11 次,
|
||||
# 最长一次连点 110 次(约 7 分钟); 按表点的 18 次全是一次就过。
|
||||
if texts[0] in state['fallback_done'] or state['clicks'] >= EVENT_TEXT_CLICKS:
|
||||
return None
|
||||
state['fallback_done'].add(texts[0])
|
||||
state['clicks'] += 1
|
||||
log('[lc_mcp] 事件选项: %s; 表里没有, 兜底点第 1 项「%s」' % (shown, texts[0]))
|
||||
decisions.record('event', 1, 'fallback_first', options=list(texts))
|
||||
position = option_click_pos(*rows[0])
|
||||
auto.mouse_click(position[0], position[1])
|
||||
return position
|
||||
if rule is None:
|
||||
@@ -1363,13 +1376,13 @@ def install_event_choices(log=print, env=None):
|
||||
state['clicks'] += 1
|
||||
log('[lc_mcp] 事件 %s: %s; 按表选第 %d 项「%s」' % (rule['name'], shown, i + 1, rule['text']))
|
||||
decisions.record('event', i + 1, 'text', event=rule['name'], event_id=rule['id'], options=list(texts))
|
||||
position = _option_click_pos(raw_lines, texts[i], options[i][0], cfg.set_win_size / 1440)
|
||||
position = option_click_pos(*rows[i])
|
||||
auto.mouse_click(position[0], position[1])
|
||||
return position
|
||||
|
||||
def event_handling(self, *args, **kwargs):
|
||||
state = {'clicks': 0, 'logged': set(), 'clicked': None, 'passed': None,
|
||||
'fallback': fallback}
|
||||
'fallback': fallback, 'fallback_done': set()}
|
||||
real_find, real_click = auto.find_element, auto.mouse_click
|
||||
|
||||
def find_element(target, *a, **kw):
|
||||
@@ -1403,7 +1416,8 @@ def install_event_choices(log=print, env=None):
|
||||
|
||||
event_handling.__wrapped__ = original # 让后装的补丁查得到上游源码
|
||||
mirror_mod.Mirror.event_handling = event_handling
|
||||
log('[lc_mcp] patch: 镜牢事件按选项表选择(%s, %d 条)' % (os.path.basename(path), len(rules)))
|
||||
log('[lc_mcp] patch: 镜牢事件按选项表选择(%s, %d 条%s)' % (
|
||||
os.path.basename(path), len(rules), '; 表外事件每屏先点一次第 1 项' if fallback else ''))
|
||||
return original
|
||||
|
||||
|
||||
@@ -1660,7 +1674,8 @@ def install_theme_pack_audit(log=print):
|
||||
# 这里在 AALC 选卡包时把它的权重表临时加上「卡包对当局体系的加分」(lc_mcp/data/theme_pack_systems.json),
|
||||
# 不改配置文件。AALC 拿卡包卡面 OCR 文字按权重表的键做子串匹配、取第一个命中的键, 所以加过分的键排在最前面。
|
||||
THEME_PACK_SYSTEMS_ENV = 'LCP_THEME_PACK_SYSTEMS' # 0 = 关闭; 文件路径 = 用这张表代替默认表
|
||||
THEME_PACK_THRESHOLD_ENV = 'LCP_THEME_PACK_THRESHOLD' # 优选阈值; 默认抬到 1, 让低分楼层先刷新卡包
|
||||
THEME_PACK_THRESHOLD_ENV = 'LCP_THEME_PACK_THRESHOLD' # 优选阈值; 0 = 不动上游(theme_pack_list.yaml 的值)
|
||||
THEME_PACK_THRESHOLD_DEFAULT = 1 # 最高分低于它先刷新卡包
|
||||
THEME_PACK_SYSTEMS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data', 'theme_pack_systems.json')
|
||||
THEME_PACK_UNKNOWN_KEYS = ('未知', 'unknown') # AALC 认不出卡包时的兜底权重键, 不当卡包名用
|
||||
THEME_PACK_BOOSTED = {} # 本次选卡包加过分的键 → {pack, system, from, to}; 卡包审计记到 decisions 里
|
||||
@@ -1798,12 +1813,12 @@ def boost_theme_pack_weights(weights, packs, system, bonus, language='zh_cn', ha
|
||||
# 上游点的是 mirror/theme_pack/refresh_assets.png 的模板中心, 勾到的可能只是图标; 改成 OCR 找
|
||||
# 右上角的「刷新 N/3」文字并点它的中心, 找不到再退回模板点击。
|
||||
THEME_PACK_REFRESH = 'mirror/theme_pack/refresh_assets.png'
|
||||
THEME_PACK_REFRESH_BOX = (620, 0, 1280, 160) # 只在右上角找, 避开商店的「关键词刷新」
|
||||
THEME_PACK_REFRESH_BOX = (1240, 0, 2560, 320) # 只在右上角找, 避开商店的「关键词刷新」(1440 标定)
|
||||
|
||||
|
||||
def _refresh_text_pos(auto, box=THEME_PACK_REFRESH_BOX):
|
||||
"""右上角「刷新」文字的中心坐标; 没有返回 None。"""
|
||||
x0, y0, x1, y1 = box
|
||||
def _refresh_text_pos(auto, scale, box=THEME_PACK_REFRESH_BOX):
|
||||
"""右上角「刷新」文字的中心坐标(客户区像素); 没有返回 None。scale = set_win_size / 1440。"""
|
||||
x0, y0, x1, y1 = (v * scale for v in box)
|
||||
for text, x, y in _ocr_lines(auto):
|
||||
if '刷新' not in str(text):
|
||||
continue
|
||||
@@ -1816,6 +1831,7 @@ def install_theme_pack_refresh_click(log=print):
|
||||
"""卡包页刷新改成按 OCR 文字点。返回原 click_element, 未安装返回 None。"""
|
||||
try:
|
||||
from module.automation import auto
|
||||
from module.config import cfg
|
||||
except Exception as e:
|
||||
log('[lc_mcp] 卡包刷新补丁跳过: 无法导入 %s' % e)
|
||||
return None
|
||||
@@ -1828,7 +1844,7 @@ def install_theme_pack_refresh_click(log=print):
|
||||
if target != THEME_PACK_REFRESH or kwargs.get('click') is False:
|
||||
return original(target, *args, **kwargs)
|
||||
try:
|
||||
pos = _refresh_text_pos(auto)
|
||||
pos = _refresh_text_pos(auto, cfg.set_win_size / 1440)
|
||||
except Exception as e:
|
||||
log('[lc_mcp] 找刷新按钮出错(%s: %s), 用模板点击' % (type(e).__name__, e))
|
||||
pos = None
|
||||
@@ -1844,6 +1860,7 @@ def install_theme_pack_refresh_click(log=print):
|
||||
log('[lc_mcp] patch: 卡包刷新按 OCR 点「刷新」文字(找不到再退回模板)')
|
||||
return original
|
||||
|
||||
|
||||
def install_theme_pack_systems(log=print, env=None, route=None, route_name='路线'):
|
||||
"""镜牢选卡包时按当局体系给卡包加分。返回原 select_theme_pack, 未安装返回 None。
|
||||
|
||||
@@ -1927,12 +1944,15 @@ def install_theme_pack_systems(log=print, env=None, route=None, route_name='路
|
||||
|
||||
# 2026-11-16 用户要求: 卡包均分低就刷新。AALC 只在「最高分 < preferred_thresholds」时刷新,
|
||||
# 而主题包表里 preferred_thresholds 是 0 → 0 分也当优选, 永远不刷新。
|
||||
# 这里把它抬到 1(可用 LCP_THEME_PACK_THRESHOLD 调), 让"没有本体系卡包"的楼层先刷新(上游最多 3 次),
|
||||
# 刷完仍不达标还是选最高分那一个。
|
||||
# 这里默认抬到 1(LCP_THEME_PACK_THRESHOLD 可调, 0 = 不动上游), 让"没有本体系卡包"的楼层先刷新
|
||||
# (上游最多点 4 次刷新), 刷完仍不达标还是选最高分那一个。只改内存里的值, 不写 theme_pack_list.yaml。
|
||||
# 11-18~11-21 实机就是这样跑的: 0 分楼层点 4 次「刷新」后按 highest_weight 选。
|
||||
setting = (env.get(THEME_PACK_THRESHOLD_ENV) or '').strip()
|
||||
try:
|
||||
want = int((env.get(THEME_PACK_THRESHOLD_ENV) or '').strip() or 0) # 默认不改上游行为
|
||||
want = int(setting) if setting else THEME_PACK_THRESHOLD_DEFAULT
|
||||
except ValueError:
|
||||
want = 0
|
||||
log('[lc_mcp] %s=%r 不是整数, 按默认 %d' % (THEME_PACK_THRESHOLD_ENV, setting, THEME_PACK_THRESHOLD_DEFAULT))
|
||||
want = THEME_PACK_THRESHOLD_DEFAULT
|
||||
try:
|
||||
current = int(getattr(theme_list, 'preferred_thresholds', 0) or 0)
|
||||
except (TypeError, ValueError):
|
||||
@@ -1970,18 +1990,94 @@ class TaskAbort(BaseException):
|
||||
"""
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- 返回按钮(上游 V1.6.2)
|
||||
|
||||
# 上游 V1.6.2(c9a884a)在三处这样写:
|
||||
# if back_button := auto.click_element("home/back_assets.png", model="normal"):
|
||||
# auto.mouse_click(back_button[0], back_button[1])
|
||||
# 以为 click_element 返回坐标, 实际它点完返回 True(mouse_action_with_pos 写死 return True),
|
||||
# 下一行 True[0] → TypeError, 整个镜牢任务退出。画面上出现 home/first_prompt_assets.png
|
||||
# (首次进镜牢 / 新赛季的约 60 页引导, 见 feedback/2026-10-04)时必走这三处:
|
||||
# Mirror.road_to_mir、Mirror.run 的主循环、team_formation.select_battle_team。
|
||||
# 补丁只在被这种写法调用时把 click_element 改成"只找不点"、返回坐标, 由上游下一行点一次 ——
|
||||
# 点击次数和 V1.6.1 一样(一次), 也不碰 mouse_click(驱动点击每次重启游戏都会重绑它)。
|
||||
# back_init_menu 只看真假, 不受影响; 上游哪天改掉这种写法, 安装时查不到就不装。
|
||||
BACK_BUTTONS = ('home/back_assets.png', 'home/back2_assets.png')
|
||||
BACK_CALL = re.compile(r'(\w+)\s*:=\s*auto\.click_element\(\s*["\']home/back2?_assets\.png["\'][^\n]*\n'
|
||||
r'\s*auto\.mouse_click\(\s*\1\[0\]')
|
||||
BACK_CALL_LINE = re.compile(r':=\s*auto\.click_element\(\s*["\']home/back2?_assets\.png')
|
||||
CLICK_ELEMENT_CLICK_ARG = 11 # click_element(target, ...) 里 click 是 target 之后第 12 个位置参数
|
||||
|
||||
|
||||
def _upstream_caller_line(depth=2):
|
||||
"""越过本包的几层包装, 取调用方那一行源码; 拿不到返回 ''。"""
|
||||
frame = sys._getframe(depth)
|
||||
while frame is not None and str(frame.f_globals.get('__name__', '')).startswith('lc_mcp'):
|
||||
frame = frame.f_back
|
||||
if frame is None:
|
||||
return ''
|
||||
return linecache.getline(frame.f_code.co_filename, frame.f_lineno)
|
||||
|
||||
|
||||
def install_back_button_result(log=print):
|
||||
"""上游拿 click_element(返回按钮) 的返回值当坐标时只找不点。返回原 click_element, 未安装返回 None。"""
|
||||
try:
|
||||
from module.automation import auto
|
||||
from tasks.mirror import mirror as mirror_mod
|
||||
from tasks.teams import team_formation as tf
|
||||
except Exception as e:
|
||||
log('[lc_mcp] 返回按钮补丁跳过: 无法导入 %s' % e)
|
||||
return None
|
||||
mirror_cls = getattr(mirror_mod, 'Mirror', None)
|
||||
candidates = (('Mirror.road_to_mir', getattr(mirror_cls, 'road_to_mir', None)),
|
||||
('Mirror.run', getattr(mirror_cls, 'run', None)),
|
||||
('select_battle_team', getattr(tf, 'select_battle_team', None)))
|
||||
users = [name for name, func in candidates
|
||||
if func is not None and BACK_CALL.search(_upstream_source(func) or '')]
|
||||
if not users:
|
||||
log('[lc_mcp] 返回按钮补丁不装: 上游不再拿 click_element(返回按钮) 的返回值当坐标')
|
||||
return None
|
||||
original = getattr(auto, 'click_element', None)
|
||||
if original is None:
|
||||
log('[lc_mcp] 返回按钮补丁跳过: auto 没有 click_element')
|
||||
return None
|
||||
logged = []
|
||||
|
||||
def click_element(target, *args, **kwargs):
|
||||
if (target in BACK_BUTTONS and 'click' not in kwargs and len(args) < CLICK_ELEMENT_CLICK_ARG
|
||||
and BACK_CALL_LINE.search(_upstream_caller_line())):
|
||||
if not logged:
|
||||
logged.append(True)
|
||||
log('[lc_mcp] 返回按钮: 上游要拿坐标自己点, 这次只找不点')
|
||||
return original(target, *args, click=False, **kwargs)
|
||||
return original(target, *args, **kwargs)
|
||||
|
||||
click_element.__wrapped__ = original
|
||||
auto.click_element = click_element
|
||||
log('[lc_mcp] patch: 返回按钮按坐标交给上游点一次(%s)' % '/'.join(users))
|
||||
return original
|
||||
|
||||
|
||||
# ---------------------------------------------------------------- 截图连续失败熔断
|
||||
|
||||
# 2026-11-16: 游戏窗口被最小化/关掉之后, AALC 每帧都在 cv2.matchTemplate 上抛
|
||||
# 「corr.rows <= img.rows + templ.rows - 1」断言, 只记一条 ERROR 继续跑 —— 第 2 局
|
||||
# 就这样空转 4.5 小时(68 次/秒), 直到手动停任务。这里统计"识别返回 None"(上游异常分支)的频率,
|
||||
# 超过阈值就抛 TaskAbort 结束任务, 让 task_status 里能看见明确原因。
|
||||
IMAGE_ERROR_WINDOW = 120 # 统计窗口(秒)
|
||||
IMAGE_ERROR_LIMIT = 20 # 窗口内达到这个次数就熔断
|
||||
# 就这样空转 4.5 小时(68 次/秒), 直到手动停任务。这里看"识别返回 None"(上游异常分支):
|
||||
# 中间一次都没识别成功、持续 IMAGE_ERROR_SPAN 秒且至少 IMAGE_ERROR_LIMIT 次, 就抛 TaskAbort 结束任务,
|
||||
# 让 task_status 里能看见明确原因。
|
||||
#
|
||||
# 2026-11-22 复查改了两处:
|
||||
# - 只在装补丁的线程(任务主线程)里抛。上游 V1.6.1 起 retry_monitor 线程每 0.5 秒也调 match_template;
|
||||
# 在那条线程里抛 TaskAbort 只会打死它(服务器重试弹窗从此没人点), 任务照跑。11-17 / 11-21 两次熔断
|
||||
# 都记了两条 abort(第 20、21 次), 第一条就是这么来的。别的线程既不计数也不清零。
|
||||
# - 原来是"120 秒内累计 20 次": 68 次/秒时 0.3 秒就到, 重启游戏、切分辨率这类一闪而过的坏帧
|
||||
# 也会把几个小时的任务停掉。改成要求连续出错持续一段时间, 任何一次识别成功都清零。
|
||||
IMAGE_ERROR_SPAN = 30 # 连续出错至少持续这么多秒(中间没有一次识别成功)
|
||||
IMAGE_ERROR_LIMIT = 20 # 且至少这么多次
|
||||
|
||||
|
||||
def install_image_error_guard(log=print, clock=time.monotonic,
|
||||
window=IMAGE_ERROR_WINDOW, limit=IMAGE_ERROR_LIMIT):
|
||||
span=IMAGE_ERROR_SPAN, limit=IMAGE_ERROR_LIMIT):
|
||||
"""截图持续识别失败时结束任务。返回原 match_template, 未安装返回 None。"""
|
||||
try:
|
||||
from utils.image_utils import ImageUtils
|
||||
@@ -1992,28 +2088,31 @@ def install_image_error_guard(log=print, clock=time.monotonic,
|
||||
if original is None:
|
||||
log('[lc_mcp] 截图熔断跳过: ImageUtils 没有 match_template')
|
||||
return None
|
||||
state = {'times': []}
|
||||
owner = threading.get_ident()
|
||||
state = {'since': None, 'count': 0}
|
||||
|
||||
def match_template(screenshot, template, threshold, *args, **kwargs):
|
||||
result = original(screenshot, template, threshold, *args, **kwargs)
|
||||
def match_template(*args, **kwargs):
|
||||
result = original(*args, **kwargs)
|
||||
if threading.get_ident() != owner:
|
||||
return result
|
||||
if result is not None:
|
||||
state['since'], state['count'] = None, 0
|
||||
return result
|
||||
now = clock()
|
||||
times = state['times']
|
||||
times.append(now)
|
||||
cutoff = now - window
|
||||
while times and times[0] < cutoff:
|
||||
times.pop(0)
|
||||
if len(times) >= limit:
|
||||
log('[ERROR] [lc_mcp] %d 秒内 %d 次图片识别出错, 判定画面不可用, 结束任务'
|
||||
% (window, len(times)))
|
||||
decisions.record('image_error', None, 'abort', count=len(times))
|
||||
if state['since'] is None:
|
||||
state['since'] = now
|
||||
state['count'] += 1
|
||||
lasted = now - state['since']
|
||||
if state['count'] >= limit and lasted >= span:
|
||||
log('[ERROR] [lc_mcp] 图片识别连续出错 %d 次、持续 %d 秒没有一次成功, 判定画面不可用, 结束任务'
|
||||
% (state['count'], lasted))
|
||||
decisions.record('image_error', None, 'abort', count=state['count'], seconds=int(lasted))
|
||||
raise TaskAbort('截图连续识别失败(%d 次/%d 秒), 游戏窗口可能被最小化或已关闭'
|
||||
% (len(times), window))
|
||||
% (state['count'], lasted))
|
||||
return result
|
||||
|
||||
ImageUtils.match_template = staticmethod(match_template)
|
||||
log('[lc_mcp] patch: 截图连续识别失败 %d 次/%d 秒即结束任务' % (limit, window))
|
||||
log('[lc_mcp] patch: 截图识别连续出错 %d 秒(至少 %d 次)即结束任务' % (span, limit))
|
||||
return original
|
||||
|
||||
def install_gift_confirm_guard(log=print, clock=time.monotonic):
|
||||
|
||||
+6
-6
@@ -11,15 +11,14 @@ import sys
|
||||
|
||||
from . import killswitch, preflight
|
||||
from .aalc_engine import bootstrap
|
||||
from .aalc_patches import (TaskAbort, WindowGuard, driver_click_tasks, headless_hdr_warning, install_rabbit_hole,
|
||||
load_rabbit_hole,
|
||||
install_default_battle_team, install_event_choices, install_exact_team_match,
|
||||
install_gift_confirm_guard, install_gift_preference, install_image_error_guard, install_key_hold,
|
||||
from .aalc_patches import (TaskAbort, WindowGuard, driver_click_tasks, headless_hdr_warning,
|
||||
install_back_button_result, install_default_battle_team, install_event_choices,
|
||||
install_exact_team_match, install_gift_confirm_guard, install_gift_preference,
|
||||
install_image_error_guard, install_key_hold, install_rabbit_hole,
|
||||
install_robust_set_foreground, install_shop_audit, install_shop_by_name,
|
||||
install_system_team_selection, install_team_screen_guard,
|
||||
install_theme_pack_audit, install_theme_pack_refresh_click, install_theme_pack_systems,
|
||||
install_typed_keyboard_road,
|
||||
mirror_progress, stop_driver_click)
|
||||
install_typed_keyboard_road, load_rabbit_hole, mirror_progress, stop_driver_click)
|
||||
from .decisions import decisions
|
||||
from .game_lock import GameBusyError, exclusive_game
|
||||
|
||||
@@ -155,6 +154,7 @@ def _run(task, params):
|
||||
install_default_battle_team(scheme, log=log)
|
||||
# 镜牢: 编队是自定义名字(体系名), AALC 只会找 "编队#N"; 改成按体系名点选。
|
||||
if task in ('mirror', 'all'):
|
||||
install_back_button_result(log=log) # 上游 V1.6.2 拿 click_element 返回的 True 当坐标, 首次引导页 TypeError
|
||||
install_system_team_selection(log=log, names=rabbit['team_names'] if rabbit else None)
|
||||
install_team_screen_guard(log=log)
|
||||
install_gift_confirm_guard(log=log) # 「获得E.G.O饰品」点不关时换落点/结束任务(ISSUES I-06)
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""返回按钮: 上游 V1.6.2 拿 click_element 的返回值当坐标(c9a884a)。
|
||||
|
||||
if back_button := auto.click_element("home/back_assets.png", model="normal"):
|
||||
auto.mouse_click(back_button[0], back_button[1])
|
||||
|
||||
click_element 点完返回 True, 下一行 True[0] → TypeError。画面上出现首次引导
|
||||
(home/first_prompt_assets.png)时必走这里。端到端用例执行上游真实的 select_battle_team。
|
||||
"""
|
||||
import ast
|
||||
import sys
|
||||
import types
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from types import SimpleNamespace
|
||||
from unittest import mock
|
||||
|
||||
REPO = Path(__file__).resolve().parents[1]
|
||||
sys.path.insert(0, str(REPO))
|
||||
from lc_mcp import aalc_patches as ap # noqa: E402
|
||||
|
||||
AALC = REPO / 'vendor' / 'aalc'
|
||||
MIRROR = AALC / 'tasks' / 'mirror' / 'mirror.py'
|
||||
TEAM = AALC / 'tasks' / 'teams' / 'team_formation.py'
|
||||
BACK, BACK2 = ap.BACK_BUTTONS
|
||||
BACK_POS = (60, 35)
|
||||
|
||||
|
||||
def upstream_function(path, name, cls=None, **ns):
|
||||
"""把上游某个函数原样编译出来(去掉装饰器), 行号和文件名不变, inspect / linecache 都认。"""
|
||||
tree = ast.parse(path.read_text(encoding='utf-8'))
|
||||
body = tree.body
|
||||
if cls:
|
||||
body = next(n for n in body if isinstance(n, ast.ClassDef) and n.name == cls).body
|
||||
node = next(n for n in body if isinstance(n, ast.FunctionDef) and n.name == name)
|
||||
node.decorator_list = []
|
||||
exec(compile(ast.Module(body=[node], type_ignores=[]), str(path), 'exec'), ns)
|
||||
return ns[name]
|
||||
|
||||
|
||||
class FirstPromptScreen:
|
||||
"""首次引导页: 左上角有返回按钮(back 或 back2), 点一次就退出引导。
|
||||
|
||||
click_element 按上游 Automation 的语义: 点了返回 True, click=False 时只返回坐标。
|
||||
"""
|
||||
|
||||
def __init__(self, button=BACK):
|
||||
self.button = button
|
||||
self.prompt = True
|
||||
self.clicks = []
|
||||
|
||||
def take_screenshot(self, *args, **kwargs):
|
||||
return object()
|
||||
|
||||
def find_element(self, target, *args, **kwargs):
|
||||
if target == 'home/first_prompt_assets.png':
|
||||
return self.prompt
|
||||
return None
|
||||
|
||||
def click_element(self, target, *args, click=True, **kwargs):
|
||||
if not (self.prompt and target == self.button):
|
||||
return False
|
||||
if not click:
|
||||
return BACK_POS
|
||||
self.mouse_click(*BACK_POS)
|
||||
return True
|
||||
|
||||
def mouse_click(self, x, y, *args, **kwargs):
|
||||
self.clicks.append((x, y))
|
||||
self.prompt = False
|
||||
|
||||
|
||||
def fake_modules(auto, select_battle_team=None, mirror_methods=None):
|
||||
mirror_mod = types.ModuleType('tasks.mirror.mirror')
|
||||
mirror_mod.Mirror = type('Mirror', (), dict(mirror_methods or {}))
|
||||
team_mod = types.ModuleType('tasks.teams.team_formation')
|
||||
team_mod.select_battle_team = select_battle_team or (lambda num: True)
|
||||
mirror_pkg, teams_pkg = types.ModuleType('tasks.mirror'), types.ModuleType('tasks.teams')
|
||||
mirror_pkg.mirror, teams_pkg.team_formation = mirror_mod, team_mod
|
||||
return {'tasks': types.ModuleType('tasks'), 'tasks.mirror': mirror_pkg, 'tasks.mirror.mirror': mirror_mod,
|
||||
'tasks.teams': teams_pkg, 'tasks.teams.team_formation': team_mod,
|
||||
'module': types.ModuleType('module'), 'module.automation': SimpleNamespace(auto=auto)}
|
||||
|
||||
|
||||
@unittest.skipUnless(MIRROR.is_file() and TEAM.is_file(), 'vendor/aalc 子模块未检出')
|
||||
class UpstreamSelectBattleTeamTest(unittest.TestCase):
|
||||
"""执行上游真实的 select_battle_team: 先处理首次引导, 之后找不到编队页就返回。"""
|
||||
|
||||
def play(self, screen, patched=True):
|
||||
self.lines = []
|
||||
ns = dict(auto=screen, cfg=SimpleNamespace(set_win_size=720), log=mock.Mock(), sleep=lambda *a: None)
|
||||
select = upstream_function(TEAM, 'select_battle_team', **ns)
|
||||
if patched:
|
||||
with mock.patch.dict(sys.modules, fake_modules(screen, select)):
|
||||
self.assertIsNotNone(ap.install_back_button_result(log=self.lines.append))
|
||||
return select(1)
|
||||
|
||||
def test_upstream_v162_crashes_on_the_first_prompt(self):
|
||||
with self.assertRaisesRegex(TypeError, "'bool' object is not subscriptable"):
|
||||
self.play(FirstPromptScreen(), patched=False)
|
||||
|
||||
def test_back_button_is_clicked_exactly_once(self):
|
||||
screen = FirstPromptScreen()
|
||||
self.play(screen)
|
||||
self.assertEqual(screen.clicks, [BACK_POS])
|
||||
self.assertIn('返回按钮: 上游要拿坐标自己点, 这次只找不点', '\n'.join(self.lines))
|
||||
|
||||
def test_second_back_template_is_also_handled(self):
|
||||
screen = FirstPromptScreen(button=BACK2)
|
||||
self.play(screen)
|
||||
self.assertEqual(screen.clicks, [BACK_POS])
|
||||
|
||||
def test_callers_that_only_test_truthiness_still_get_a_click(self):
|
||||
# back_init_menu: if auto.click_element("home/back_assets.png") or ...: continue
|
||||
screen = FirstPromptScreen()
|
||||
self.play(screen, patched=True) # 引导已被 select_battle_team 点掉
|
||||
screen.prompt = True
|
||||
screen.clicks.clear()
|
||||
self.assertIs(screen.click_element(BACK), True)
|
||||
self.assertEqual(screen.clicks, [BACK_POS])
|
||||
|
||||
def test_other_targets_and_explicit_click_argument_untouched(self):
|
||||
screen = FirstPromptScreen()
|
||||
self.play(screen)
|
||||
screen.prompt = True
|
||||
self.assertEqual(screen.click_element(BACK, click=False), BACK_POS)
|
||||
self.assertIs(screen.click_element('home/other.png'), False)
|
||||
|
||||
|
||||
@unittest.skipUnless(MIRROR.is_file() and TEAM.is_file(), 'vendor/aalc 子模块未检出')
|
||||
class InstallBackButtonResultTest(unittest.TestCase):
|
||||
|
||||
def install(self, **kwargs):
|
||||
self.lines = []
|
||||
auto = FirstPromptScreen()
|
||||
with mock.patch.dict(sys.modules, fake_modules(auto, **kwargs)):
|
||||
return ap.install_back_button_result(log=self.lines.append)
|
||||
|
||||
def test_finds_all_three_upstream_call_sites(self):
|
||||
methods = {name: upstream_function(MIRROR, name, cls='Mirror') for name in ('road_to_mir', 'run')}
|
||||
select = upstream_function(TEAM, 'select_battle_team')
|
||||
self.assertIsNotNone(self.install(select_battle_team=select, mirror_methods=methods))
|
||||
self.assertIn('patch: 返回按钮按坐标交给上游点一次(Mirror.road_to_mir/Mirror.run/select_battle_team)',
|
||||
'\n'.join(self.lines))
|
||||
|
||||
def test_not_installed_once_upstream_stops_using_the_result(self):
|
||||
def select_battle_team(num):
|
||||
if auto.click_element("home/back_assets.png", model="normal"): # noqa: F821
|
||||
return False
|
||||
self.assertIsNone(self.install(select_battle_team=select_battle_team))
|
||||
self.assertIn('返回按钮补丁不装', '\n'.join(self.lines))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -73,6 +73,17 @@ class EventOptionsTest(unittest.TestCase):
|
||||
options = ap.event_options(markers(1), [('继续', 900, 200 + 31)], SCALE)
|
||||
self.assertEqual(options[0][1], '')
|
||||
|
||||
def test_click_point_is_the_longest_line_of_that_option(self):
|
||||
lines = [('离开', 900, 200), ('不听故事', 900, 255), ('就这样离开', 1000, 265)]
|
||||
rows = ap.option_rows(markers(2), lines, SCALE)
|
||||
# 第 2 项「不听故事就这样离开」: 不会因为「离开」是它的子串去点第 1 项
|
||||
self.assertEqual(ap.option_click_pos(*rows[1]), (1000.0, 265.0))
|
||||
self.assertEqual(ap.option_click_pos(*rows[0]), (900.0, 200.0))
|
||||
|
||||
def test_click_point_falls_back_to_the_marker(self):
|
||||
rows = ap.option_rows(markers(1), [], SCALE)
|
||||
self.assertEqual(ap.option_click_pos(*rows[0]), (float(MARKER_X), 200.0))
|
||||
|
||||
|
||||
class ChooseEventOptionTest(unittest.TestCase):
|
||||
|
||||
@@ -197,7 +208,7 @@ class EventScreen:
|
||||
|
||||
def run(self, image):
|
||||
self.ocr_runs += 1
|
||||
lines = [('事件叙述文字', 200, 60)]
|
||||
lines = [('事件叙述文字', 200, 60)] + list(getattr(self, 'narration', ()))
|
||||
for (x, y), text in zip(markers(len(self.options or ())), self.options or ()):
|
||||
lines.append((text, x + 200, y))
|
||||
return SimpleNamespace(txts=tuple(t for t, _, _ in lines),
|
||||
@@ -205,6 +216,36 @@ class EventScreen:
|
||||
for _, x, y in lines])
|
||||
|
||||
|
||||
class StickyEventScreen(EventScreen):
|
||||
"""点了选项后选项框还留在画面上, 要上游点「继续」才进下一屏(实机表外事件就是这样)。"""
|
||||
|
||||
def __init__(self, screens):
|
||||
super().__init__(screens)
|
||||
self.picked = False
|
||||
self.continues = 0
|
||||
self.clicks = 0
|
||||
|
||||
def mouse_click(self, x, y, *args, **kwargs):
|
||||
if not self.options:
|
||||
return
|
||||
self.clicks += 1
|
||||
if self.clicks > 50:
|
||||
raise RuntimeError('同一屏点了 50 次还没走完事件')
|
||||
if not self.picked:
|
||||
rows = markers(len(self.options))
|
||||
above = [i for i, (_, my) in enumerate(rows) if my <= y]
|
||||
self.chosen.append(max(above) if above else 0)
|
||||
self.picked = True
|
||||
|
||||
def click_element(self, target, **kwargs):
|
||||
if target == 'event/continue_assets.png' and self.options and self.picked:
|
||||
self.continues += 1
|
||||
self.picked = False
|
||||
self.stage += 1
|
||||
return True
|
||||
return super().click_element(target, **kwargs)
|
||||
|
||||
|
||||
@unittest.skipUnless(MIRROR.is_file() and EVENT.is_file(), 'vendor/aalc 子模块未检出')
|
||||
class UpstreamEventHandlingTest(unittest.TestCase):
|
||||
"""执行上游真实的 Mirror.event_handling, 看每屏点了第几项。"""
|
||||
@@ -214,8 +255,9 @@ class UpstreamEventHandlingTest(unittest.TestCase):
|
||||
self.fn_node = upstream_function(MIRROR, 'event_handling', cls='Mirror')
|
||||
self.avoid_node = upstream_function(EVENT, 'click_option_avoiding_unknown', cls='EventHandling')
|
||||
|
||||
def play(self, screens, patched=True, env=None, unknown=None, solo=False, ignore_clicks=0):
|
||||
screen = EventScreen(screens, unknown=unknown, ignore_clicks=ignore_clicks)
|
||||
def play(self, screens, patched=True, env=None, unknown=None, solo=False, ignore_clicks=0, screen=None):
|
||||
if screen is None:
|
||||
screen = EventScreen(screens, unknown=unknown, ignore_clicks=ignore_clicks)
|
||||
cfg = SimpleNamespace(set_win_size=720)
|
||||
avoid_ns = dict(auto=screen, log=mock.Mock())
|
||||
exec(compile(ast.Module(body=[self.avoid_node], type_ignores=[]), str(EVENT), 'exec'), avoid_ns)
|
||||
@@ -309,6 +351,35 @@ class UpstreamEventHandlingTest(unittest.TestCase):
|
||||
def test_env_zero_keeps_upstream(self):
|
||||
self.assertIsNone(ap.install_event_choices(log=self.lines.append, env={ap.EVENT_CHOICES_ENV: '0'}))
|
||||
|
||||
# ---- LCP_EVENT_FALLBACK=1: 表外事件先点第 1 项 ----
|
||||
FALLBACK = {ap.EVENT_FALLBACK_ENV: '1'}
|
||||
|
||||
def test_fallback_clicks_first_option_once_then_lets_upstream_continue(self):
|
||||
# 11-18~11-21 实机: 点完第 1 项选项框还在, 补丁每轮抢先再点, 上游走不到「继续」(同屏连点 10~110 次)
|
||||
screen = StickyEventScreen([['战斗', '离开']])
|
||||
with mock.patch.object(ap.decisions, 'record') as record:
|
||||
self.assertEqual(self.play(None, env=self.FALLBACK, screen=screen), [0])
|
||||
self.assertEqual(screen.continues, 1)
|
||||
self.assertEqual(record.call_args_list, [mock.call('event', 1, 'fallback_first', options=['战斗', '离开'])])
|
||||
self.assertEqual(self.log.count('兜底点第 1 项'), 1)
|
||||
|
||||
def test_fallback_handles_each_new_screen_once(self):
|
||||
screen = StickyEventScreen([['战斗', '离开'], ['好', '不好']])
|
||||
self.assertEqual(self.play(None, env=self.FALLBACK, screen=screen), [0, 0])
|
||||
self.assertEqual(screen.continues, 2)
|
||||
|
||||
def test_fallback_still_upstream_without_env(self):
|
||||
screen = StickyEventScreen([['战斗', '离开']])
|
||||
self.play(None, screen=screen)
|
||||
self.assertNotIn('兜底点第 1 项', self.log)
|
||||
self.assertIn('表里没有这个事件, 交给 AALC', self.log)
|
||||
|
||||
def test_click_lands_on_the_option_row_not_on_matching_narration(self):
|
||||
# 叙述里正好有「特别的」: 原来整屏找子串, 会点到叙述那一行(第 1 项上方)
|
||||
screen = EventScreen([SHEEP])
|
||||
screen.narration = [('特别的', 200, 60)]
|
||||
self.assertEqual(self.play(None, screen=screen), [1])
|
||||
|
||||
|
||||
class InstallEventChoicesTest(unittest.TestCase):
|
||||
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
|
||||
2026-11-16 实测: 游戏窗口被最小化/关掉后, AALC 每帧在 cv2.matchTemplate 上抛
|
||||
「corr.rows <= img.rows + templ.rows - 1」断言, 只记 ERROR 继续跑, 第 2 局空转 4.5 小时。
|
||||
2026-11-22 复查: 只在任务主线程里中止(retry_monitor 线程里抛只会打死那条线程); 要连续出错持续一段时间才算。
|
||||
"""
|
||||
import sys
|
||||
import threading
|
||||
import types
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
@@ -31,7 +33,7 @@ class FakeImageUtils:
|
||||
|
||||
class ImageErrorGuardTest(unittest.TestCase):
|
||||
|
||||
def install(self, fake, clock=None, window=120, limit=3):
|
||||
def install(self, fake, clock=None, span=30, limit=3):
|
||||
self.lines = []
|
||||
module = types.ModuleType('utils.image_utils')
|
||||
module.ImageUtils = fake
|
||||
@@ -39,36 +41,66 @@ class ImageErrorGuardTest(unittest.TestCase):
|
||||
'utils.image_utils': module}):
|
||||
self.assertIsNotNone(ap.install_image_error_guard(
|
||||
log=self.lines.append, clock=clock or (lambda: self.now[0]),
|
||||
window=window, limit=limit))
|
||||
span=span, limit=limit))
|
||||
self.lines.clear() # 安装时那行 "patch: …" 不算
|
||||
return fake
|
||||
|
||||
def setUp(self):
|
||||
self.now = [0.0]
|
||||
|
||||
def fail_frames(self, fake, times, step):
|
||||
for _ in range(times):
|
||||
self.now[0] += step
|
||||
fake.match_template(None, None, None)
|
||||
|
||||
def test_ok_results_never_abort(self):
|
||||
fake = self.install(FakeImageUtils([((5, 5), 0.9)] * 10))
|
||||
for _ in range(10):
|
||||
self.now[0] += 0.1
|
||||
self.assertEqual(fake.match_template(None, None, 0.8), ((5, 5), 0.9))
|
||||
self.assertEqual(fake.match_template(None, None, None), ((5, 5), 0.9))
|
||||
|
||||
def test_sparse_failures_do_not_abort(self):
|
||||
fake = self.install(FakeImageUtils([None, None] + [((1, 1), 0.9)] * 5))
|
||||
self.lines.clear() # 安装时那行 "patch: 截图连续识别失败…" 不算
|
||||
fake.match_template(None, None, 0.8)
|
||||
fake.match_template(None, None, 0.8)
|
||||
self.now[0] += 200 # 窗口滑过去
|
||||
fake.match_template(None, None, 0.8)
|
||||
self.assertEqual(len(self.lines), 0)
|
||||
def test_short_burst_does_not_abort(self):
|
||||
# 68 次/秒的坏帧只持续 1 秒(重启游戏/切分辨率一闪而过): 原来 0.3 秒就停掉整个任务
|
||||
fake = self.install(FakeImageUtils([None] * 68), limit=20)
|
||||
self.fail_frames(fake, 68, 1 / 68)
|
||||
self.assertEqual(self.lines, [])
|
||||
|
||||
def test_storm_aborts_with_clear_message(self):
|
||||
fake = self.install(FakeImageUtils([None] * 10), limit=3)
|
||||
def test_a_success_resets_the_streak(self):
|
||||
fake = self.install(FakeImageUtils([None] * 5 + [((1, 1), 0.9)] + [None] * 5), span=30, limit=3)
|
||||
self.fail_frames(fake, 5, 5) # 25 秒的连续失败
|
||||
self.now[0] += 1
|
||||
fake.match_template(None, None, None) # 成功一次
|
||||
self.fail_frames(fake, 5, 5) # 又 25 秒: 每段都不到 30 秒
|
||||
self.assertEqual(self.lines, [])
|
||||
|
||||
def test_sustained_failure_aborts_with_clear_message(self):
|
||||
fake = self.install(FakeImageUtils([None] * 100), span=30, limit=20)
|
||||
with mock.patch.object(ap.decisions, 'record') as record:
|
||||
with self.assertRaises(ap.TaskAbort):
|
||||
for _ in range(3):
|
||||
self.now[0] += 0.05
|
||||
fake.match_template(None, None, 0.8)
|
||||
self.assertIn('截图连续识别失败', '\n'.join(self.lines))
|
||||
record.assert_called_once()
|
||||
with self.assertRaises(ap.TaskAbort) as caught:
|
||||
self.fail_frames(fake, 100, 1)
|
||||
self.assertEqual(fake.calls, 31) # 第 1 次起算, 持续满 30 秒那一次就停
|
||||
self.assertIn('截图连续识别失败(31 次/30 秒)', str(caught.exception))
|
||||
self.assertIn('[ERROR]', '\n'.join(self.lines))
|
||||
record.assert_called_once_with('image_error', None, 'abort', count=31, seconds=30)
|
||||
|
||||
def test_other_threads_never_abort_and_never_count(self):
|
||||
# retry_monitor 线程也调 match_template; 在那条线程里抛只会打死它, 任务照跑
|
||||
fake = self.install(FakeImageUtils([None] * 200), span=1, limit=3)
|
||||
errors = []
|
||||
|
||||
def monitor():
|
||||
try:
|
||||
self.fail_frames(fake, 50, 1)
|
||||
except BaseException as e: # noqa: B902 - 要看 TaskAbort 是否漏到这条线程
|
||||
errors.append(e)
|
||||
|
||||
worker = threading.Thread(target=monitor)
|
||||
worker.start()
|
||||
worker.join()
|
||||
self.assertEqual(errors, [])
|
||||
self.assertEqual(self.lines, [])
|
||||
with self.assertRaises(ap.TaskAbort), mock.patch.object(ap.decisions, 'record'):
|
||||
self.fail_frames(fake, 3, 1) # 主线程自己的计数从 0 开始: 第 3 次、持续 2 秒才停
|
||||
|
||||
def test_abort_is_not_a_normal_exception(self):
|
||||
# AALC 的 onetime_mir_process 会吞 Exception 再开一局, 熔断必须穿透
|
||||
|
||||
@@ -20,17 +20,24 @@ class RefreshTextPosTest(unittest.TestCase):
|
||||
auto = mock.Mock()
|
||||
with mock.patch.object(ap, '_ocr_lines', return_value=[
|
||||
('商店', 600, 30), ('刷新', 1000, 45), ('关键词刷新', 300, 40)]):
|
||||
self.assertEqual(ap._refresh_text_pos(auto), (1000, 45))
|
||||
self.assertEqual(ap._refresh_text_pos(auto, 720 / 1440), (1000, 45))
|
||||
|
||||
def test_ignores_shop_refresh_on_the_left(self):
|
||||
auto = mock.Mock()
|
||||
with mock.patch.object(ap, '_ocr_lines', return_value=[('关键词刷新', 300, 40)]):
|
||||
self.assertIsNone(ap._refresh_text_pos(auto))
|
||||
self.assertIsNone(ap._refresh_text_pos(auto, 720 / 1440))
|
||||
|
||||
def test_ignores_text_below_the_header(self):
|
||||
auto = mock.Mock()
|
||||
with mock.patch.object(ap, '_ocr_lines', return_value=[('刷新', 1000, 400)]):
|
||||
self.assertIsNone(ap._refresh_text_pos(auto))
|
||||
self.assertIsNone(ap._refresh_text_pos(auto, 720 / 1440))
|
||||
|
||||
def test_box_scales_with_window_size(self):
|
||||
# 1080 窗口: 右上角范围按 set_win_size / 1440 放大, 同一个按钮在 (1500, 70)
|
||||
auto = mock.Mock()
|
||||
with mock.patch.object(ap, '_ocr_lines', return_value=[('刷新', 1500, 70)]):
|
||||
self.assertIsNone(ap._refresh_text_pos(auto, 720 / 1440))
|
||||
self.assertEqual(ap._refresh_text_pos(auto, 1080 / 1440), (1500, 70))
|
||||
|
||||
|
||||
class RefreshClickTest(unittest.TestCase):
|
||||
@@ -38,8 +45,10 @@ class RefreshClickTest(unittest.TestCase):
|
||||
def install(self, auto):
|
||||
module = types.ModuleType('module.automation')
|
||||
module.auto = auto
|
||||
config = types.ModuleType('module.config')
|
||||
config.cfg = types.SimpleNamespace(set_win_size=720)
|
||||
with mock.patch.dict(sys.modules, {'module': types.ModuleType('module'),
|
||||
'module.automation': module}):
|
||||
'module.automation': module, 'module.config': config}):
|
||||
return ap.install_theme_pack_refresh_click(log=lambda *_: None)
|
||||
|
||||
def test_clicks_ocr_position_instead_of_template(self):
|
||||
|
||||
@@ -242,6 +242,7 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
|
||||
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 ()))
|
||||
lookups = []
|
||||
self.refreshes = refreshes = []
|
||||
|
||||
def find_language_text(zh, en, crop):
|
||||
# AALC: 按表的顺序, 第一个(去空格、不分大小写)是卡面文字子串的键
|
||||
@@ -257,7 +258,7 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
|
||||
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_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))
|
||||
ns = dict(auto=auto, TextMatchResult=Match, sleep=lambda *a: None, back_init_menu=mock.Mock(),
|
||||
log=logging.getLogger('AALC'), theme_list=theme_list,
|
||||
@@ -340,6 +341,22 @@ class UpstreamSelectThemePackTest(unittest.TestCase):
|
||||
self.assertEqual(picked, '落泪者们')
|
||||
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):
|
||||
# 兔子洞编队没有体系; 困难模式 AALC 默认「绝望」「号线」都是 -5, 不加分拿 0 分的落泪者们
|
||||
route = ap.load_rabbit_hole()['theme_packs']
|
||||
|
||||
Reference in New Issue
Block a user