feat: 不再适配模拟器

Author: Windsland52

custom/app.py

@@ -2,7 +2,6 @@
 
 用法：
     uv run python -m custom.app --profile test_30f_1280x720.json
-    uv run python -m custom.app --profile test_30f_1280x720.json --mode adb
 
 启动后：
 - 悬浮窗显示实时帧/计时器
@@ -24,7 +23,6 @@
 from PySide6.QtCore import QThread, QTimer  # noqa: E402
 from PySide6.QtWidgets import QApplication  # noqa: E402
 
-from custom import config  # noqa: E402
 from custom.core.battle.action import ActionType  # noqa: E402
 from custom.core.timing import calibration  # noqa: E402
 from custom.measure.api_server import ApiServer  # noqa: E402
@@ -56,13 +54,6 @@ def _key_pressed(vk: int) -> bool:
         return False
 
 
-# 模拟器 ROI（CostBarRuler 原值）
-_ROI_ADB = {
-    "X1_OFFSET_FROM_RIGHT": config.REF_WIDTH - 1740,
-    "Y1_OFFSET_FROM_BOTTOM": config.REF_HEIGHT - 810,
-    "Y2_OFFSET_FROM_BOTTOM": config.REF_HEIGHT - 817,
-}
-
 # 热键防抖
 _key_states: dict[int, bool] = {_VK_F8: False, _VK_F9: False, _VK_F10: False}
 
@@ -90,33 +81,9 @@ def _connect_win32(Toolkit):
     return ctrl
 
 
-def _connect_adb(Toolkit):
-    from maa.controller import AdbController
-
-    devices = Toolkit.find_adb_devices()
-    if not devices:
-        logger.error("未找到 ADB 设备")
-        return None
-    d = devices[0]
-    logger.info("ADB 设备: %s @ %s", d.name, d.address)
-    ctrl = AdbController(
-        adb_path=d.adb_path,
-        address=d.address,
-        screencap_methods=d.screencap_methods,
-        input_methods=d.input_methods,
-        config=d.config,
-    )
-    ctrl.post_connection().wait()
-    for key, val in _ROI_ADB.items():
-        setattr(config, key, val)
-    logger.info("已切换到模拟器 ROI")
-    return ctrl
-
-
 def main() -> int:
     parser = argparse.ArgumentParser(description="ArknightsAutoOperator 集成应用")
     parser.add_argument("--profile", required=True, help="校准文件名")
-    parser.add_argument("--mode", choices=["win32", "adb"], default="win32")
     parser.add_argument("--port", type=int, default=2606)
     parser.add_argument("--no-api", action="store_true")
     parser.add_argument("--no-editor", action="store_true")
@@ -133,7 +100,7 @@ def main() -> int:
     data = calibration.load(args.profile)
     logger.info("校准 %s：%d 档 (%s)", args.profile, len(data.profiles), data.detection_mode)
 
-    controller = _connect_adb(Toolkit) if args.mode == "adb" else _connect_win32(Toolkit)
+    controller = _connect_win32(Toolkit)
     if controller is None:
         return 2
 

custom/config.py

@@ -52,12 +52,6 @@
 MOUSE_WAIT_MS = 100
 GENERAL_WAIT_MS = 300
 
-# PC frame-step timing (AFA hotkey_actions.ahk): resume then pause for ~1 frame.
-# Intentionally < (1000/30)=33.3ms to avoid advancing two frames under jitter.
-PC_STEP_1X_MS = 30  # 1 logical frame at 1x speed
-PC_STEP_BULLET_MS = 165  # 1 logical frame at 0.2x (bullet-time) speed
-PC_KEY_DELAY_MS = 50
-
 # --- Game native keybindings (PC client, Arknights.exe) ---
 VK_SPACE = 0x20  # pause
 VK_ESCAPE = 0x1B  # menu / resume

custom/core/afa_hotkey.py

