无人值守自动化: 配置预检、选队精确匹配、窗口守护、卡死重跑、计划任务, 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()
|
||||||
+25
-2
@@ -9,7 +9,9 @@ import json
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from . import preflight
|
||||||
from .aalc_engine import bootstrap
|
from .aalc_engine import bootstrap
|
||||||
|
from .aalc_patches import WindowGuard, install_exact_team_match
|
||||||
|
|
||||||
# 任务 -> {参数名: AALC 配置项}; 参数只在本次运行内生效
|
# 任务 -> {参数名: AALC 配置项}; 参数只在本次运行内生效
|
||||||
TASKS = {
|
TASKS = {
|
||||||
@@ -20,6 +22,11 @@ TASKS = {
|
|||||||
'mirror': {'count': 'set_mirror_count'},
|
'mirror': {'count': 'set_mirror_count'},
|
||||||
}
|
}
|
||||||
RESTORE_ENV = 'LCP_RESTORE_FILE'
|
RESTORE_ENV = 'LCP_RESTORE_FILE'
|
||||||
|
PREFLIGHT_EXIT = 3
|
||||||
|
|
||||||
|
|
||||||
|
def log(msg):
|
||||||
|
print(msg, flush=True)
|
||||||
|
|
||||||
|
|
||||||
def apply_overrides(cfg, task, params, restore_path=None):
|
def apply_overrides(cfg, task, params, restore_path=None):
|
||||||
@@ -61,17 +68,28 @@ def run(task, params):
|
|||||||
bootstrap()
|
bootstrap()
|
||||||
from module.automation import auto
|
from module.automation import auto
|
||||||
from module.config import cfg
|
from module.config import cfg
|
||||||
|
from module.game_and_screen import screen
|
||||||
from tasks.base import script_task_scheme as scheme
|
from tasks.base import script_task_scheme as scheme
|
||||||
from tasks.base.retry_monitor import retry_monitor
|
from tasks.base.retry_monitor import retry_monitor
|
||||||
from tasks.battle import battle
|
from tasks.battle import battle
|
||||||
from utils.path_manager import path_manager
|
from utils.path_manager import path_manager
|
||||||
|
|
||||||
|
problems = preflight.check(preflight.collect(cfg), task,
|
||||||
|
desktop=None if cfg.simulator else preflight.desktop_size())
|
||||||
|
if problems:
|
||||||
|
for p in problems:
|
||||||
|
log('[ERROR] [lc_mcp] preflight: %s' % p)
|
||||||
|
return PREFLIGHT_EXIT
|
||||||
|
|
||||||
|
install_exact_team_match(auto, log)
|
||||||
|
guard = WindowGuard(screen, cfg, log=log)
|
||||||
|
guard.start()
|
||||||
restore_path = os.environ.get(RESTORE_ENV)
|
restore_path = os.environ.get(RESTORE_ENV)
|
||||||
originals = apply_overrides(cfg, task, params, restore_path)
|
originals = apply_overrides(cfg, task, params, restore_path)
|
||||||
try:
|
try:
|
||||||
if task == 'all':
|
if task == 'all':
|
||||||
scheme.script_task()
|
scheme.script_task()
|
||||||
return
|
return 0
|
||||||
# 与 script_task() 相同的前置步骤
|
# 与 script_task() 相同的前置步骤
|
||||||
scheme.init_game()
|
scheme.init_game()
|
||||||
path_manager.initialize_paths()
|
path_manager.initialize_paths()
|
||||||
@@ -87,7 +105,9 @@ def run(task, params):
|
|||||||
'enkephalin': scheme.Buy_enkephalin,
|
'enkephalin': scheme.Buy_enkephalin,
|
||||||
'mirror': scheme.Mirror_task,
|
'mirror': scheme.Mirror_task,
|
||||||
}[task]()
|
}[task]()
|
||||||
|
return 0
|
||||||
finally:
|
finally:
|
||||||
|
guard.stop()
|
||||||
retry_monitor.stop()
|
retry_monitor.stop()
|
||||||
restore(cfg, originals, restore_path)
|
restore(cfg, originals, restore_path)
|
||||||
|
|
||||||
@@ -107,7 +127,10 @@ def main(argv):
|
|||||||
print('unknown params for %s: %s' % (task, ', '.join(sorted(unknown))), file=sys.stderr)
|
print('unknown params for %s: %s' % (task, ', '.join(sorted(unknown))), file=sys.stderr)
|
||||||
return 2
|
return 2
|
||||||
print('[lc_mcp] task %s start %s' % (task, json.dumps(params)), flush=True)
|
print('[lc_mcp] task %s start %s' % (task, json.dumps(params)), flush=True)
|
||||||
run(task, params)
|
code = run(task, params)
|
||||||
|
if code:
|
||||||
|
print('[lc_mcp] task %s aborted (exit %s)' % (task, code), flush=True)
|
||||||
|
return code
|
||||||
print('[lc_mcp] task %s done' % task, flush=True)
|
print('[lc_mcp] task %s done' % task, flush=True)
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""任务启动前的配置检查。
|
||||||
|
|
||||||
|
10-04/05 的几次长时间空转都源于配置: AALC 不报错, 只是一直原地打转。
|
||||||
|
这里把已知的坑在启动前拦下来, 返回人能看懂的原因。
|
||||||
|
|
||||||
|
check() 只吃普通 dict, 不依赖 AALC, 便于单测; collect() 负责从 AALC cfg 取值。
|
||||||
|
"""
|
||||||
|
import os
|
||||||
|
|
||||||
|
# 窗口边框 + 标题栏(100% 缩放下实测 16x39, 留一点余量)
|
||||||
|
FRAME_W, FRAME_H = 16, 40
|
||||||
|
ALLOW_LUNACY_ENV = 'LCP_ALLOW_LUNACY'
|
||||||
|
|
||||||
|
|
||||||
|
def collect(cfg):
|
||||||
|
teams = {}
|
||||||
|
for key, team in (cfg.get_value('teams') or {}).items():
|
||||||
|
data = team.model_dump() if hasattr(team, 'model_dump') else dict(team)
|
||||||
|
teams[str(key)] = data
|
||||||
|
return {
|
||||||
|
'simulator': bool(cfg.get_value('simulator')),
|
||||||
|
'mirror': bool(cfg.get_value('mirror')),
|
||||||
|
'set_win_size': int(cfg.get_value('set_win_size')),
|
||||||
|
'set_lunacy_to_enkephalin': int(cfg.get_value('set_lunacy_to_enkephalin') or 0),
|
||||||
|
'teams_active_queue': list(cfg.get_value('teams_active_queue') or []),
|
||||||
|
'teams': teams,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def desktop_size():
|
||||||
|
"""主显示器分辨率(进程已由 bootstrap 设为 DPI aware, 取到的是物理像素)。"""
|
||||||
|
from ctypes import windll
|
||||||
|
return windll.user32.GetSystemMetrics(0), windll.user32.GetSystemMetrics(1)
|
||||||
|
|
||||||
|
|
||||||
|
def check(values, task, desktop=None, env=None):
|
||||||
|
"""返回问题列表; 空列表表示可以启动。"""
|
||||||
|
env = os.environ if env is None else env
|
||||||
|
problems = []
|
||||||
|
|
||||||
|
lunacy = values.get('set_lunacy_to_enkephalin', 0)
|
||||||
|
if lunacy and task != 'enkephalin' and env.get(ALLOW_LUNACY_ENV) != '1':
|
||||||
|
problems.append(
|
||||||
|
'set_lunacy_to_enkephalin=%s: 体力不足时会花狂气换体力。狂气只用于抽卡, 请在 AALC 里改成 0'
|
||||||
|
'(确需使用时设环境变量 %s=1)' % (lunacy, ALLOW_LUNACY_ENV))
|
||||||
|
|
||||||
|
# all 只在 AALC 里勾选了镜牢时才会编队
|
||||||
|
if task == 'mirror' or (task == 'all' and values.get('mirror')):
|
||||||
|
teams = values.get('teams', {})
|
||||||
|
for num in values.get('teams_active_queue', []):
|
||||||
|
team = teams.get(str(num))
|
||||||
|
if team is None:
|
||||||
|
problems.append('teams_active_queue 里的队伍 %s 没有配置' % num)
|
||||||
|
continue
|
||||||
|
order = list(team.get('sinner_order') or [])
|
||||||
|
# team_formation 从 1 开始按顺序找罪人, 缺 1 就一个都不选, 然后无限重试编队
|
||||||
|
if 1 not in order:
|
||||||
|
problems.append(
|
||||||
|
'队伍 %s 的 sinner_order 没有罪人(全是 0): 镜牢编队会选空队伍并无限重试。'
|
||||||
|
'在 AALC 队伍设置里勾选罪人并排序' % num)
|
||||||
|
|
||||||
|
if not values.get('simulator') and desktop:
|
||||||
|
size = values.get('set_win_size', 0)
|
||||||
|
need_w = int(size * 16 / 9) + FRAME_W
|
||||||
|
need_h = size + FRAME_H
|
||||||
|
if need_w > desktop[0] or need_h > desktop[1]:
|
||||||
|
problems.append(
|
||||||
|
'set_win_size=%s 需要 %sx%s 的窗口(含标题栏), 桌面只有 %sx%s: 窗口会被压扁成非 16:9,'
|
||||||
|
' 模板匹配全部失效。改小 set_win_size(如 720)或调大桌面分辨率'
|
||||||
|
% (size, need_w, need_h, desktop[0], desktop[1]))
|
||||||
|
return problems
|
||||||
Reference in New Issue
Block a user