普通镜牢转交 AALC,核对镜牢实际完成局数,合成与任务互斥
转交与互斥(原未提交改动,合入选队分支后提交): - MCP 初始化说明和工具描述引导常规日常/领奖/普通镜牢走 task_status -> run_task -> 轮询;jev_mirror_agent 默认转交 AALC, 明确的速通配置、决策模型或未完成速通局仍走逐步模式。 - 新增 ~/lc_mcp/game.lock:run_task 子进程与模块合成脚本互斥, 合成脚本另查 task_status,状态不明时不接管游戏。 - all 任务的 HDR 提示无 GUI 时直接确认并记录;预检按窗口位置 决定是否计标题栏,set_windows=false 跳过;levelup card/weakest 同步失败返回非零。急停提示改为 End 键。 镜牢结果(对接文档指出的缺口): - 预检拒绝空队列和没有适用当前难度队伍的配置:AALC 会一局不打 就以 0 退出。可用判定与 Mirror_task 的固定用途规则一致。 - 监听 mirror_signal 统计实际完成局数;少于应打局数记 [ERROR] 并以退出码 4 结束,task_status 为 failed。 - mirror 指定 count 时临时关闭 infinite_dungeons(否则次数变成 9999),原值写入恢复文件,结束或强杀后写回。 验证:Linux / Python 3.12 全套 507 项通过;git diff --check 通过。 用上游真实 Mirror_task 回放了无可用队伍和正常完成两种情况; Windows 实机仍需回归。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,6 +21,57 @@ from contextlib import contextmanager
|
|||||||
TEAM_TARGET = re.compile(r'(?:TEAMS|TFAMS|编队)#(\d+)', re.IGNORECASE)
|
TEAM_TARGET = re.compile(r'(?:TEAMS|TFAMS|编队)#(\d+)', re.IGNORECASE)
|
||||||
|
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def headless_hdr_warning(scheme, log=print):
|
||||||
|
"""Acknowledge upstream's GUI-only HDR prompt without a Qt event loop."""
|
||||||
|
from PySide6.QtCore import Qt
|
||||||
|
|
||||||
|
def acknowledge(event):
|
||||||
|
try:
|
||||||
|
log('[lc_mcp] HDR 已开启,可能影响图像识别;命令行任务继续运行')
|
||||||
|
finally:
|
||||||
|
event.set()
|
||||||
|
|
||||||
|
signal = scheme.mediator.hdr_warning
|
||||||
|
signal.connect(acknowledge, Qt.ConnectionType.DirectConnection)
|
||||||
|
try:
|
||||||
|
yield
|
||||||
|
finally:
|
||||||
|
signal.disconnect(acknowledge)
|
||||||
|
|
||||||
|
|
||||||
|
class MirrorProgress:
|
||||||
|
"""AALC 镜牢的实际完成局数。total 为 None 表示本次没有进入镜牢循环。"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.total = None
|
||||||
|
self.finished = 0
|
||||||
|
|
||||||
|
def record(self, finished, remaining):
|
||||||
|
# Mirror_task 开始时发 (0, 总局数), 每完成一局发 (已完成, 剩余)
|
||||||
|
if self.total is None:
|
||||||
|
self.total = finished + remaining
|
||||||
|
self.finished = max(self.finished, finished)
|
||||||
|
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def mirror_progress(scheme):
|
||||||
|
"""监听 mirror_signal 统计完成局数。
|
||||||
|
|
||||||
|
AALC 没有可用队伍或队列为空时 Mirror_task 直接跳出循环, 进程仍以 0 退出;
|
||||||
|
只看退出码会把"一局没打"报成 succeeded。
|
||||||
|
"""
|
||||||
|
from PySide6.QtCore import Qt
|
||||||
|
|
||||||
|
progress = MirrorProgress()
|
||||||
|
signal = scheme.mediator.mirror_signal
|
||||||
|
signal.connect(progress.record, Qt.ConnectionType.DirectConnection)
|
||||||
|
try:
|
||||||
|
yield progress
|
||||||
|
finally:
|
||||||
|
signal.disconnect(progress.record)
|
||||||
|
|
||||||
|
|
||||||
def team_number(text):
|
def team_number(text):
|
||||||
"""'TEAMS #12' / 'TFAMS#3' / '编队#1' -> '12' / '3' / '1'; 不是队伍名返回 None。"""
|
"""'TEAMS #12' / 'TFAMS#3' / '编队#1' -> '12' / '3' / '1'; 不是队伍名返回 None。"""
|
||||||
m = TEAM_TARGET.fullmatch(text.replace(' ', '').strip())
|
m = TEAM_TARGET.fullmatch(text.replace(' ', '').strip())
|
||||||
|
|||||||
Reference in New Issue
Block a user