@@ -0,0 +1,206 @@
+"""AFA（明日方舟帧操小助手）热键驱动。
+
+AFA 是独立常驻的 AutoHotkey 工具，注册全局热键完成暂停/步进/技能/撤退的复杂按键时序。
+本模块不复刻 AFA 的时序，而是通过 SendInput 模拟按下 AFA 的热键，让 AFA 代为执行。
+
+前提（来自 reference/arknights-frame-assistant-main/src/lib/hotkey_control.ahk）：
+- 热键注册为 ``HotIfWinActive("ahk_exe Arknights.exe")`` → 游戏窗口必须前台激活才生效。
+- 热键未加 ``$`` 屏蔽符 → SendInput 模拟的按键能触发 AFA 热键。
+- 步进/暂停选中/暂停技能/暂停撤退内部检查 ``IsMouseInClient()`` →
+  发这些键前真实光标必须在游戏客户区内。
+
+AFA 默认热键（reference/.../config.ahk）：
+    F          = 按下暂停（ActionPressPause → ESC 脉冲 → 游戏暂停）
+    Space      = 松开暂停（ActionReleasePause → Space 脉冲 → 游戏恢复）
+    R          = 前进 33ms（Action33ms → 步进 1 帧，需游戏已暂停）
+    W          = 暂停选中（ActionPauseSelect → 暂停下选中光标处单位）
+    S          = 单位技能（ActionSkill → 发 E，需先 W 选中）
+    A          = 单位撤退（ActionRetreat → 发 Q，需先 W 选中）
+
+技能/撤退流程：暂停态下 move_cursor 到单位 → W 选中 → S（技能）/A（撤退）。
+S/A 用前台 Send 发 E/Q，暂停态有效（不同于 MAA PostMessage 的后台按键）。
+
+注意：Action33ms 假设调用时游戏已处于暂停状态。调用方必须自行维护暂停状态机
+（见 executor 的 pause invariant），不能盲目发 R。
+"""
+
+from __future__ import annotations
+
+import ctypes
+import ctypes.wintypes as wintypes
+import logging
+import sys
+
+logger = logging.getLogger(__name__)
+
+_is_windows = sys.platform == "win32"
+
+# --- AFA 默认热键（虚拟键码） ---
+VK_F = 0x46
+VK_SPACE = 0x20
+VK_R = 0x52
+VK_W = 0x57
+VK_S = 0x53  # 单位技能（ActionSkill → 发 E）
+VK_A = 0x41  # 单位撤退（ActionRetreat → 发 Q）
+
+# 鼠标侧键（SendInput mouseData 的 wButton 值）
+XBUTTON1 = 0x0001  # 后侧键 → AFA 暂停撤退
+XBUTTON2 = 0x0002  # 前侧键 → AFA 暂停技能
+
+# SendInput 常量
+_INPUT_KEYBOARD = 1
+_INPUT_MOUSE = 2
+_KEYEVENTF_KEYUP = 0x0002
+_MOUSEEVENTF_XDOWN = 0x0080
+_MOUSEEVENTF_XUP = 0x0100
+
+
+class _MOUSEINPUT(ctypes.Structure):
+    _fields_ = [
+        ("dx", wintypes.LONG),
+        ("dy", wintypes.LONG),
+        ("mouseData", wintypes.DWORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(wintypes.ULONG)),
+    ]
+
+
+class _KEYBDINPUT(ctypes.Structure):
+    _fields_ = [
+        ("wVk", wintypes.WORD),
+        ("wScan", wintypes.WORD),
+        ("dwFlags", wintypes.DWORD),
+        ("time", wintypes.DWORD),
+        ("dwExtraInfo", ctypes.POINTER(wintypes.ULONG)),
+    ]
+
+
+class _INPUT_UNION(ctypes.Union):
+    _fields_ = [
+        ("ki", _KEYBDINPUT),
+        ("mi", _MOUSEINPUT),
+    ]
+
+
+class _INPUT(ctypes.Structure):
+    _anonymous_ = ("u",)
+    _fields_ = [
+        ("type", wintypes.DWORD),
+        ("u", _INPUT_UNION),
+    ]
+
+
+if _is_windows:
+    _user32 = ctypes.windll.user32  # type: ignore[attr-defined] # pyright: ignore[reportAttributeAccessIssue]
+    # SendInput
+    _user32.SendInput.argtypes = [wintypes.UINT, ctypes.POINTER(_INPUT), ctypes.c_int]
+    _user32.SendInput.restype = wintypes.UINT
+    # SetCursorPos
+    _user32.SetCursorPos.argtypes = [ctypes.c_int, ctypes.c_int]
+    _user32.SetCursorPos.restype = wintypes.BOOL
+    # 窗口枚举/标题
+    _user32.EnumWindows.argtypes = [ctypes.c_void_p, wintypes.LPARAM]
+    _user32.EnumWindows.restype = wintypes.BOOL
+    _user32.GetWindowTextLengthW.argtypes = [wintypes.HWND]
+    _user32.GetWindowTextLengthW.restype = ctypes.c_int
+    _user32.GetWindowTextW.argtypes = [wintypes.HWND, wintypes.LPWSTR, ctypes.c_int]
+    _user32.GetWindowTextW.restype = ctypes.c_int
+    _user32.IsWindowVisible.argtypes = [wintypes.HWND]
+    _user32.IsWindowVisible.restype = wintypes.BOOL
+    # 窗口几何/前台
+    _user32.GetClientRect.argtypes = [wintypes.HWND, ctypes.POINTER(wintypes.RECT)]
+    _user32.ClientToScreen.argtypes = [wintypes.HWND, ctypes.POINTER(wintypes.POINT)]
+    _user32.SetForegroundWindow.argtypes = [wintypes.HWND]
+    _user32.SetForegroundWindow.restype = wintypes.BOOL
+    _user32.IsIconic.argtypes = [wintypes.HWND]
+    _user32.IsIconic.restype = wintypes.BOOL
+    _user32.ShowWindowAsync.argtypes = [wintypes.HWND, ctypes.c_int]
+    _user32.ShowWindowAsync.restype = wintypes.BOOL
+
+
+def _send_keyboard(vk: int, up: bool) -> None:
+    inp = _INPUT()
+    inp.type = _INPUT_KEYBOARD
+    inp.ki.wVk = vk
+    inp.ki.dwFlags = _KEYEVENTF_KEYUP if up else 0
+    _user32.SendInput(1, ctypes.byref(inp), ctypes.sizeof(_INPUT))
+
+
+def _send_mouse_xbutton(button: int, up: bool) -> None:
+    inp = _INPUT()
+    inp.type = _INPUT_MOUSE
+    inp.mi.mouseData = button
+    inp.mi.dwFlags = _MOUSEEVENTF_XUP if up else _MOUSEEVENTF_XDOWN
+    _user32.SendInput(1, ctypes.byref(inp), ctypes.sizeof(_INPUT))
+
+
+def tap_key(vk: int) -> None:
+    """按下并松开一个键盘键（触发 AFA 热键）。"""
+    if not _is_windows:
+        return
+    _send_keyboard(vk, up=False)
+    _send_keyboard(vk, up=True)
+
+
+def tap_mouse_xbutton(button: int) -> None:
+    """按下并松开一个鼠标侧键（XBUTTON1/XBUTTON2）。"""
+    if not _is_windows:
+        return
+    _send_mouse_xbutton(button, up=False)
+    _send_mouse_xbutton(button, up=True)
+
+
+def find_game_window(title_substr: str = "明日方舟") -> int | None:
+    """按窗口标题包含的字串查找游戏窗口 HWND。"""
+    if not _is_windows:
+        return None
+    EnumWindowsProc = ctypes.WINFUNCTYPE(  # type: ignore[attr-defined] # pyright: ignore[reportAttributeAccessIssue]
+        wintypes.BOOL, wintypes.HWND, wintypes.LPARAM
+    )
+    found: list[int] = []
+
+    def _cb(hwnd: int, _lparam: int) -> int:
+        length = _user32.GetWindowTextLengthW(hwnd)
+        if length > 0:
+            buf = ctypes.create_unicode_buffer(length + 1)
+            _user32.GetWindowTextW(hwnd, buf, length + 1)
+            if title_substr in buf.value and _user32.IsWindowVisible(hwnd):
+                found.append(hwnd)
+        return 1  # 继续枚举
+
+    _user32.EnumWindows(EnumWindowsProc(_cb), 0)
+    return found[0] if found else None
+
+
+def activate(hwnd: int) -> None:
+    """把游戏窗口拉到前台（AFA 热键要求游戏前台激活）。"""
+    if not _is_windows:
+        return
+    if _user32.IsIconic(hwnd):  # 最小化则先还原
+        _user32.ShowWindowAsync(hwnd, 9)  # SW_RESTORE
+    _user32.SetForegroundWindow(hwnd)
+
+
+def client_to_screen_ratio(hwnd: int, rx: float, ry: float) -> tuple[int, int]:
+    """客户区比例 (0-1) → 屏幕坐标 (px)。
+
+    Args:
+        hwnd: 游戏窗口句柄。
+        rx, ry: 客户区内归一化坐标（与投影 view_pos 一致）。
+    """
+    rect = wintypes.RECT()
+    _user32.GetClientRect(hwnd, ctypes.byref(rect))
+    width = rect.right - rect.left
+    height = rect.bottom - rect.top
+    pt = wintypes.POINT(int(rx * width), int(ry * height))
+    _user32.ClientToScreen(hwnd, ctypes.byref(pt))
+    return pt.x, pt.y
+
+
+def move_cursor(hwnd: int, rx: float, ry: float) -> None:
+    """把真实光标移到游戏客户区的 (rx, ry) 比例位置（AFA IsMouseInClient 要求）。"""
+    if not _is_windows:
+        return
+    x, y = client_to_screen_ratio(hwnd, rx, ry)
+    _user32.SetCursorPos(x, y)

