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:
@@ -12,6 +12,7 @@
|
||||
一次, 之后全部模板匹配分数掉到阈值以下, 表现为原地空转、不报错。这里在后台定期
|
||||
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
||||
"""
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
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
|
||||
log('[lc_mcp] patch: 镜牢键盘寻路按节点类型选方向(不拖地图)')
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user