驱动点击兜底 + 队名可配置;补 11-15 实机记录
- driver_input: 只在"原地连点"(与上次点击相差<=4px)时先挪开 10px 再点, 强制产生 MOUSEMOVE; 按下 60→100ms, 到位等待 50→80ms (LCP_DRIVER_PRESS_MS / SETTLE_MS / WIGGLE 可调) - aalc_patches: 「获得E.G.O饰品」弹窗第 3 次起绕过驱动代理改软件点击(pyautogui), 第 8 次发回车, 20 次才中止; 新增 data/team_names.json 覆盖体系默认队名 (LCP_TEAM_NAMES=0 关闭) - docs: 2026-11-15 实测(6 连刷 6/6、键盘 4/4 进入、卡包按体系、镜像迷宫+震颤), ISSUES 状态更新 + I-14 前台被抢 单测: 709 passed。
This commit is contained in:
+68
-5
@@ -716,12 +716,50 @@ def _select_team_by_name(auto, names, log=print, rounds=6):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def install_system_team_selection(log=print, names=None):
|
def load_team_names(path, log=print):
|
||||||
|
"""读「体系 → 优先队名」表 {体系: [队名...]}; 以 _ 开头的键是说明。
|
||||||
|
|
||||||
|
用来覆盖 SYSTEM_TEAM_NAMES 里的默认名(本机把镜像迷宫用的那支队起了自己的名字)。
|
||||||
|
读不了就返回 {}, 不影响默认逻辑。
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
with open(path, encoding='utf-8') as f:
|
||||||
|
raw = json.load(f)
|
||||||
|
except (OSError, ValueError) as e:
|
||||||
|
log('[lc_mcp] 队名表 %s 读不了(%s: %s), 用默认队名' % (path, type(e).__name__, e))
|
||||||
|
return {}
|
||||||
|
if not isinstance(raw, dict):
|
||||||
|
log('[lc_mcp] 队名表 %s 顶层应是 {体系: [队名]}, 用默认队名' % path)
|
||||||
|
return {}
|
||||||
|
table = {}
|
||||||
|
for system, names in raw.items():
|
||||||
|
if str(system).startswith('_'):
|
||||||
|
continue
|
||||||
|
if not isinstance(names, list) or not all(isinstance(n, str) for n in names):
|
||||||
|
log('[lc_mcp] 队名表 %s 的 %s 应是字符串列表, 忽略' % (path, system))
|
||||||
|
continue
|
||||||
|
cleaned = tuple(n.strip() for n in names if n.strip())
|
||||||
|
if cleaned:
|
||||||
|
table[str(system)] = cleaned
|
||||||
|
return table
|
||||||
|
|
||||||
|
|
||||||
|
TEAM_NAMES_ENV = 'LCP_TEAM_NAMES' # 0 = 关闭覆盖; 文件路径 = 用别的表
|
||||||
|
TEAM_NAMES_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data', 'team_names.json')
|
||||||
|
|
||||||
|
|
||||||
|
def install_system_team_selection(log=print, names=None, env=None):
|
||||||
"""镜牢选队改成"按队伍体系对应的中文名"在列表里点。
|
"""镜牢选队改成"按队伍体系对应的中文名"在列表里点。
|
||||||
|
|
||||||
AALC 原生只认 编队#N; 本账号的编队是自定义名字(流血/斩击/...), 原生逻辑永远选不上。
|
AALC 原生只认 编队#N; 本账号的编队是自定义名字(流血/斩击/...), 原生逻辑永远选不上。
|
||||||
names 给了就不看体系, 直接按这些名字选(兔子洞这类固定编队的打法用)。
|
names 给了就不看体系, 直接按这些名字选(兔子洞这类固定编队的打法用);
|
||||||
|
否则按 data/team_names.json 的覆盖 > SYSTEM_TEAM_NAMES > TEAM_PREFERENCES 的顺序。
|
||||||
"""
|
"""
|
||||||
|
env = os.environ if env is None else env
|
||||||
|
overrides = {}
|
||||||
|
setting = (env.get(TEAM_NAMES_ENV) or '').strip()
|
||||||
|
if setting != '0':
|
||||||
|
overrides = load_team_names(setting or TEAM_NAMES_FILE, log=log)
|
||||||
try:
|
try:
|
||||||
from tasks.mirror import mirror as mirror_mod
|
from tasks.mirror import mirror as mirror_mod
|
||||||
from module.automation import auto
|
from module.automation import auto
|
||||||
@@ -738,8 +776,13 @@ def install_system_team_selection(log=print, names=None):
|
|||||||
def __init__(self, team_setting, team_num):
|
def __init__(self, team_setting, team_num):
|
||||||
original_init(self, team_setting, team_num)
|
original_init(self, team_setting, team_num)
|
||||||
system = getattr(self, 'system', '')
|
system = getattr(self, 'system', '')
|
||||||
wanted['names'] = tuple(names) if names else (SYSTEM_TEAM_NAMES.get(system, ())
|
base = []
|
||||||
+ TEAM_PREFERENCES.get(system, ()))
|
for name in (overrides.get(system, ())
|
||||||
|
+ SYSTEM_TEAM_NAMES.get(system, ())
|
||||||
|
+ TEAM_PREFERENCES.get(system, ())):
|
||||||
|
if name not in base:
|
||||||
|
base.append(name)
|
||||||
|
wanted['names'] = tuple(names) if names else tuple(base)
|
||||||
wanted['enter_failed'] = False
|
wanted['enter_failed'] = False
|
||||||
log('[lc_mcp] 镜牢体系 %s -> 目标编队 %s'
|
log('[lc_mcp] 镜牢体系 %s -> 目标编队 %s'
|
||||||
% (system or '?', '/'.join(wanted['names']) or '(无配置)'))
|
% (system or '?', '/'.join(wanted['names']) or '(无配置)'))
|
||||||
@@ -1819,6 +1862,7 @@ def install_theme_pack_systems(log=print, env=None, route=None, route_name='路
|
|||||||
GIFT_CONFIRM = 'mirror/road_in_mir/ego_gift_get_confirm_assets.png'
|
GIFT_CONFIRM = 'mirror/road_in_mir/ego_gift_get_confirm_assets.png'
|
||||||
GIFT_CONFIRM_BUTTON_DX = 76 # 勾号模板中心 → 按钮中心的横向距离(1440 标定; 1280x720 实测 602 → 640)
|
GIFT_CONFIRM_BUTTON_DX = 76 # 勾号模板中心 → 按钮中心的横向距离(1440 标定; 1280x720 实测 602 → 640)
|
||||||
GIFT_CONFIRM_SHIFT_AT = 3 # 连续第几次命中起改点按钮中心(正常一个弹窗点 1~2 次就关)
|
GIFT_CONFIRM_SHIFT_AT = 3 # 连续第几次命中起改点按钮中心(正常一个弹窗点 1~2 次就关)
|
||||||
|
GIFT_CONFIRM_ENTER_AT = 8 # 软件点击也不关时, 第 8 次改发回车
|
||||||
GIFT_CONFIRM_LIMIT = 20 # 连续命中这么多次弹窗还在: 记 [ERROR] 并结束任务(卡住时约 1.5 秒一次)
|
GIFT_CONFIRM_LIMIT = 20 # 连续命中这么多次弹窗还在: 记 [ERROR] 并结束任务(卡住时约 1.5 秒一次)
|
||||||
GIFT_CONFIRM_GAP = 60 # 两次命中隔了这么多秒就不算连续
|
GIFT_CONFIRM_GAP = 60 # 两次命中隔了这么多秒就不算连续
|
||||||
|
|
||||||
@@ -1877,7 +1921,26 @@ def install_gift_confirm_guard(log=print, clock=time.monotonic):
|
|||||||
if streak == GIFT_CONFIRM_SHIFT_AT:
|
if streak == GIFT_CONFIRM_SHIFT_AT:
|
||||||
log('[lc_mcp] 「获得E.G.O饰品」确认点了 %d 次还在, 改点按钮中心 (%d,%d)' % (streak - 1, x, y))
|
log('[lc_mcp] 「获得E.G.O饰品」确认点了 %d 次还在, 改点按钮中心 (%d,%d)' % (streak - 1, x, y))
|
||||||
decisions.record('gift_confirm', 'button_center', 'repeated', clicks=streak - 1)
|
decisions.record('gift_confirm', 'button_center', 'repeated', clicks=streak - 1)
|
||||||
auto.mouse_click(x, y)
|
# 2026-11-15 实测: 罗技驱动的物理点击(即使挪开 10px 再回来)在这个弹窗上仍然无效,
|
||||||
|
# 同一坐标改用 pyautogui 的软件点击一次就过。所以这里绕过驱动代理, 直接调底层 handler。
|
||||||
|
if streak >= GIFT_CONFIRM_SHIFT_AT:
|
||||||
|
handler = getattr(auto, 'input_handler', None)
|
||||||
|
inner = getattr(handler, '_handler', None)
|
||||||
|
if inner is not None and hasattr(inner, 'mouse_click'):
|
||||||
|
inner.mouse_click(x, y)
|
||||||
|
decisions.record('gift_confirm', 'software_click', 'driver_bypass', clicks=streak)
|
||||||
|
else:
|
||||||
|
auto.mouse_click(x, y)
|
||||||
|
else:
|
||||||
|
auto.mouse_click(x, y)
|
||||||
|
if streak == GIFT_CONFIRM_ENTER_AT:
|
||||||
|
# 软件点击也不行就发一次回车: 该弹窗的「确认」是默认焦点
|
||||||
|
log('[lc_mcp] 「获得E.G.O饰品」软件点击也没关, 发一次回车')
|
||||||
|
try:
|
||||||
|
auto.key_press('enter')
|
||||||
|
except Exception as e:
|
||||||
|
log('[lc_mcp] 回车兜底失败: %s' % e)
|
||||||
|
decisions.record('gift_confirm', 'enter', 'fallback', clicks=streak)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
click_element.__wrapped__ = real_click
|
click_element.__wrapped__ = real_click
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"_说明": [
|
||||||
|
"体系 -> 优先队名(按顺序试), 覆盖 SYSTEM_TEAM_NAMES 里的默认名。2026-11-15 用户指定: 镜像迷宫用「镜像迷宫」那支队, 饰品走震颤。",
|
||||||
|
"改名或换队就改这里; 整表关闭: 任务环境变量 LCP_TEAM_NAMES=0。",
|
||||||
|
"「镜像迷宫」找不到时会自动退到 SYSTEM_TEAM_NAMES 的 震颤(以及 TEAM_PREFERENCES 的补充名)。",
|
||||||
|
"体系本身仍按 config.yaml 的 team_system 算, 商店/饰品的体系判断跟着它走。"
|
||||||
|
],
|
||||||
|
"tremor": ["镜像迷宫", "震颤"]
|
||||||
|
}
|
||||||
+35
-1
@@ -33,6 +33,20 @@ SPI_GETMOUSESPEED = 0x0070
|
|||||||
DEFAULT_DLL = r'E:\罗技键鼠驱动\logitech.driver.dll'
|
DEFAULT_DLL = r'E:\罗技键鼠驱动\logitech.driver.dll'
|
||||||
|
|
||||||
|
|
||||||
|
def _env_int(name, default):
|
||||||
|
try:
|
||||||
|
return int(os.environ.get(name, '') or default)
|
||||||
|
except ValueError:
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
# 点击参数(可被环境变量覆盖, 见 DriverInput.click 的注释 4)
|
||||||
|
PRESS_MS = _env_int('LCP_DRIVER_PRESS_MS', 100) # 按下保持时长; 原 60ms 偏短
|
||||||
|
SETTLE_SECONDS = _env_int('LCP_DRIVER_SETTLE_MS', 80) / 1000.0 # 到位后、按下前
|
||||||
|
WIGGLE_PIXELS = _env_int('LCP_DRIVER_WIGGLE_PX', 10)
|
||||||
|
WIGGLE_ENABLED = os.environ.get('LCP_DRIVER_WIGGLE', '1').strip() != '0'
|
||||||
|
|
||||||
|
|
||||||
class Cursor(ctypes.Structure):
|
class Cursor(ctypes.Structure):
|
||||||
_fields_ = [('x', ctypes.c_long), ('y', ctypes.c_long)]
|
_fields_ = [('x', ctypes.c_long), ('y', ctypes.c_long)]
|
||||||
|
|
||||||
@@ -118,6 +132,7 @@ class DriverInput:
|
|||||||
self._stopped = False
|
self._stopped = False
|
||||||
self._input_lock = threading.RLock()
|
self._input_lock = threading.RLock()
|
||||||
self._pressed = set()
|
self._pressed = set()
|
||||||
|
self._last_click = None # 上一次点击的屏幕坐标: 原地连点时才做抖动
|
||||||
# 目标窗口句柄。有它才能做句柄级前台校验 —— 几何校验在窗口重叠时没用:
|
# 目标窗口句柄。有它才能做句柄级前台校验 —— 几何校验在窗口重叠时没用:
|
||||||
# 实测把浏览器切到前台, 点游戏里同一个坐标, 只比矩形的话校验照样通过。
|
# 实测把浏览器切到前台, 点游戏里同一个坐标, 只比矩形的话校验照样通过。
|
||||||
self.hwnd = 0
|
self.hwnd = 0
|
||||||
@@ -220,7 +235,7 @@ class DriverInput:
|
|||||||
self._pressed.discard(int(button))
|
self._pressed.discard(int(button))
|
||||||
|
|
||||||
def click(self, sx, sy, times=1, tol=1, require_foreground=True,
|
def click(self, sx, sy, times=1, tol=1, require_foreground=True,
|
||||||
press_ms=60, settle=0.05):
|
press_ms=None, settle=None, wiggle=None):
|
||||||
"""先确认到位置, 再按下抬起。
|
"""先确认到位置, 再按下抬起。
|
||||||
|
|
||||||
⛔ 三个已验证的"位置对却点不上"原因(2026-10-23 实测):
|
⛔ 三个已验证的"位置对却点不上"原因(2026-10-23 实测):
|
||||||
@@ -232,9 +247,28 @@ class DriverInput:
|
|||||||
所以定位成功后先 settle 再按。
|
所以定位成功后先 settle 再按。
|
||||||
3. **按下时间太短** —— 默认 30ms 在掉帧时会漏; 改成 60ms。
|
3. **按下时间太短** —— 默认 30ms 在掉帧时会漏; 改成 60ms。
|
||||||
实测 30/60/120ms 在干净环境下都能中, 但 60ms 对负载高的情况更稳。
|
实测 30/60/120ms 在干净环境下都能中, 但 60ms 对负载高的情况更稳。
|
||||||
|
|
||||||
|
4. **光标已经停在目标上时不会产生 MOUSEMOVE**(2026-11-15 实测) ——
|
||||||
|
`move_to` 发现已在目标(tol=1)就直接返回, 游戏收不到任何移动事件;
|
||||||
|
镜牢「获得E.G.O饰品」弹窗在这种"原地连点"下会吞掉点击
|
||||||
|
(同坐标改用 pyautogui 的软件点击, 一次就过)。所以移动前先挪开 10px,
|
||||||
|
保证有一次真实的移动事件。环境变量: LCP_DRIVER_WIGGLE=0 关闭,
|
||||||
|
LCP_DRIVER_PRESS_MS 改按下时长。
|
||||||
"""
|
"""
|
||||||
|
press_ms = PRESS_MS if press_ms is None else press_ms
|
||||||
|
settle = SETTLE_SECONDS if settle is None else settle
|
||||||
|
wiggle = WIGGLE_ENABLED if wiggle is None else wiggle
|
||||||
if not self.ready:
|
if not self.ready:
|
||||||
return False
|
return False
|
||||||
|
# 只在"原地连点"时抖动: 目标与上一次点击几乎同一点时, move_to 会直接返回、
|
||||||
|
# 不发移动事件。其余点击保持原样, 免得改变正常流程的手感
|
||||||
|
# (2026-11-15 实测: 每次点击都抖动时, 镜牢入场流程卡住过一次)。
|
||||||
|
repeat = (self._last_click is not None
|
||||||
|
and abs(sx - self._last_click[0]) <= 4
|
||||||
|
and abs(sy - self._last_click[1]) <= 4)
|
||||||
|
self._last_click = (sx, sy)
|
||||||
|
if wiggle and repeat:
|
||||||
|
self.move_relative(-WIGGLE_PIXELS, -WIGGLE_PIXELS)
|
||||||
if not self.move_to(sx, sy, tol=tol):
|
if not self.move_to(sx, sy, tol=tol):
|
||||||
cx, cy = get_cursor()
|
cx, cy = get_cursor()
|
||||||
self.log('[driver] 定位失败: 目标(%d,%d) 实际(%d,%d), 不点击'
|
self.log('[driver] 定位失败: 目标(%d,%d) 实际(%d,%d), 不点击'
|
||||||
|
|||||||
Reference in New Issue
Block a user