复查修正: 饰品三选一被上游倒序、选队顶栏同名被覆盖
- 饰品(P1-3): 三张及以上时上游把认出体系图标的卡逐张 insert(0), 后看的排到最前,
两张命中关键词的卡都带图标时补丁的顺序会被倒过来, 先拿命中少的。现在交给上游
"没命中的(原顺序) + 命中的(倒着)", 上游查体系图标时对命中的卡答"有", 拼出来是
命中多 -> 命中少 -> 只认出图标 -> 其余。测试的假界面加上体系图标, 先复现再修。
- 选队(P1-5): _team_ocr 经 _run_ocr_for_text 的 {文本: 坐标} 取结果, 选中某队后
顶栏和列表同名, 顶栏那条会被覆盖; 旧测试用成对结果模拟重复, 真实 dict 做不到。
改读 OCR 引擎逐行结果(同一引擎、同一截图), 引擎导入不了才退回 dict。
- 事件(P1-4): 同一张截图只判断一次, 单通模式再找 "???" 时不再整屏 OCR 第二遍。
- 文档: 修正 BACKLOG/README/交接文档对应描述, 去掉两处没核实的推断。
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+69
-19
@@ -482,18 +482,16 @@ TEAM_HEADER = (170, 520, 90, 150)
|
|||||||
|
|
||||||
|
|
||||||
def _team_ocr(auto):
|
def _team_ocr(auto):
|
||||||
"""整屏 OCR, 返回 [(文本, x, y), ...]。用列表而不是 dict: 同名条目(列表里的队名和顶栏队名)
|
"""整屏 OCR, 返回 [(去空白的文本, x, y), ...], 空串丢掉。
|
||||||
落在不同位置, dict 会把它们覆盖成一条。不用 my_crop: 裁剪区的坐标系不可靠。"""
|
|
||||||
ocr = auto._run_ocr_for_text(my_crop=None)
|
读 OCR 引擎的逐行结果(_ocr_lines): 选中某队后顶栏和左侧列表里是同一个名字, AALC 的
|
||||||
|
_run_ocr_for_text 返回 {文本: 坐标}, 同名只留一条, 顶栏那条可能被列表那条盖掉。
|
||||||
|
不用 my_crop: 裁剪区的坐标系不可靠。
|
||||||
|
"""
|
||||||
result = []
|
result = []
|
||||||
for text, pos in (ocr or {}).items():
|
for text, x, y in _ocr_lines(auto):
|
||||||
clean = str(text).replace(' ', '').strip()
|
clean = str(text).replace(' ', '').strip()
|
||||||
if not clean:
|
if clean:
|
||||||
continue
|
|
||||||
try:
|
|
||||||
x, y = float(pos[0]), float(pos[1])
|
|
||||||
except (TypeError, IndexError, ValueError):
|
|
||||||
continue
|
|
||||||
result.append((clean, x, y))
|
result.append((clean, x, y))
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@@ -811,6 +809,7 @@ def _override(obj, name, value):
|
|||||||
GIFT_KEYWORDS_ENV = 'LCP_GIFT_KEYWORDS' # 0 = 关闭; 文件路径 = 用这张表代替默认表
|
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_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 = 'mirror/road_in_mir/acquire_ego_gift_card.png'
|
||||||
|
GIFT_ICON = 'mirror/road_in_mir/acquire_ego_gift/%s.png' # 上游三张卡时按体系图标挑卡用的模板
|
||||||
GIFT_CARD_BOX = (-50, -300, 450, 350) # 上游判断白棉花/已持有时每张卡的范围(相对卡片匹配点, 1440 标定)
|
GIFT_CARD_BOX = (-50, -300, 450, 350) # 上游判断白棉花/已持有时每张卡的范围(相对卡片匹配点, 1440 标定)
|
||||||
|
|
||||||
|
|
||||||
@@ -830,13 +829,24 @@ def load_gift_keywords(path=GIFT_KEYWORDS_FILE):
|
|||||||
return table
|
return table
|
||||||
|
|
||||||
|
|
||||||
|
def _dict_ocr_lines(auto):
|
||||||
|
"""经 AALC 的 _run_ocr_for_text 读整屏: {文本: 坐标}, 同名文本只剩一条。只在 OCR 引擎导入不了时用。"""
|
||||||
|
lines = []
|
||||||
|
for text, pos in (auto._run_ocr_for_text(my_crop=None) or {}).items():
|
||||||
|
try:
|
||||||
|
lines.append((str(text), float(pos[0]), float(pos[1])))
|
||||||
|
except (TypeError, IndexError, ValueError):
|
||||||
|
continue
|
||||||
|
return lines
|
||||||
|
|
||||||
|
|
||||||
def _ocr_lines(auto):
|
def _ocr_lines(auto):
|
||||||
"""整屏 OCR 的每一行 [(文本, x, y)]。直接用 OCR 引擎, 不经 _run_ocr_for_text 的 {文本: 坐标}:
|
"""整屏 OCR 的每一行 [(文本, x, y)]。直接用 OCR 引擎(与 _run_ocr_for_text 同一个引擎、同一张截图、
|
||||||
同一句描述出现在两张卡上时 dict 只留一条。引擎不可用时退回 _team_ocr。"""
|
同样取框的中心), 不经它的 {文本: 坐标}: 同一句出现在两处(两张卡、顶栏和列表)时 dict 只留一条。"""
|
||||||
try:
|
try:
|
||||||
from module.ocr import ocr as engine
|
from module.ocr import ocr as engine
|
||||||
except Exception:
|
except Exception:
|
||||||
return _team_ocr(auto)
|
return _dict_ocr_lines(auto)
|
||||||
result = engine.run(auto.screenshot)
|
result = engine.run(auto.screenshot)
|
||||||
texts, boxes = getattr(result, 'txts', None), getattr(result, 'boxes', None)
|
texts, boxes = getattr(result, 'txts', None), getattr(result, 'boxes', None)
|
||||||
if texts is None or boxes is None:
|
if texts is None or boxes is None:
|
||||||
@@ -877,6 +887,21 @@ def gift_card_order(hits):
|
|||||||
return sorted(range(len(hits)), key=lambda i: -len(hits[i]))
|
return sorted(range(len(hits)), key=lambda i: -len(hits[i]))
|
||||||
|
|
||||||
|
|
||||||
|
def gift_upstream_order(hits):
|
||||||
|
"""交给上游的卡顺序(下标), 使上游拼出来的候选顺序等于 gift_card_order。
|
||||||
|
|
||||||
|
两张卡: 上游按给的顺序挑(只把白棉花/已持有排后), 直接给 gift_card_order。
|
||||||
|
三张及以上: 上游逐张看, 认出体系图标的卡 insert(0)(后看的排到最前), 其余 append。
|
||||||
|
所以先给没命中的卡(原顺序), 再把命中的卡倒着给, 并让上游的图标判断对命中的卡返回"有":
|
||||||
|
拼出来就是 命中多的 → 命中少的 → 只认出图标的 → 其余。
|
||||||
|
"""
|
||||||
|
order = gift_card_order(hits)
|
||||||
|
if len(hits) <= 2:
|
||||||
|
return order
|
||||||
|
keyed = [i for i in order if hits[i]]
|
||||||
|
return [i for i in range(len(hits)) if not hits[i]] + keyed[::-1]
|
||||||
|
|
||||||
|
|
||||||
def rank_gift_cards(cards, hits):
|
def rank_gift_cards(cards, hits):
|
||||||
return [cards[i] for i in gift_card_order(hits)]
|
return [cards[i] for i in gift_card_order(hits)]
|
||||||
|
|
||||||
@@ -911,7 +936,9 @@ def install_gift_preference(log=print, env=None):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def prefer(cards, system, keywords):
|
def prefer(cards, system, keywords):
|
||||||
hits = gift_card_hits(cards, _ocr_lines(auto), keywords, cfg.set_win_size / 1440)
|
"""返回 (交给上游的卡顺序, 要当作认出体系图标的卡的范围左上角)。"""
|
||||||
|
scale = cfg.set_win_size / 1440
|
||||||
|
hits = gift_card_hits(cards, _ocr_lines(auto), keywords, scale)
|
||||||
order = gift_card_order(hits)
|
order = gift_card_order(hits)
|
||||||
by_x = sorted(range(len(cards)), key=lambda i: float(cards[i][0])) # 日志按从左到右编号
|
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 '')
|
detail = ' '.join('第%d张=%d%s' % (n + 1, len(hits[i]), '(%s)' % '/'.join(hits[i]) if hits[i] else '')
|
||||||
@@ -924,7 +951,11 @@ def install_gift_preference(log=print, env=None):
|
|||||||
# 上游随后还会跳过白棉花、把已持有排后, 这里记的是交给上游的第一顺位
|
# 上游随后还会跳过白棉花、把已持有排后, 这里记的是交给上游的第一顺位
|
||||||
decisions.record('gift', first, 'keyword' if any(hits) else 'no_keyword', system=system,
|
decisions.record('gift', first, 'keyword' if any(hits) else 'no_keyword', system=system,
|
||||||
hits=[hits[i] for i in by_x])
|
hits=[hits[i] for i in by_x])
|
||||||
return [cards[i] for i in order]
|
keyed = []
|
||||||
|
if len(cards) > 2:
|
||||||
|
left, top = GIFT_CARD_BOX[0] * scale, GIFT_CARD_BOX[1] * scale
|
||||||
|
keyed = [(float(cards[i][0]) + left, float(cards[i][1]) + top) for i in order if hits[i]]
|
||||||
|
return [cards[i] for i in gift_upstream_order(hits)], keyed
|
||||||
|
|
||||||
def acquire_ego_gift(self, *args, **kwargs):
|
def acquire_ego_gift(self, *args, **kwargs):
|
||||||
system = getattr(self, 'system', '')
|
system = getattr(self, 'system', '')
|
||||||
@@ -932,14 +963,30 @@ def install_gift_preference(log=print, env=None):
|
|||||||
if kwargs.get('type', args[0] if args else 1) != 1 or not keywords: # type=2 是"拒绝饰品"界面
|
if kwargs.get('type', args[0] if args else 1) != 1 or not keywords: # type=2 是"拒绝饰品"界面
|
||||||
return original(self, *args, **kwargs)
|
return original(self, *args, **kwargs)
|
||||||
real = auto.find_element
|
real = auto.find_element
|
||||||
|
icon = GIFT_ICON % system
|
||||||
|
keyed = [] # 这一屏命中关键词的卡(上游 bbox 的左上角); 上游查体系图标时对它们答"有"
|
||||||
|
|
||||||
|
def is_keyed(crop):
|
||||||
|
try:
|
||||||
|
x, y = float(crop[0]), float(crop[1])
|
||||||
|
except (TypeError, IndexError, ValueError):
|
||||||
|
return False
|
||||||
|
return any(abs(x - kx) < 1 and abs(y - ky) < 1 for kx, ky in keyed)
|
||||||
|
|
||||||
def find_element(target, *a, **kw):
|
def find_element(target, *a, **kw):
|
||||||
|
if target == icon and keyed and is_keyed(kw.get('my_crop')):
|
||||||
|
crop = kw['my_crop']
|
||||||
|
return ((float(crop[0]) + float(crop[2])) / 2, (float(crop[1]) + float(crop[3])) / 2)
|
||||||
found = real(target, *a, **kw)
|
found = real(target, *a, **kw)
|
||||||
find_type = kw.get('find_type', a[0] if a else 'image')
|
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:
|
if target == GIFT_CARD and find_type == 'image_with_multiple_targets':
|
||||||
|
keyed.clear()
|
||||||
|
if found and len(found) > 1:
|
||||||
try:
|
try:
|
||||||
return prefer(list(found), system, keywords)
|
ordered, keyed[:] = prefer(list(found), system, keywords)
|
||||||
|
return ordered
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
keyed.clear()
|
||||||
log('[lc_mcp] 饰品选择: 关键词排序出错(%s: %s), 沿用原顺序' % (type(e).__name__, e))
|
log('[lc_mcp] 饰品选择: 关键词排序出错(%s: %s), 沿用原顺序' % (type(e).__name__, e))
|
||||||
return found
|
return found
|
||||||
|
|
||||||
@@ -1118,7 +1165,7 @@ def install_event_choices(log=print, env=None):
|
|||||||
return position
|
return position
|
||||||
|
|
||||||
def event_handling(self, *args, **kwargs):
|
def event_handling(self, *args, **kwargs):
|
||||||
state = {'clicks': 0, 'logged': set(), 'clicked': None}
|
state = {'clicks': 0, 'logged': set(), 'clicked': None, 'passed': None}
|
||||||
real_find, real_click = auto.find_element, auto.mouse_click
|
real_find, real_click = auto.find_element, auto.mouse_click
|
||||||
|
|
||||||
def find_element(target, *a, **kw):
|
def find_element(target, *a, **kw):
|
||||||
@@ -1128,11 +1175,14 @@ def install_event_choices(log=print, env=None):
|
|||||||
# 刚按表点过: 小指良单通模式的 click_option_avoiding_unknown 会再找一次 "???", 别让它再点
|
# 刚按表点过: 小指良单通模式的 click_option_avoiding_unknown 会再找一次 "???", 别让它再点
|
||||||
state['clicked'] = None
|
state['clicked'] = None
|
||||||
return None
|
return None
|
||||||
|
shot = getattr(auto, 'screenshot', None)
|
||||||
|
clicked = None
|
||||||
|
if shot is None or shot is not state['passed']: # 同一张截图只判断一次(单通模式会再找一次 "???")
|
||||||
try:
|
try:
|
||||||
clicked = decide(state)
|
clicked = decide(state)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log('[lc_mcp] 事件选项表出错(%s: %s), 交给 AALC' % (type(e).__name__, e))
|
log('[lc_mcp] 事件选项表出错(%s: %s), 交给 AALC' % (type(e).__name__, e))
|
||||||
clicked = None
|
state['passed'] = shot if clicked is None else None
|
||||||
if clicked is None:
|
if clicked is None:
|
||||||
return real_find(target, *a, **kw)
|
return real_find(target, *a, **kw)
|
||||||
state['clicked'] = clicked
|
state['clicked'] = clicked
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"note": "选择后获得 1 件泛用 E.G.O 饰品"},
|
"note": "选择后获得 1 件泛用 E.G.O 饰品"},
|
||||||
{"name": "失明巨人递来患者记录", "id": 901085, "file": "ActionEvents_Mirror3.json",
|
{"name": "失明巨人递来患者记录", "id": 901085, "file": "ActionEvents_Mirror3.json",
|
||||||
"options": ["如实回答。"], "text": "说上面什么都没有写。", "check": true,
|
"options": ["如实回答。"], "text": "说上面什么都没有写。", "check": true,
|
||||||
"note": "两项都是判定: 1 忧郁/色欲(门槛 16), 2 忧郁/怠惰(门槛 14, 成功获得打击饰品); AALC 默认点最上面的 1"},
|
"note": "两项都是判定: 1 忧郁/色欲(门槛 16), 2 忧郁/怠惰(门槛 14, 成功获得打击饰品); AALC 不区分两项, 点它认出的那个优势判定"},
|
||||||
{"name": "破碎罗盘(冻僵的尸体指路)", "id": 901095, "file": "ActionEvents_Mirror3.json",
|
{"name": "破碎罗盘(冻僵的尸体指路)", "id": 901095, "file": "ActionEvents_Mirror3.json",
|
||||||
"options": ["向裂开的手所指的北方。", "向警告的手所指的东方。", "向折断的手所指的西方。"], "text": "返回。",
|
"options": ["向裂开的手所指的北方。", "向警告的手所指的东方。", "向折断的手所指的西方。"], "text": "返回。",
|
||||||
"note": "第 4 项直接结束; 其余方向都还有后续分支"}
|
"note": "第 4 项直接结束; 其余方向都还有后续分支"}
|
||||||
|
|||||||
Reference in New Issue
Block a user