P1-3 镜牢饰品选择按体系关键词排序
- 包住 Mirror.acquire_ego_gift(type=1):上游取到卡片列表时整屏 OCR 一次,
按坐标把文字归到卡上,命中当前体系关键词行数多的排前面;排序稳定,
白棉花、已持有、体系图标仍由上游原逻辑处理,调用结束还原 find_element
- OCR 读引擎逐行结果,不用会合并同名文本的 {文本: 坐标},也不用 my_crop
- 关键词表 lc_mcp/data/gift_keywords.json,匹配前做与选队相同的归一(含震颐/沉论误读)
- LCP_GIFT_KEYWORDS=0 关闭(与上游完全一致),=<路径> 换表;表读不了记 [ERROR] 不装
- 单测执行上游真实 acquire_ego_gift,覆盖两张/三张卡、选一/选二、已持有、白棉花、误读
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -167,6 +167,8 @@ MCP 初始化说明与工具描述均指导 AI 优先使用 AALC:常规日常
|
|||||||
否则接受这一屏唯一的"名字+后缀"(`流血队`、`流血(X)`),多条就不点。没找到时日志列出每屏看到的名字。
|
否则接受这一屏唯一的"名字+后缀"(`流血队`、`流血(X)`),多条就不点。没找到时日志列出每屏看到的名字。
|
||||||
- **键盘寻路按节点类型**:开着简单键盘寻路时不再只按 ↑。先识别巴士右侧下一列的节点类型,
|
- **键盘寻路按节点类型**:开着简单键盘寻路时不再只按 ↑。先识别巴士右侧下一列的节点类型,
|
||||||
按上游权重(事件 < 商店 < 战斗 < …)依次按方向键,进不去再退回 ↑;不拖地图。`LCP_TYPED_ROAD=0` 关闭。
|
按上游权重(事件 < 商店 < 战斗 < …)依次按方向键,进不去再退回 ↑;不拖地图。`LCP_TYPED_ROAD=0` 关闭。
|
||||||
|
- **饰品选择按体系关键词**:镜牢路上的饰品 N 选一,先整屏 OCR,按卡面上命中当前体系关键词的行数给卡排序,
|
||||||
|
再交给 AALC 原逻辑(跳过白棉花、已持有排后)。关键词表在 `lc_mcp/data/gift_keywords.json`。
|
||||||
|
|
||||||
## 无人值守
|
## 无人值守
|
||||||
|
|
||||||
@@ -216,6 +218,7 @@ powershell -ExecutionPolicy Bypass -File scripts\install_convert_task.ps1 -Every
|
|||||||
| `LCP_KEEP_SHOTS` | 30 | 截图保留张数 |
|
| `LCP_KEEP_SHOTS` | 30 | 截图保留张数 |
|
||||||
| `LCP_ALLOW_LUNACY` | 未设置 | 设为 `1` 时允许预检放行 `set_lunacy_to_enkephalin` 不为 0 的配置 |
|
| `LCP_ALLOW_LUNACY` | 未设置 | 设为 `1` 时允许预检放行 `set_lunacy_to_enkephalin` 不为 0 的配置 |
|
||||||
| `LCP_TYPED_ROAD` | 未设置 | 设为 `0` 时镜牢简单键盘寻路保持上游的"只按 ↑",不按节点类型选方向 |
|
| `LCP_TYPED_ROAD` | 未设置 | 设为 `0` 时镜牢简单键盘寻路保持上游的"只按 ↑",不按节点类型选方向 |
|
||||||
|
| `LCP_GIFT_KEYWORDS` | 未设置 | 设为 `0` 时饰品选择不按体系关键词排序;设为 JSON 文件路径时用它代替 `lc_mcp/data/gift_keywords.json` |
|
||||||
| `LCP_KILL_KEY` | `end` | 任务子进程的急停键,如 `pause` / `scrolllock`;认不出的键名会报错而不是换成默认键 |
|
| `LCP_KILL_KEY` | `end` | 任务子进程的急停键,如 `pause` / `scrolllock`;认不出的键名会报错而不是换成默认键 |
|
||||||
| `LC_PY` | 当前解释器 | `levelup.py`/`auto_cycle.py` 调用 MCP 用的 Python |
|
| `LC_PY` | 当前解释器 | `levelup.py`/`auto_cycle.py` 调用 MCP 用的 Python |
|
||||||
|
|
||||||
|
|||||||
@@ -109,6 +109,24 @@ Dijkstra 那套(`search_road.py:735`,代价 event 1 / shop 2 / battle 4 / bo
|
|||||||
|
|
||||||
**风险**:中。OCR 有误读(`震颐`/`沉论`/`编#16`),关键词要容忍错字。
|
**风险**:中。OCR 有误读(`震颐`/`沉论`/`编#16`),关键词要容忍错字。
|
||||||
|
|
||||||
|
**状态(2026-11-14 云端)**:已实现,待实机验收。
|
||||||
|
|
||||||
|
- 核对上游时发现「完全不看体系」只对一张、两张卡成立:三张卡时 `acquire_ego_gift` 会用
|
||||||
|
`acquire_ego_gift/<体系>.png` 图标模板(阈值 0.85)把命中的卡排前面,只是没有日志能证明它在本机生效。
|
||||||
|
- 做法:`install_gift_preference()` 包住 `Mirror.acquire_ego_gift`(只管 `type=1` 的选卡界面,`type=2` 拒绝饰品原样放行)。
|
||||||
|
调用期间临时替换 `auto.find_element`:上游取到卡片列表(`acquire_ego_gift_card.png`,多目标)时,
|
||||||
|
整屏 OCR 一次,按坐标把每行文字归到卡上(范围与上游判断白棉花/已持有的一致),命中体系关键词行数多的排前面。
|
||||||
|
排序稳定,之后上游原逻辑照旧:白棉花跳过、已持有排后、体系图标命中的仍插到最前。调用结束还原 `find_element`。
|
||||||
|
- OCR 直接读引擎的逐行结果,不用 `_run_ocr_for_text` 的 `{文本: 坐标}`(两张卡上同一句会被合并成一条)。不用 `my_crop`。
|
||||||
|
- 关键词表 `lc_mcp/data/gift_keywords.json`(JSON,不加依赖);匹配前做与选队相同的归一(空白/全半角/`震颐` 等误读),
|
||||||
|
英文不分大小写。表读不了记 `[ERROR]` 并不装补丁。
|
||||||
|
- 回滚:`LCP_GIFT_KEYWORDS=0` 不装补丁,行为与上游完全一致;`LCP_GIFT_KEYWORDS=<路径>` 换表。
|
||||||
|
- 只按主体系;第二体系仍只由上游的图标匹配处理。
|
||||||
|
- 单测执行上游真实的 `acquire_ego_gift`(`tests/test_gift_preference.py`),覆盖两张/三张卡、选一/选二、
|
||||||
|
已持有、白棉花、全是白棉花、误读、无命中。
|
||||||
|
- 实机验收:日志 `[lc_mcp] 饰品选择(体系 bleed): 第1张=0 第2张=1(流血) 第3张=0; 命中体系关键词, 先看第2张`;
|
||||||
|
统计「命中体系关键词」与「未命中体系关键词」的行数即得命中比例。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## P1-4 事件选项策略可配
|
## P1-4 事件选项策略可配
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
一次, 之后全部模板匹配分数掉到阈值以下, 表现为原地空转、不报错。这里在后台定期
|
一次, 之后全部模板匹配分数掉到阈值以下, 表现为原地空转、不报错。这里在后台定期
|
||||||
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
||||||
"""
|
"""
|
||||||
|
import json
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import threading
|
import threading
|
||||||
@@ -821,3 +822,151 @@ def install_typed_keyboard_road(log=print, env=None):
|
|||||||
mirror_mod.search_road_simple_keyboard = search_road_simple_keyboard
|
mirror_mod.search_road_simple_keyboard = search_road_simple_keyboard
|
||||||
log('[lc_mcp] patch: 镜牢键盘寻路按节点类型选方向(不拖地图)')
|
log('[lc_mcp] patch: 镜牢键盘寻路按节点类型选方向(不拖地图)')
|
||||||
return original
|
return original
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------- 饰品选择按体系关键词
|
||||||
|
|
||||||
|
# 2026-11-14 核对: acquire_ego_gift() 两张卡时只看白棉花和已持有, 拿第一张; 三张卡时虽然用
|
||||||
|
# acquire_ego_gift/<体系>.png 做图标匹配(阈值 0.85), 但日志里从没见它起作用。这里在上游挑选之前,
|
||||||
|
# 按卡面 OCR 文本里的体系关键词把卡重新排序; 白棉花、已持有、体系图标仍由上游处理(排序稳定)。
|
||||||
|
GIFT_KEYWORDS_ENV = 'LCP_GIFT_KEYWORDS' # 0 = 关闭; 文件路径 = 用这张表代替默认表
|
||||||
|
GIFT_KEYWORDS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data', 'gift_keywords.json')
|
||||||
|
GIFT_CARD = 'mirror/road_in_mir/acquire_ego_gift_card.png'
|
||||||
|
GIFT_CARD_BOX = (-50, -300, 450, 350) # 上游判断白棉花/已持有时每张卡的范围(相对卡片匹配点, 1440 标定)
|
||||||
|
|
||||||
|
|
||||||
|
def load_gift_keywords(path=GIFT_KEYWORDS_FILE):
|
||||||
|
"""读关键词表 {体系: (关键词, ...)}; 以 _ 开头的键是说明。格式不对抛 ValueError。"""
|
||||||
|
with open(path, encoding='utf-8') as f:
|
||||||
|
raw = json.load(f)
|
||||||
|
if not isinstance(raw, dict):
|
||||||
|
raise ValueError('顶层应是 {体系: [关键词]}')
|
||||||
|
table = {}
|
||||||
|
for system, words in raw.items():
|
||||||
|
if str(system).startswith('_'):
|
||||||
|
continue
|
||||||
|
if not isinstance(words, list) or not all(isinstance(w, str) for w in words):
|
||||||
|
raise ValueError('%s 的值应是字符串列表' % system)
|
||||||
|
table[str(system)] = tuple(w for w in words if normalize_team_name(w))
|
||||||
|
return table
|
||||||
|
|
||||||
|
|
||||||
|
def _ocr_lines(auto):
|
||||||
|
"""整屏 OCR 的每一行 [(文本, x, y)]。直接用 OCR 引擎, 不经 _run_ocr_for_text 的 {文本: 坐标}:
|
||||||
|
同一句描述出现在两张卡上时 dict 只留一条。引擎不可用时退回 _team_ocr。"""
|
||||||
|
try:
|
||||||
|
from module.ocr import ocr as engine
|
||||||
|
except Exception:
|
||||||
|
return _team_ocr(auto)
|
||||||
|
result = engine.run(auto.screenshot)
|
||||||
|
texts, boxes = getattr(result, 'txts', None), getattr(result, 'boxes', None)
|
||||||
|
if texts is None or boxes is None:
|
||||||
|
return []
|
||||||
|
lines = []
|
||||||
|
for text, box in zip(texts, boxes):
|
||||||
|
try:
|
||||||
|
lines.append((str(text), (float(box[0][0]) + float(box[2][0])) / 2,
|
||||||
|
(float(box[0][1]) + float(box[2][1])) / 2))
|
||||||
|
except (TypeError, IndexError, ValueError):
|
||||||
|
continue
|
||||||
|
return lines
|
||||||
|
|
||||||
|
|
||||||
|
def gift_card_hits(cards, lines, keywords, scale):
|
||||||
|
"""每张卡上命中关键词的行: [[关键词, ...], ...], 与 cards 一一对应。
|
||||||
|
|
||||||
|
行按坐标归到卡上(范围与上游一致); 落在两张卡的范围里时归给水平方向更近的那张。
|
||||||
|
"""
|
||||||
|
left, top, right, bottom = (v * scale for v in GIFT_CARD_BOX)
|
||||||
|
boxes = [(float(c[0]) + left, float(c[1]) + top, float(c[0]) + right, float(c[1]) + bottom) for c in cards]
|
||||||
|
words = [(w, normalize_team_name(w).lower()) for w in keywords]
|
||||||
|
hits = [[] for _ in cards]
|
||||||
|
for text, x, y in lines:
|
||||||
|
clean = normalize_team_name(text).lower()
|
||||||
|
found = [w for w, key in words if key and key in clean]
|
||||||
|
if not found:
|
||||||
|
continue
|
||||||
|
inside = [i for i, (x1, y1, x2, y2) in enumerate(boxes) if x1 <= x <= x2 and y1 <= y <= y2]
|
||||||
|
if inside:
|
||||||
|
i = min(inside, key=lambda i: abs(x - (boxes[i][0] + boxes[i][2]) / 2))
|
||||||
|
hits[i].append(found[0])
|
||||||
|
return hits
|
||||||
|
|
||||||
|
|
||||||
|
def gift_card_order(hits):
|
||||||
|
"""卡的下标, 命中行数多的排前面, 一样多保持原顺序。"""
|
||||||
|
return sorted(range(len(hits)), key=lambda i: -len(hits[i]))
|
||||||
|
|
||||||
|
|
||||||
|
def rank_gift_cards(cards, hits):
|
||||||
|
return [cards[i] for i in gift_card_order(hits)]
|
||||||
|
|
||||||
|
|
||||||
|
def install_gift_preference(log=print, env=None):
|
||||||
|
"""饰品选择(镜牢路上的 N 选一)先按体系关键词给卡排序。返回原方法, 未安装返回 None。"""
|
||||||
|
env = os.environ if env is None else env
|
||||||
|
setting = (env.get(GIFT_KEYWORDS_ENV) or '').strip()
|
||||||
|
if setting == '0':
|
||||||
|
log('[lc_mcp] 饰品体系优先补丁已关闭(%s=0), 沿用 AALC 原逻辑' % GIFT_KEYWORDS_ENV)
|
||||||
|
return None
|
||||||
|
path = setting or GIFT_KEYWORDS_FILE
|
||||||
|
try:
|
||||||
|
table = load_gift_keywords(path)
|
||||||
|
except (OSError, ValueError) as e:
|
||||||
|
log('[ERROR] [lc_mcp] 饰品体系优先补丁跳过: 关键词表 %s 读不了(%s: %s)' % (path, type(e).__name__, e))
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
from tasks.mirror import mirror as mirror_mod
|
||||||
|
from module.automation import auto
|
||||||
|
from module.config import cfg
|
||||||
|
except Exception as e:
|
||||||
|
log('[lc_mcp] 饰品体系优先补丁跳过: 无法导入 %s' % e)
|
||||||
|
return None
|
||||||
|
original = getattr(getattr(mirror_mod, 'Mirror', None), 'acquire_ego_gift', None)
|
||||||
|
if original is None:
|
||||||
|
log('[lc_mcp] 饰品体系优先补丁跳过: 上游没有 Mirror.acquire_ego_gift')
|
||||||
|
return None
|
||||||
|
|
||||||
|
def prefer(cards, system, keywords):
|
||||||
|
hits = gift_card_hits(cards, _ocr_lines(auto), keywords, cfg.set_win_size / 1440)
|
||||||
|
order = gift_card_order(hits)
|
||||||
|
by_x = sorted(range(len(cards)), key=lambda i: float(cards[i][0])) # 日志按从左到右编号
|
||||||
|
detail = ' '.join('第%d张=%d%s' % (n + 1, len(hits[i]), '(%s)' % '/'.join(hits[i]) if hits[i] else '')
|
||||||
|
for n, i in enumerate(by_x))
|
||||||
|
if any(hits):
|
||||||
|
log('[lc_mcp] 饰品选择(体系 %s): %s; 命中体系关键词, 先看第%d张'
|
||||||
|
% (system, detail, by_x.index(order[0]) + 1))
|
||||||
|
else:
|
||||||
|
log('[lc_mcp] 饰品选择(体系 %s): %s; 未命中体系关键词, 保持原顺序' % (system, detail))
|
||||||
|
return [cards[i] for i in order]
|
||||||
|
|
||||||
|
def acquire_ego_gift(self, *args, **kwargs):
|
||||||
|
system = getattr(self, 'system', '')
|
||||||
|
keywords = table.get(system, ())
|
||||||
|
if kwargs.get('type', args[0] if args else 1) != 1 or not keywords: # type=2 是"拒绝饰品"界面
|
||||||
|
return original(self, *args, **kwargs)
|
||||||
|
real = auto.find_element
|
||||||
|
own = vars(auto).get('find_element')
|
||||||
|
|
||||||
|
def find_element(target, *a, **kw):
|
||||||
|
found = real(target, *a, **kw)
|
||||||
|
find_type = kw.get('find_type', a[0] if a else 'image')
|
||||||
|
if target == GIFT_CARD and find_type == 'image_with_multiple_targets' and found and len(found) > 1:
|
||||||
|
try:
|
||||||
|
return prefer(list(found), system, keywords)
|
||||||
|
except Exception as e:
|
||||||
|
log('[lc_mcp] 饰品选择: 关键词排序出错(%s: %s), 沿用原顺序' % (type(e).__name__, e))
|
||||||
|
return found
|
||||||
|
|
||||||
|
auto.find_element = find_element
|
||||||
|
try:
|
||||||
|
return original(self, *args, **kwargs)
|
||||||
|
finally:
|
||||||
|
if own is None:
|
||||||
|
vars(auto).pop('find_element', None)
|
||||||
|
else:
|
||||||
|
auto.find_element = own
|
||||||
|
|
||||||
|
mirror_mod.Mirror.acquire_ego_gift = acquire_ego_gift
|
||||||
|
log('[lc_mcp] patch: 镜牢饰品选择按体系关键词排序(%s)' % os.path.basename(path))
|
||||||
|
return original
|
||||||
|
|||||||
+2
-1
@@ -13,7 +13,7 @@ from . import killswitch, preflight
|
|||||||
from .aalc_engine import bootstrap
|
from .aalc_engine import bootstrap
|
||||||
from .aalc_patches import (WindowGuard, driver_click_tasks, headless_hdr_warning,
|
from .aalc_patches import (WindowGuard, driver_click_tasks, headless_hdr_warning,
|
||||||
install_default_battle_team, install_exact_team_match,
|
install_default_battle_team, install_exact_team_match,
|
||||||
install_robust_set_foreground, install_shop_lists,
|
install_gift_preference, install_robust_set_foreground, install_shop_lists,
|
||||||
install_system_team_selection, install_typed_keyboard_road,
|
install_system_team_selection, install_typed_keyboard_road,
|
||||||
mirror_progress, stop_driver_click)
|
mirror_progress, stop_driver_click)
|
||||||
from .game_lock import GameBusyError, exclusive_game
|
from .game_lock import GameBusyError, exclusive_game
|
||||||
@@ -130,6 +130,7 @@ def _run(task, params):
|
|||||||
install_system_team_selection(log=log)
|
install_system_team_selection(log=log)
|
||||||
install_shop_lists(log=log)
|
install_shop_lists(log=log)
|
||||||
install_typed_keyboard_road(log=log)
|
install_typed_keyboard_road(log=log)
|
||||||
|
install_gift_preference(log=log)
|
||||||
guard = WindowGuard(screen, cfg, log=log)
|
guard = WindowGuard(screen, cfg, log=log)
|
||||||
guard.start()
|
guard.start()
|
||||||
restore_path = os.environ.get(RESTORE_ENV)
|
restore_path = os.environ.get(RESTORE_ENV)
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"_说明": [
|
||||||
|
"镜牢饰品三选一/二选一按体系关键词排序(BACKLOG P1-3)。键是 AALC 的体系名(all_systems), 值是关键词。",
|
||||||
|
"卡面 OCR 文本先归一(去空白、全角转半角、改回 震颐/沉论 等实测误读), 英文不分大小写, 子串命中即算。",
|
||||||
|
"命中行数多的卡排前面; 白棉花、已持有仍按 AALC 原逻辑处理。整表关闭: 任务环境变量 LCP_GIFT_KEYWORDS=0。",
|
||||||
|
"以 _ 开头的键会被忽略。"
|
||||||
|
],
|
||||||
|
"burn": ["烧伤", "burn"],
|
||||||
|
"bleed": ["流血", "出血", "bleed"],
|
||||||
|
"tremor": ["震颤", "tremor"],
|
||||||
|
"rupture": ["破裂", "rupture"],
|
||||||
|
"sinking": ["沉沦", "sinking"],
|
||||||
|
"poise": ["呼吸", "poise"],
|
||||||
|
"charge": ["充能", "charge"],
|
||||||
|
"slash": ["斩击", "slash"],
|
||||||
|
"pierce": ["突刺", "pierce"],
|
||||||
|
"blunt": ["打击", "blunt"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""镜牢饰品选择按体系关键词排序(BACKLOG P1-3)。
|
||||||
|
|
||||||
|
2026-11-14 核对: acquire_ego_gift() 两张卡时只排白棉花和已持有然后拿第一张, 不看 team_system。
|
||||||
|
补丁在上游挑选前按卡面 OCR 的体系关键词给卡排序; 端到端用例执行上游真实的 acquire_ego_gift。
|
||||||
|
"""
|
||||||
|
import ast
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
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'
|
||||||
|
SCALE = 720 / 1440
|
||||||
|
|
||||||
|
|
||||||
|
def line_at(card, row):
|
||||||
|
"""卡面第 row 行文字的位置(在上游判断范围内)。"""
|
||||||
|
return card[0] + 100 * SCALE * 2, card[1] + 40 * row
|
||||||
|
|
||||||
|
|
||||||
|
class GiftCardHitsTest(unittest.TestCase):
|
||||||
|
|
||||||
|
CARDS = [(300, 300), (600, 300), (900, 300)]
|
||||||
|
|
||||||
|
def hits(self, lines, keywords=('流血', '出血', 'bleed')):
|
||||||
|
return ap.gift_card_hits(self.CARDS, lines, keywords, SCALE)
|
||||||
|
|
||||||
|
def test_lines_are_assigned_to_the_card_they_sit_on(self):
|
||||||
|
lines = [('施加3层流血', *line_at(self.CARDS[1], 0)),
|
||||||
|
('出血时伤害提高', *line_at(self.CARDS[1], 1)),
|
||||||
|
('烧伤', *line_at(self.CARDS[0], 0)),
|
||||||
|
('选择EGO饰品', 600, 40)] # 标题不在任何卡上
|
||||||
|
self.assertEqual(self.hits(lines), [[], ['流血', '出血'], []])
|
||||||
|
|
||||||
|
def test_english_is_case_insensitive_and_spaces_are_ignored(self):
|
||||||
|
lines = [('Inflict BLEED', *line_at(self.CARDS[2], 0)), ('流 血', *line_at(self.CARDS[0], 0))]
|
||||||
|
self.assertEqual(self.hits(lines), [['流血'], [], ['bleed']])
|
||||||
|
|
||||||
|
def test_known_ocr_misreads_still_hit(self):
|
||||||
|
lines = [('施加震颐', *line_at(self.CARDS[0], 0)), ('沉论层数', *line_at(self.CARDS[1], 0))]
|
||||||
|
self.assertEqual(ap.gift_card_hits(self.CARDS, lines, ('震颤',), SCALE), [['震颤'], [], []])
|
||||||
|
self.assertEqual(ap.gift_card_hits(self.CARDS, lines, ('沉沦',), SCALE), [[], ['沉沦'], []])
|
||||||
|
|
||||||
|
def test_overlapping_ranges_go_to_the_nearest_card(self):
|
||||||
|
cards = [(300, 300), (450, 300)] # 两张卡的范围在 x=425..525 重叠
|
||||||
|
lines = [('流血', 440, 300), ('流血', 500, 300)]
|
||||||
|
self.assertEqual(ap.gift_card_hits(cards, lines, ('流血',), SCALE), [['流血'], ['流血']])
|
||||||
|
|
||||||
|
def test_rank_is_stable(self):
|
||||||
|
cards = ['a', 'b', 'c']
|
||||||
|
self.assertEqual(ap.rank_gift_cards(cards, [[], ['x'], []]), ['b', 'a', 'c'])
|
||||||
|
self.assertEqual(ap.rank_gift_cards(cards, [[], [], []]), cards)
|
||||||
|
self.assertEqual(ap.rank_gift_cards(cards, [['x'], ['x', 'y'], ['x']]), ['b', 'a', 'c'])
|
||||||
|
|
||||||
|
|
||||||
|
class KeywordTableTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def test_shipped_table_covers_every_upstream_system(self):
|
||||||
|
table = ap.load_gift_keywords()
|
||||||
|
source = AALC / 'tasks' / '__init__.py'
|
||||||
|
if source.is_file():
|
||||||
|
tree = ast.parse(source.read_text(encoding='utf-8'))
|
||||||
|
node = next(n for n in tree.body if isinstance(n, ast.Assign)
|
||||||
|
and getattr(n.targets[0], 'id', None) == 'all_systems')
|
||||||
|
self.assertEqual(set(table), set(ast.literal_eval(node.value).values()))
|
||||||
|
for system, words in table.items():
|
||||||
|
self.assertTrue(words, system)
|
||||||
|
|
||||||
|
def test_bad_files_raise_value_error(self):
|
||||||
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
path = os.path.join(tmp, 'k.json')
|
||||||
|
for content in ('[]', '{"bleed": "流血"}', '{"bleed": [1]}', '{'):
|
||||||
|
with self.subTest(content=content):
|
||||||
|
with open(path, 'w', encoding='utf-8') as f:
|
||||||
|
f.write(content)
|
||||||
|
with self.assertRaises(ValueError):
|
||||||
|
ap.load_gift_keywords(path)
|
||||||
|
|
||||||
|
def test_notes_are_ignored(self):
|
||||||
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
|
path = os.path.join(tmp, 'k.json')
|
||||||
|
with open(path, 'w', encoding='utf-8') as f:
|
||||||
|
json.dump({'_说明': ['x'], 'bleed': ['流血', ' ']}, f, ensure_ascii=False)
|
||||||
|
self.assertEqual(ap.load_gift_keywords(path), {'bleed': ('流血',)})
|
||||||
|
|
||||||
|
|
||||||
|
class GiftScreen:
|
||||||
|
"""饰品选择界面: 每张卡 {'pos', 'lines'}; 系统图标模板永远匹配不上(本机现状)。"""
|
||||||
|
|
||||||
|
def __init__(self, cards, pick='0/1'):
|
||||||
|
self.cards = cards
|
||||||
|
self.pick = pick
|
||||||
|
self.clicks = []
|
||||||
|
self.ocr_runs = 0
|
||||||
|
self.model = None
|
||||||
|
self.screenshot = object()
|
||||||
|
|
||||||
|
def lines(self):
|
||||||
|
return [(text, *line_at(card['pos'], row))
|
||||||
|
for card in self.cards for row, text in enumerate(card['lines'])]
|
||||||
|
|
||||||
|
def take_screenshot(self):
|
||||||
|
return self.screenshot
|
||||||
|
|
||||||
|
def mouse_to_blank(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def click_element(self, target, **kwargs):
|
||||||
|
return target.endswith('acquire_ego_gift_select_assets.png')
|
||||||
|
|
||||||
|
def find_element(self, target, find_type='image', threshold=0.8, my_crop=None, **kwargs):
|
||||||
|
if target == ap.GIFT_CARD and find_type == 'image_with_multiple_targets':
|
||||||
|
return [card['pos'] for card in self.cards]
|
||||||
|
return False
|
||||||
|
|
||||||
|
def find_language_text(self, zh_text, en_text, my_crop=None, **kwargs):
|
||||||
|
words = [zh_text] if isinstance(zh_text, str) else zh_text
|
||||||
|
x1, y1, x2, y2 = my_crop
|
||||||
|
for text, x, y in self.lines():
|
||||||
|
if x1 <= x <= x2 and y1 <= y <= y2 and any(w in text for w in words):
|
||||||
|
return [x, y]
|
||||||
|
return False
|
||||||
|
|
||||||
|
def find_text_element(self, targets, my_crop=None, **kwargs):
|
||||||
|
return self.pick in targets
|
||||||
|
|
||||||
|
def mouse_click(self, x, y):
|
||||||
|
self.clicks.append((x, y))
|
||||||
|
|
||||||
|
def run(self, image):
|
||||||
|
self.ocr_runs += 1
|
||||||
|
lines = self.lines()
|
||||||
|
return SimpleNamespace(txts=tuple(t for t, _, _ in lines),
|
||||||
|
boxes=[[[x - 10, y - 5], [x + 10, y - 5], [x + 10, y + 5], [x - 10, y + 5]]
|
||||||
|
for _, x, y in lines])
|
||||||
|
|
||||||
|
|
||||||
|
def card(x, *lines):
|
||||||
|
return {'pos': (x, 300), 'lines': list(lines)}
|
||||||
|
|
||||||
|
|
||||||
|
@unittest.skipUnless(MIRROR.is_file(), 'vendor/aalc 子模块未检出')
|
||||||
|
class UpstreamAcquireEgoGiftTest(unittest.TestCase):
|
||||||
|
"""执行上游真实的 Mirror.acquire_ego_gift, 看最后点了哪张卡。"""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.lines = []
|
||||||
|
tree = ast.parse(MIRROR.read_text(encoding='utf-8'))
|
||||||
|
cls = next(n for n in tree.body if isinstance(n, ast.ClassDef) and n.name == 'Mirror')
|
||||||
|
self.fn_node = next(n for n in cls.body if isinstance(n, ast.FunctionDef) and n.name == 'acquire_ego_gift')
|
||||||
|
|
||||||
|
def choose(self, cards, system='bleed', patched=True, pick='0/1', env=None):
|
||||||
|
screen = GiftScreen(cards, pick=pick)
|
||||||
|
cfg = SimpleNamespace(set_win_size=720, not_skip_whitegossypium=False, mouse_action_interval=0)
|
||||||
|
ns = dict(cfg=cfg, auto=screen, sleep=lambda *a: None, time=SimpleNamespace(sleep=lambda *a: None),
|
||||||
|
retry=lambda: True, log=mock.Mock(),
|
||||||
|
ImageUtils=SimpleNamespace(get_bbox=lambda image: None, load_image=lambda path: None),
|
||||||
|
all_systems={0: 'burn', 1: 'bleed'})
|
||||||
|
exec(compile(ast.Module(body=[self.fn_node], type_ignores=[]), str(MIRROR), 'exec'), ns)
|
||||||
|
mirror_cls = type('Mirror', (), {'acquire_ego_gift': ns['acquire_ego_gift']})
|
||||||
|
mirror_mod = types.ModuleType('tasks.mirror.mirror')
|
||||||
|
mirror_mod.Mirror = mirror_cls
|
||||||
|
package = types.ModuleType('tasks.mirror')
|
||||||
|
package.mirror = mirror_mod
|
||||||
|
modules = {'tasks': types.ModuleType('tasks'), 'tasks.mirror': package, 'tasks.mirror.mirror': mirror_mod,
|
||||||
|
'module': types.ModuleType('module'),
|
||||||
|
'module.automation': SimpleNamespace(auto=screen),
|
||||||
|
'module.config': SimpleNamespace(cfg=cfg),
|
||||||
|
'module.ocr': SimpleNamespace(ocr=screen)}
|
||||||
|
with mock.patch.dict(sys.modules, modules):
|
||||||
|
if patched:
|
||||||
|
self.assertIsNotNone(ap.install_gift_preference(log=self.lines.append, env=env or {}))
|
||||||
|
mirror = mirror_cls()
|
||||||
|
mirror.system, mirror.second_system = system, False
|
||||||
|
mirror.acquire_ego_gift()
|
||||||
|
self.assertNotIn('find_element', vars(screen), 'find_element 必须还原')
|
||||||
|
return [next(i for i, c in enumerate(cards) if c['pos'] == pos) for pos in screen.clicks], screen
|
||||||
|
|
||||||
|
@property
|
||||||
|
def log(self):
|
||||||
|
return '\n'.join(self.lines)
|
||||||
|
|
||||||
|
def test_two_cards_prefers_the_system_keyword(self):
|
||||||
|
cards = [card(300, '烧伤层数+1'), card(600, '施加2层流血')]
|
||||||
|
self.assertEqual(self.choose(cards, patched=False)[0], [0])
|
||||||
|
self.assertEqual(self.choose(cards)[0], [1])
|
||||||
|
self.assertIn('第1张=0 第2张=1(流血); 命中体系关键词, 先看第2张', self.log)
|
||||||
|
|
||||||
|
def test_owned_keyword_card_still_loses_to_an_unowned_one(self):
|
||||||
|
cards = [card(300, '烧伤层数+1'), card(600, '施加2层流血', '已持有')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], [0])
|
||||||
|
|
||||||
|
def test_all_owned_falls_back_to_keyword_order(self):
|
||||||
|
cards = [card(300, '烧伤', '已持有'), card(600, '流血', '已持有')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], [1])
|
||||||
|
|
||||||
|
def test_white_gossypium_is_still_skipped(self):
|
||||||
|
cards = [card(300, '烧伤层数+1'), card(600, '白棉花', '流血')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], [0])
|
||||||
|
|
||||||
|
def test_all_white_gossypium_behaves_like_upstream(self):
|
||||||
|
cards = [card(300, '白棉花'), card(600, '白棉花', '流血')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], self.choose(cards, patched=False)[0])
|
||||||
|
|
||||||
|
def test_three_cards_pick_one(self):
|
||||||
|
cards = [card(300, '烧伤'), card(600, '震颤'), card(900, '流血伤害提高', '出血')]
|
||||||
|
self.assertEqual(self.choose(cards, patched=False)[0], [0])
|
||||||
|
self.assertEqual(self.choose(cards)[0], [2])
|
||||||
|
|
||||||
|
def test_three_cards_pick_two(self):
|
||||||
|
cards = [card(300, '烧伤'), card(600, '流血'), card(900, '流血', '出血')]
|
||||||
|
self.assertEqual(self.choose(cards, pick='0/2')[0], [2, 1])
|
||||||
|
|
||||||
|
def test_misread_keyword_for_tremor(self):
|
||||||
|
cards = [card(300, '流血'), card(600, '施加震颐')]
|
||||||
|
self.assertEqual(self.choose(cards, system='tremor')[0], [1])
|
||||||
|
|
||||||
|
def test_no_hits_keeps_upstream_choice(self):
|
||||||
|
cards = [card(300, '烧伤'), card(600, '充能')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], [0])
|
||||||
|
self.assertIn('未命中体系关键词, 保持原顺序', self.log)
|
||||||
|
|
||||||
|
def test_duplicate_lines_on_two_cards_both_count(self):
|
||||||
|
# {文本: 坐标} 会把两张卡上的同一句合并成一条; 补丁直接读 OCR 引擎的逐行结果
|
||||||
|
cards = [card(300, '流血'), card(600, '流血', '出血')]
|
||||||
|
self.assertEqual(self.choose(cards)[0], [1])
|
||||||
|
self.assertIn('第1张=1(流血) 第2张=2(流血/出血)', self.log)
|
||||||
|
|
||||||
|
def test_unknown_system_skips_ocr(self):
|
||||||
|
cards = [card(300, '烧伤'), card(600, '流血')]
|
||||||
|
chosen, screen = self.choose(cards, system='unknown')
|
||||||
|
self.assertEqual((chosen, screen.ocr_runs), ([0], 0))
|
||||||
|
|
||||||
|
|
||||||
|
class InstallGiftPreferenceTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.lines = []
|
||||||
|
self.original = mock.Mock(return_value='done')
|
||||||
|
self.mirror_cls = type('Mirror', (), {'acquire_ego_gift': self.original})
|
||||||
|
mirror_mod = types.ModuleType('tasks.mirror.mirror')
|
||||||
|
mirror_mod.Mirror = self.mirror_cls
|
||||||
|
package = types.ModuleType('tasks.mirror')
|
||||||
|
package.mirror = mirror_mod
|
||||||
|
self.auto = SimpleNamespace(find_element=mock.Mock(return_value=[(300, 300), (600, 300)]))
|
||||||
|
modules = {'tasks': types.ModuleType('tasks'), 'tasks.mirror': package, 'tasks.mirror.mirror': mirror_mod,
|
||||||
|
'module': types.ModuleType('module'),
|
||||||
|
'module.automation': SimpleNamespace(auto=self.auto),
|
||||||
|
'module.config': SimpleNamespace(cfg=SimpleNamespace(set_win_size=720))}
|
||||||
|
patcher = mock.patch.dict(sys.modules, modules)
|
||||||
|
patcher.start()
|
||||||
|
self.addCleanup(patcher.stop)
|
||||||
|
|
||||||
|
def install(self, env=None):
|
||||||
|
return ap.install_gift_preference(log=self.lines.append, env=env or {})
|
||||||
|
|
||||||
|
def test_env_zero_leaves_upstream_untouched(self):
|
||||||
|
self.assertIsNone(self.install({ap.GIFT_KEYWORDS_ENV: '0'}))
|
||||||
|
self.assertIs(self.mirror_cls.acquire_ego_gift, self.original)
|
||||||
|
|
||||||
|
def test_unreadable_table_is_an_error_and_not_installed(self):
|
||||||
|
self.assertIsNone(self.install({ap.GIFT_KEYWORDS_ENV: '/nonexistent/k.json'}))
|
||||||
|
self.assertIs(self.mirror_cls.acquire_ego_gift, self.original)
|
||||||
|
self.assertTrue(self.lines[0].startswith('[ERROR] [lc_mcp] 饰品体系优先补丁跳过'))
|
||||||
|
|
||||||
|
def test_refuse_screen_passes_through(self):
|
||||||
|
self.install()
|
||||||
|
mirror = self.mirror_cls()
|
||||||
|
mirror.system = 'bleed'
|
||||||
|
self.assertEqual(mirror.acquire_ego_gift(type=2), 'done')
|
||||||
|
self.original.assert_called_once_with(mirror, type=2)
|
||||||
|
|
||||||
|
def test_find_element_is_restored_after_an_exception(self):
|
||||||
|
real = self.auto.find_element
|
||||||
|
self.original.side_effect = RuntimeError('boom')
|
||||||
|
self.install()
|
||||||
|
mirror = self.mirror_cls()
|
||||||
|
mirror.system = 'bleed'
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
mirror.acquire_ego_gift()
|
||||||
|
self.assertIs(self.auto.find_element, real)
|
||||||
|
|
||||||
|
def test_ranking_error_keeps_upstream_order(self):
|
||||||
|
cards = [(300, 300), (600, 300)]
|
||||||
|
|
||||||
|
def original(mirror):
|
||||||
|
return self.auto.find_element(ap.GIFT_CARD, find_type='image_with_multiple_targets')
|
||||||
|
|
||||||
|
self.mirror_cls.acquire_ego_gift = original
|
||||||
|
self.install()
|
||||||
|
mirror = self.mirror_cls()
|
||||||
|
mirror.system = 'bleed'
|
||||||
|
with mock.patch.object(ap, '_ocr_lines', side_effect=RuntimeError('ocr down')):
|
||||||
|
self.assertEqual(mirror.acquire_ego_gift(), cards)
|
||||||
|
self.assertIn('关键词排序出错(RuntimeError: ocr down)', '\n'.join(self.lines))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user