复查 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:
+158
-59
@@ -13,9 +13,11 @@
|
|||||||
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
||||||
"""
|
"""
|
||||||
import json
|
import json
|
||||||
|
import linecache
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
import sys
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
import unicodedata
|
import unicodedata
|
||||||
@@ -1254,29 +1256,35 @@ def load_event_choices(path=EVENT_CHOICES_FILE):
|
|||||||
return rules
|
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):
|
def event_options(markers, lines, scale):
|
||||||
"""选项框左边缘(从上到下)与各自的文字: [(位置, 归一后的文字), ...]。"""
|
"""选项框左边缘(从上到下)与各自的文字: [(位置, 归一后的文字), ...]。"""
|
||||||
markers = sorted(markers, key=lambda m: float(m[1]))
|
return [(m, ''.join(text for text, _, _ in row)) for m, row in option_rows(markers, lines, scale)]
|
||||||
texts = [[] for _ in markers]
|
|
||||||
for text, x, y in lines:
|
|
||||||
rows = [i for i, m in enumerate(markers)
|
def option_click_pos(marker, row):
|
||||||
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))
|
只在这一项归到的字里找(option_rows 同一套归行): 整屏找子串会点错项,
|
||||||
return [(m, ''.join(t)) for m, t in zip(markers, texts)]
|
比如要点「不听故事离开」时, 另一项「离开」也是它的子串。
|
||||||
|
"""
|
||||||
|
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):
|
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)
|
markers = auto.find_element(EVENT_OPTION, find_type='image_with_multiple_targets', threshold=0.75)
|
||||||
if not markers:
|
if not markers:
|
||||||
return None
|
return None
|
||||||
raw_lines = _ocr_lines(auto)
|
rows = option_rows(markers, _ocr_lines(auto), cfg.set_win_size / 1440)
|
||||||
options = event_options(markers, raw_lines, cfg.set_win_size / 1440)
|
texts = tuple(''.join(text for text, _, _ in row) for _, row in rows)
|
||||||
texts = tuple(text for _, text in options)
|
|
||||||
shown = ' | '.join('%d=%s' % (i + 1, text or '?') for i, text in enumerate(texts))
|
shown = ' | '.join('%d=%s' % (i + 1, text or '?') for i, text in enumerate(texts))
|
||||||
|
|
||||||
def once(message):
|
def once(message):
|
||||||
@@ -1338,12 +1345,18 @@ def install_event_choices(log=print, env=None):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
rule, i = choose_event_option(rules, texts)
|
rule, i = choose_event_option(rules, texts)
|
||||||
if rule is None and state['fallback'] and options and texts and texts[0]:
|
if rule is None and state['fallback'] and texts and texts[0]:
|
||||||
# 2026-11-18: 上游对认不出的事件会「无法解决事件, 尝试回到初始界面」直接回主界面。
|
# LCP_EVENT_FALLBACK=1: 表里没有的事件先点第 1 项, 每个画面只点一次。
|
||||||
# LCP_EVENT_FALLBACK=1 时改成点第 1 项, 至少把事件走过去。
|
# 点完选项框还在画面上, 后面的「判定 / 继续 / 开始战斗」得交给上游:
|
||||||
position = _option_click_pos(raw_lines, texts[0], options[0][0], cfg.set_win_size / 1440)
|
# 补丁每轮都抢先点第 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]))
|
log('[lc_mcp] 事件选项: %s; 表里没有, 兜底点第 1 项「%s」' % (shown, texts[0]))
|
||||||
decisions.record('event', 1, 'fallback_first', options=list(texts))
|
decisions.record('event', 1, 'fallback_first', options=list(texts))
|
||||||
|
position = option_click_pos(*rows[0])
|
||||||
auto.mouse_click(position[0], position[1])
|
auto.mouse_click(position[0], position[1])
|
||||||
return position
|
return position
|
||||||
if rule is None:
|
if rule is None:
|
||||||
@@ -1363,13 +1376,13 @@ def install_event_choices(log=print, env=None):
|
|||||||
state['clicks'] += 1
|
state['clicks'] += 1
|
||||||
log('[lc_mcp] 事件 %s: %s; 按表选第 %d 项「%s」' % (rule['name'], shown, i + 1, rule['text']))
|
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))
|
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])
|
auto.mouse_click(position[0], position[1])
|
||||||
return position
|
return position
|
||||||
|
|
||||||
def event_handling(self, *args, **kwargs):
|
def event_handling(self, *args, **kwargs):
|
||||||
state = {'clicks': 0, 'logged': set(), 'clicked': None, 'passed': None,
|
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
|
real_find, real_click = auto.find_element, auto.mouse_click
|
||||||
|
|
||||||
def find_element(target, *a, **kw):
|
def find_element(target, *a, **kw):
|
||||||
@@ -1403,7 +1416,8 @@ def install_event_choices(log=print, env=None):
|
|||||||
|
|
||||||
event_handling.__wrapped__ = original # 让后装的补丁查得到上游源码
|
event_handling.__wrapped__ = original # 让后装的补丁查得到上游源码
|
||||||
mirror_mod.Mirror.event_handling = event_handling
|
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
|
return original
|
||||||
|
|
||||||
|
|
||||||
@@ -1660,7 +1674,8 @@ def install_theme_pack_audit(log=print):
|
|||||||
# 这里在 AALC 选卡包时把它的权重表临时加上「卡包对当局体系的加分」(lc_mcp/data/theme_pack_systems.json),
|
# 这里在 AALC 选卡包时把它的权重表临时加上「卡包对当局体系的加分」(lc_mcp/data/theme_pack_systems.json),
|
||||||
# 不改配置文件。AALC 拿卡包卡面 OCR 文字按权重表的键做子串匹配、取第一个命中的键, 所以加过分的键排在最前面。
|
# 不改配置文件。AALC 拿卡包卡面 OCR 文字按权重表的键做子串匹配、取第一个命中的键, 所以加过分的键排在最前面。
|
||||||
THEME_PACK_SYSTEMS_ENV = 'LCP_THEME_PACK_SYSTEMS' # 0 = 关闭; 文件路径 = 用这张表代替默认表
|
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_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_UNKNOWN_KEYS = ('未知', 'unknown') # AALC 认不出卡包时的兜底权重键, 不当卡包名用
|
||||||
THEME_PACK_BOOSTED = {} # 本次选卡包加过分的键 → {pack, system, from, to}; 卡包审计记到 decisions 里
|
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 找
|
# 上游点的是 mirror/theme_pack/refresh_assets.png 的模板中心, 勾到的可能只是图标; 改成 OCR 找
|
||||||
# 右上角的「刷新 N/3」文字并点它的中心, 找不到再退回模板点击。
|
# 右上角的「刷新 N/3」文字并点它的中心, 找不到再退回模板点击。
|
||||||
THEME_PACK_REFRESH = 'mirror/theme_pack/refresh_assets.png'
|
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):
|
def _refresh_text_pos(auto, scale, box=THEME_PACK_REFRESH_BOX):
|
||||||
"""右上角「刷新」文字的中心坐标; 没有返回 None。"""
|
"""右上角「刷新」文字的中心坐标(客户区像素); 没有返回 None。scale = set_win_size / 1440。"""
|
||||||
x0, y0, x1, y1 = box
|
x0, y0, x1, y1 = (v * scale for v in box)
|
||||||
for text, x, y in _ocr_lines(auto):
|
for text, x, y in _ocr_lines(auto):
|
||||||
if '刷新' not in str(text):
|
if '刷新' not in str(text):
|
||||||
continue
|
continue
|
||||||
@@ -1816,6 +1831,7 @@ def install_theme_pack_refresh_click(log=print):
|
|||||||
"""卡包页刷新改成按 OCR 文字点。返回原 click_element, 未安装返回 None。"""
|
"""卡包页刷新改成按 OCR 文字点。返回原 click_element, 未安装返回 None。"""
|
||||||
try:
|
try:
|
||||||
from module.automation import auto
|
from module.automation import auto
|
||||||
|
from module.config import cfg
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log('[lc_mcp] 卡包刷新补丁跳过: 无法导入 %s' % e)
|
log('[lc_mcp] 卡包刷新补丁跳过: 无法导入 %s' % e)
|
||||||
return None
|
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:
|
if target != THEME_PACK_REFRESH or kwargs.get('click') is False:
|
||||||
return original(target, *args, **kwargs)
|
return original(target, *args, **kwargs)
|
||||||
try:
|
try:
|
||||||
pos = _refresh_text_pos(auto)
|
pos = _refresh_text_pos(auto, cfg.set_win_size / 1440)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log('[lc_mcp] 找刷新按钮出错(%s: %s), 用模板点击' % (type(e).__name__, e))
|
log('[lc_mcp] 找刷新按钮出错(%s: %s), 用模板点击' % (type(e).__name__, e))
|
||||||
pos = None
|
pos = None
|
||||||
@@ -1844,6 +1860,7 @@ def install_theme_pack_refresh_click(log=print):
|
|||||||
log('[lc_mcp] patch: 卡包刷新按 OCR 点「刷新」文字(找不到再退回模板)')
|
log('[lc_mcp] patch: 卡包刷新按 OCR 点「刷新」文字(找不到再退回模板)')
|
||||||
return original
|
return original
|
||||||
|
|
||||||
|
|
||||||
def install_theme_pack_systems(log=print, env=None, route=None, route_name='路线'):
|
def install_theme_pack_systems(log=print, env=None, route=None, route_name='路线'):
|
||||||
"""镜牢选卡包时按当局体系给卡包加分。返回原 select_theme_pack, 未安装返回 None。
|
"""镜牢选卡包时按当局体系给卡包加分。返回原 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」时刷新,
|
# 2026-11-16 用户要求: 卡包均分低就刷新。AALC 只在「最高分 < preferred_thresholds」时刷新,
|
||||||
# 而主题包表里 preferred_thresholds 是 0 → 0 分也当优选, 永远不刷新。
|
# 而主题包表里 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:
|
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:
|
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:
|
try:
|
||||||
current = int(getattr(theme_list, 'preferred_thresholds', 0) or 0)
|
current = int(getattr(theme_list, 'preferred_thresholds', 0) or 0)
|
||||||
except (TypeError, ValueError):
|
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 上抛
|
# 2026-11-16: 游戏窗口被最小化/关掉之后, AALC 每帧都在 cv2.matchTemplate 上抛
|
||||||
# 「corr.rows <= img.rows + templ.rows - 1」断言, 只记一条 ERROR 继续跑 —— 第 2 局
|
# 「corr.rows <= img.rows + templ.rows - 1」断言, 只记一条 ERROR 继续跑 —— 第 2 局
|
||||||
# 就这样空转 4.5 小时(68 次/秒), 直到手动停任务。这里统计"识别返回 None"(上游异常分支)的频率,
|
# 就这样空转 4.5 小时(68 次/秒), 直到手动停任务。这里看"识别返回 None"(上游异常分支):
|
||||||
# 超过阈值就抛 TaskAbort 结束任务, 让 task_status 里能看见明确原因。
|
# 中间一次都没识别成功、持续 IMAGE_ERROR_SPAN 秒且至少 IMAGE_ERROR_LIMIT 次, 就抛 TaskAbort 结束任务,
|
||||||
IMAGE_ERROR_WINDOW = 120 # 统计窗口(秒)
|
# 让 task_status 里能看见明确原因。
|
||||||
IMAGE_ERROR_LIMIT = 20 # 窗口内达到这个次数就熔断
|
#
|
||||||
|
# 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,
|
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。"""
|
"""截图持续识别失败时结束任务。返回原 match_template, 未安装返回 None。"""
|
||||||
try:
|
try:
|
||||||
from utils.image_utils import ImageUtils
|
from utils.image_utils import ImageUtils
|
||||||
@@ -1992,28 +2088,31 @@ def install_image_error_guard(log=print, clock=time.monotonic,
|
|||||||
if original is None:
|
if original is None:
|
||||||
log('[lc_mcp] 截图熔断跳过: ImageUtils 没有 match_template')
|
log('[lc_mcp] 截图熔断跳过: ImageUtils 没有 match_template')
|
||||||
return None
|
return None
|
||||||
state = {'times': []}
|
owner = threading.get_ident()
|
||||||
|
state = {'since': None, 'count': 0}
|
||||||
|
|
||||||
def match_template(screenshot, template, threshold, *args, **kwargs):
|
def match_template(*args, **kwargs):
|
||||||
result = original(screenshot, template, threshold, *args, **kwargs)
|
result = original(*args, **kwargs)
|
||||||
|
if threading.get_ident() != owner:
|
||||||
|
return result
|
||||||
if result is not None:
|
if result is not None:
|
||||||
|
state['since'], state['count'] = None, 0
|
||||||
return result
|
return result
|
||||||
now = clock()
|
now = clock()
|
||||||
times = state['times']
|
if state['since'] is None:
|
||||||
times.append(now)
|
state['since'] = now
|
||||||
cutoff = now - window
|
state['count'] += 1
|
||||||
while times and times[0] < cutoff:
|
lasted = now - state['since']
|
||||||
times.pop(0)
|
if state['count'] >= limit and lasted >= span:
|
||||||
if len(times) >= limit:
|
log('[ERROR] [lc_mcp] 图片识别连续出错 %d 次、持续 %d 秒没有一次成功, 判定画面不可用, 结束任务'
|
||||||
log('[ERROR] [lc_mcp] %d 秒内 %d 次图片识别出错, 判定画面不可用, 结束任务'
|
% (state['count'], lasted))
|
||||||
% (window, len(times)))
|
decisions.record('image_error', None, 'abort', count=state['count'], seconds=int(lasted))
|
||||||
decisions.record('image_error', None, 'abort', count=len(times))
|
|
||||||
raise TaskAbort('截图连续识别失败(%d 次/%d 秒), 游戏窗口可能被最小化或已关闭'
|
raise TaskAbort('截图连续识别失败(%d 次/%d 秒), 游戏窗口可能被最小化或已关闭'
|
||||||
% (len(times), window))
|
% (state['count'], lasted))
|
||||||
return result
|
return result
|
||||||
|
|
||||||
ImageUtils.match_template = staticmethod(match_template)
|
ImageUtils.match_template = staticmethod(match_template)
|
||||||
log('[lc_mcp] patch: 截图连续识别失败 %d 次/%d 秒即结束任务' % (limit, window))
|
log('[lc_mcp] patch: 截图识别连续出错 %d 秒(至少 %d 次)即结束任务' % (span, limit))
|
||||||
return original
|
return original
|
||||||
|
|
||||||
def install_gift_confirm_guard(log=print, clock=time.monotonic):
|
def install_gift_confirm_guard(log=print, clock=time.monotonic):
|
||||||
|
|||||||
Reference in New Issue
Block a user