无人值守自动化: 配置预检、选队精确匹配、窗口守护、卡死重跑、计划任务, AALC 升级到 b0f4393
- lc_mcp/preflight.py: 启动前拦截 sinner_order 全 0、会花狂气、窗口放不进桌面 (退出码 3) - lc_mcp/aalc_patches.py: 队伍名按编号精确匹配 (TEAMS #1 不再命中 #10); 后台守护客户区 16:9 - auto_cycle.py: AALC 卡死后停掉重跑; --mirror 打镜牢; 每轮写 cycle_*.log/.json 报告 - install_unattended.ps1: 注册会话看门狗 (每 5 分钟) 与每日一轮计划任务 - lc_ui.py: pythonw 启动时子进程改用 python 且不弹窗 - vendor/aalc: 7452fad -> b0f4393 (镜牢楼层识别、困牢奖励、排队启动修复) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,96 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""任务子进程里对 AALC 的运行时补丁。不改 vendor/aalc 的源码。
|
||||
|
||||
1. 队伍名精确匹配
|
||||
AALC 的 find_str_in_text 用子串匹配, "TEAMS #1" 会命中 "TEAMS #10"(中文 "编队#1"
|
||||
同理)。账号有 10 个以上预设时就会选中别的(常常是空)队伍, 然后在编队人数检查里
|
||||
无限空转——2026-10-05 一次空转了 27 分钟。这里只接管队伍名这一种目标, 要求编号
|
||||
完全相同, 其他文本仍走 AALC 原逻辑。
|
||||
|
||||
2. 窗口比例守护
|
||||
RDP 重连改变桌面分辨率后, Unity 会把窗口拉伸成非 16:9。AALC 只在任务开始时校正
|
||||
一次, 之后全部模板匹配分数掉到阈值以下, 表现为原地空转、不报错。这里在后台定期
|
||||
检查客户区尺寸, 偏离 set_win_size 时调回去。
|
||||
"""
|
||||
import re
|
||||
import threading
|
||||
import time
|
||||
|
||||
TEAM_TARGET = re.compile(r'(?:TEAMS|TFAMS|编队)#(\d+)', re.IGNORECASE)
|
||||
|
||||
|
||||
def team_number(text):
|
||||
"""'TEAMS #12' / 'TFAMS#3' / '编队#1' -> '12' / '3' / '1'; 不是队伍名返回 None。"""
|
||||
m = TEAM_TARGET.fullmatch(text.replace(' ', '').strip())
|
||||
return m.group(1) if m else None
|
||||
|
||||
|
||||
def find_team_text(want, ocr_dict):
|
||||
"""在 OCR 结果里找编号恰好为 want 的队伍名, 返回其坐标或 False。"""
|
||||
for text, position in ocr_dict.items():
|
||||
for hit in TEAM_TARGET.finditer(text.replace(' ', '')):
|
||||
if hit.group(1) == want:
|
||||
return position
|
||||
return False
|
||||
|
||||
|
||||
def install_exact_team_match(auto, log=print):
|
||||
original = auto.find_str_in_text
|
||||
|
||||
def find_str_in_text(target, ocr_dict):
|
||||
want = team_number(str(target))
|
||||
if want is None:
|
||||
return original(target, ocr_dict)
|
||||
return find_team_text(want, ocr_dict)
|
||||
|
||||
auto.find_str_in_text = find_str_in_text
|
||||
log('[lc_mcp] patch: 队伍名改为编号精确匹配')
|
||||
|
||||
|
||||
class WindowGuard(threading.Thread):
|
||||
"""后台检查游戏客户区, 不是 set_win_size 对应的 16:9 尺寸就调回去。"""
|
||||
|
||||
def __init__(self, screen, cfg, interval=15.0, log=print):
|
||||
super().__init__(name='lc_mcp-window-guard', daemon=True)
|
||||
self.screen, self.cfg, self.interval, self.log = screen, cfg, interval, log
|
||||
self.stopped = threading.Event()
|
||||
self.fixes = 0
|
||||
self._failed = None # 同一尺寸调不回来只报一次, 免得每 15 秒刷一条 ERROR
|
||||
|
||||
def want(self):
|
||||
size = int(self.cfg.set_win_size)
|
||||
return int(size * 16 / 9), size
|
||||
|
||||
def check_once(self):
|
||||
"""返回 'ok' / 'fixed' / 'failed' / None(没有可检查的窗口)。"""
|
||||
handle = self.screen.handle
|
||||
# set_windows 关闭表示用户自己管窗口, AALC 也不调, 这里同样不插手
|
||||
if self.cfg.simulator or not self.cfg.set_windows or not handle._hwnd or handle.isMinimized:
|
||||
return None
|
||||
current = (handle.width(True), handle.height(True))
|
||||
want = self.want()
|
||||
if current == want or 0 in current:
|
||||
return 'ok' if current == want else None
|
||||
self.screen.adjust_win_size(want)
|
||||
time.sleep(1)
|
||||
after = (handle.width(True), handle.height(True))
|
||||
if after == want:
|
||||
self.fixes += 1
|
||||
self._failed = None
|
||||
self.log('[lc_mcp] window guard: 客户区 %sx%s 已调回 %sx%s' % (current + want))
|
||||
return 'fixed'
|
||||
if after != self._failed:
|
||||
self._failed = after
|
||||
self.log('[ERROR] [lc_mcp] window guard: 客户区 %sx%s 调整后仍为 %sx%s(目标 %sx%s),'
|
||||
' 桌面可能放不下窗口' % (current + after + want))
|
||||
return 'failed'
|
||||
|
||||
def run(self):
|
||||
while not self.stopped.wait(self.interval):
|
||||
try:
|
||||
self.check_once()
|
||||
except Exception as e: # 守护线程不能把任务带崩
|
||||
self.log('[lc_mcp] window guard: 检查出错 %s: %s' % (type(e).__name__, e))
|
||||
|
||||
def stop(self):
|
||||
self.stopped.set()
|
||||
Reference in New Issue
Block a user