custom/core/avatar.py

@@ -11,6 +11,7 @@
 import json
 import logging
 import time
+import unicodedata
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -48,6 +49,18 @@ def _get_char_id(oper_name: str) -> str:
     return mapping.get(oper_name, "")
 
 
+def _normalize_name(name: str) -> str:
+    """归一化干员名用于匹配（OCR 结果可能与原名有字形差异）。
+
+    - NFKC：上标 ²→2、Ⅲ→III、全角字母数字→半角。
+    - 去除空白。
+    """
+    if not name:
+        return ""
+    name = unicodedata.normalize("NFKC", name)
+    return name.replace(" ", "").replace("　", "")
+
+
 def detect_slots(
     context: Context,
     image: np.ndarray,
@@ -174,14 +187,13 @@ def locate_oper(
         time.sleep(0.3)
 
         if name:
-            # 存头像（从原始 deployment 截图截取，不是详情页）
-            _save_avatar_from_image(image, slot, name)
+            matched = _normalize_name(name) == _normalize_name(oper_name)
+            # 匹配则用原名存（保证 char_id 正确），否则用 OCR 名存（供后续复用）
+            _save_avatar_from_image(image, slot, oper_name if matched else name)
 
-            if name == oper_name:
-                cx = click_x
-                cy = click_y
-                logger.info("找到目标干员 %s 在槽位 %d", oper_name, i)
-                return (cx / w, cy / h)
+            if matched:
+                logger.info("找到目标干员 %s 在槽位 %d（OCR=%s）", oper_name, i, name)
+                return (click_x / w, click_y / h)
 
     logger.error("未找到干员 %s", oper_name)
     return None

custom/core/battle/action.py

@@ -40,6 +40,7 @@ class Action:
     alias: str | None = None
 
     # 运行时填充
+    target_frame: int = 0  # 目标累计帧（executor 用）
     tile_pos: tuple[int, int] | None = None  # (col, row)
     avatar_pos: tuple[float, float] | None = None  # 屏幕比例 (x, y)
     view_pos_front: tuple[float, float] | None = None