Forráskód Böngészése

feat(Config): 桌面模式配置项与界面说明

- config_model:桌面模式下 handle 变“已开客户端窗口”下拉;回传展示串落盘前剥回纯 PID
- 新增 desktop_game_path 配置项(留空自动发现客户端安装目录)
- i18n 增加桌面模式说明(挂在 desktop_game_path 下)
User 1 hónapja
szülő
commit
f80c3a6d62

+ 2 - 0
assets/i18n/zh-CN.json

@@ -1,4 +1,6 @@
 {
+  "desktop_game_path": "桌面版安装目录",
+  "desktop_game_path_help": "本项:游戏安装目录(如D:\\yys)留空则自动查找。\n\n桌面版模式(Serial 填 \"desktop\" 启用;截图和控制方式只能选 window开头的,支持多开,不支持最小化):\n\n句柄Handle 填游戏窗口的进程 PID(多开时用于区分实例),PID 每次重启客户端都会变、需重新绑定(单开理论上只有第一次需要绑定);\n可以空启动一次脚本获取PID,使句柄Handle可展开进行选择\n或任务栏管理器查找直接填写;也可用管理员 cmd 在 OAS 目录下执行 【.\\toolkit\\python.exe -m dev_tools.bind_desktop_window --config 配置名 --pick】 一键绑定(配置名不带 .json;--pick 后把鼠标移到游戏窗口上回车,不用点击;多开改用 --list 选序号)\n\n游戏以管理员运行时 OAS 也需以管理员启动,否则 UIPI 会拦截点击(截图正常但无法点击点)。\n\n高分辨率设备请在游戏目录\\bin\\onmyoji.exe属性设置\\兼容性\\高DPI设置中勾选“替代高DPI缩放行为”,并选择“由应用程序执行”。",
   "boss_limit_time": "单局Boss限制时间",
   "kirin_battle_config": "麒麟战斗配置",
   "netherworld_battle_config": "阴界之门战斗配置",

+ 1 - 1
dev_tools/bind_desktop_window.py

@@ -108,7 +108,7 @@ def main():
         sys.exit(1)
     for i, (title, hwnd, pid) in enumerate(windows):
         print(f'[{i}] {title}  PID={pid}  HWND=0x{hwnd:X}')
-    choice = input('请输入要绑定的序号: ')
+    choice = input('请输入方括号内的序号: ')
     idx = int(choice)
     _, _, pid = windows[idx]
     bind_pid_to_config(args.config, pid)

+ 60 - 0
module/config/config_model.py

@@ -356,8 +356,58 @@ class ConfigModel(ConfigBase):
                         groups_value[key] = groups[group_name]
             result[key] = merge_value(groups_value[key], value, schema["$defs"])
 
+        self._inject_desktop_handle_options(result)
+
         return result
 
+    def _inject_desktop_handle_options(self, result: dict) -> None:
+        """桌面模式下把 handle 改成"已开客户端窗口"下拉,供界面选择而非手填 PID。
+
+        仅 serial == 'desktop' 时注入:handle 是桌面与模拟器共用字段,模拟器模式
+        需要保留窗口标题/HWND 的自由输入。字段类型仍是 str,只是补上候选项。
+        """
+        device_items = result.get('device')
+        if not device_items:
+            return
+        if getattr(self.script.device, 'serial', '') != 'desktop':
+            return
+        try:
+            from module.device.method.desktop_impl import desktop_window_option, list_desktop_windows
+            windows = list_desktop_windows()
+        except Exception as e:
+            # 枚举依赖 win32 且只服务于界面展示,失败时退回手填输入框
+            logger.warning(f'list desktop windows failed, handle stays a text input: {e}')
+            return
+
+        options = [desktop_window_option(w) for w in windows]
+        current = ''
+        for item in device_items:
+            if item['name'] == 'handle':
+                current = str(item.get('value') or '')
+                break
+        # 落盘的 handle 是纯 PID,候选项却是带标题坐标的展示串;界面靠"值等于候选项"
+        # 来选中,所以要把当前值换成同款展示串,否则下拉显示为空白
+        display = ''
+        for window, option in zip(windows, options):
+            if str(window['pid']) == current:
+                display = option
+                break
+        # 已绑定的 PID 此刻可能不在枚举结果里(客户端未启动/换了 PID),
+        # 原值仍作候选保留,让界面能看出配置里存的是谁
+        if current and not display:
+            display = current
+            options.append(current)
+        # 空串候选用于解除绑定
+        options.insert(0, '')
+
+        for item in device_items:
+            if item['name'] != 'handle':
+                continue
+            item['type'] = 'enum'
+            item['enumEnum'] = options
+            item['value'] = display
+            break
+
     def script_set_arg(self, task: str, group: str, argument: str, value) -> bool:
         # 验证参数
         task = convert_to_underscore(task)
@@ -386,6 +436,16 @@ class ConfigModel(ConfigBase):
         if isinstance(value, str) and value == 'false':
             value = False
 
+        # 桌面模式下 handle 在界面上是下拉项,回传的是 "PID (x,y)" 展示串,落盘前剥回
+        # 纯 PID;必须限定 desktop 模式,模拟器的 handle 允许填窗口标题等非数字文本
+        if (task == 'script' and group == 'device' and argument == 'handle'
+                and isinstance(value, str) and self.script.device.serial == 'desktop'):
+            from module.device.method.desktop_impl import desktop_option2pid
+            resolved = desktop_option2pid(value)
+            if resolved != value:
+                logger.info(f'Desktop handle option resolved to PID: {resolved}')
+            value = resolved
+
         task_object = getattr(self, task, None)
         group_object = getattr(task_object, group, None)
         if group_object is None:  # deal list

+ 4 - 0
tasks/Script/config_device.py

@@ -54,6 +54,10 @@ class Device(BaseModel):
                         description='serial_help')
     handle: str = Field(default='',
                         description='handle_help')
+    # 桌面客户端自动启动用:游戏安装目录(含 bin\onmyoji.exe 或 Launch.exe 的根目录),
+    # 留空时按 %ProgramFiles%\Onmyoji 与注册表 InstallLocation 自动发现;仅桌面模式使用
+    desktop_game_path: str = Field(default='',
+                                   description='desktop_game_path_help')
     package_name: PackageName = Field(title='Package Name',
                                       default=PackageName.AUTO,
                                       description='package_name_help')