feat(BetterGI): 新增更好的原神脚本专项适配

app/api/scripts.py

@@ -30,6 +30,7 @@
 from fastapi.responses import FileResponse
 
 from app.core import Config
+from app.models.config import BetterGIConfig as RuntimeBetterGIConfig
 from app.models.config import HSRConfig as RuntimeHSRConfig
 from app.models.config import MaaFWConfig as RuntimeMaaFWConfig
 from app.models.config import OkNteConfig as RuntimeOkNteConfig
@@ -62,6 +63,15 @@ def _hsr_script_config(script_id: str):
     return script_config
 
 
+def _bettergi_script_config(script_id: str):
+    """Resolve a BetterGI script and reject cross-type IDs before domain access."""
+
+    script_config = Config.ScriptConfig[uuid.UUID(script_id)]
+    if not isinstance(script_config, RuntimeBetterGIConfig):
+        raise TypeError("脚本配置类型错误, 不是 BetterGI 类型")
+    return script_config
+
+
 def _hsr_user_config(script_config: RuntimeHSRConfig, user_id: str):
     user_config = script_config.UserData[uuid.UUID(user_id)]
     return user_config
@@ -145,6 +155,7 @@ def _maafw_update_source_config(script_config: RuntimeMaaFWConfig) -> dict[str,
     "OkwwConfig": OkwwConfig,
     "OkNteConfig": OkNteConfig,
     "HSRConfig": HSRConfig,
+    "BetterGIConfig": BetterGIConfig,
 }
 USER_BOOK = {
     "MaaConfig": MaaUserConfig,
@@ -156,6 +167,7 @@ def _maafw_update_source_config(script_config: RuntimeMaaFWConfig) -> dict[str,
     "OkwwConfig": OkwwUserConfig,
     "OkNteConfig": OkNteUserConfig,
     "HSRConfig": HSRUserConfig,
+    "BetterGIConfig": BetterGIUserConfig,
 }
 
 
@@ -1133,6 +1145,117 @@ async def get_hsr_stage_options_api(
         )
 
 
+@router.get(
+    "/bettergi/strategies",
+    tags=["BetterGI"],
+    summary="获取 BetterGI 自动战斗策略选项",
+    response_model=ComboBoxOut,
+    status_code=200,
+)
+async def get_bettergi_strategies_api(scriptId: str) -> ComboBoxOut:
+    """返回 BetterGI 可用自动战斗策略：内置「根据队伍自动选择」+ ``{RootPath}/User/AutoFight/*.txt`` 文件名。"""
+
+    try:
+        script_config = _bettergi_script_config(scriptId)
+        root = Path(script_config.get("Info", "RootPath")).expanduser()
+        from app.task.BetterGI.tools import one_dragon
+
+        names = one_dragon.list_auto_boss_strategies(root)
+        data = [ComboBoxItem(label=n, value=n) for n in names]
+        return ComboBoxOut(
+            code=200,
+            status="success",
+            message=f"共 {len(data)} 个自动战斗策略选项",
+            data=data,
+        )
+    except Exception as e:
+        return ComboBoxOut(
+            code=400 if isinstance(e, (ValueError, KeyError, TypeError, RuntimeError))
+            else 500,
+            status="error",
+            message=f"{type(e).__name__}: {str(e)}",
+            data=[],
+        )
+
+
+@router.get(
+    "/bettergi/one-dragon/custom-groups",
+    tags=["BetterGI"],
+    summary="获取 BetterGI 一条龙自定义配置组",
+    response_model=BetterGICustomGroupsOut,
+    status_code=200,
+)
+async def get_bettergi_custom_groups_api(
+    scriptId: str, configName: str = "", useMasConfig: bool = False
+) -> BetterGICustomGroupsOut:
+    """返回指定一条龙配置里的自定义配置组（非内置 8 组）及其启用状态，供前端表格自动加载。
+
+    ``useMasConfig=True``（用户独立配置）时改读 MAS 运行时槽位「MAS独立配置」：独立模式的
+    per-user 配置物化在槽位而非 {configName} 实配，读槽位才能列到用户刚在 BGI GUI 里往
+    独立配置添加的自定义组。
+    """
+
+    try:
+        script_config = _bettergi_script_config(scriptId)
+        root = Path(script_config.get("Info", "RootPath")).expanduser()
+        from app.task.BetterGI.tools import one_dragon
+
+        read_name = (
+            one_dragon.launch_slot_name()
+            if useMasConfig
+            else one_dragon.resolve_config_name(configName)
+        )
+        items = one_dragon.list_custom_groups(root, read_name)
+        data = [BetterGICustomGroupOut(**item) for item in items]
+        return BetterGICustomGroupsOut(
+            code=200,
+            status="success",
+            message=f"共 {len(data)} 个自定义配置组",
+            data=data,
+        )
+    except Exception as e:
+        return BetterGICustomGroupsOut(
+            code=400 if isinstance(e, (ValueError, KeyError, TypeError, RuntimeError))
+            else 500,
+            status="error",
+            message=f"{type(e).__name__}: {str(e)}",
+            data=[],
+        )
+
+
+@router.get(
+    "/bettergi/one-dragon/configs",
+    tags=["BetterGI"],
+    summary="获取 BetterGI 一条龙配置名列表",
+    response_model=ComboBoxOut,
+    status_code=200,
+)
+async def get_bettergi_one_dragon_configs_api(scriptId: str) -> ComboBoxOut:
+    """返回 BetterGI 可选一条龙配置名：{RootPath}/User/OneDragon/*.json 文件名（默认配置置顶）。"""
+
+    try:
+        script_config = _bettergi_script_config(scriptId)
+        root = Path(script_config.get("Info", "RootPath")).expanduser()
+        from app.task.BetterGI.tools import one_dragon
+
+        names = one_dragon.list_one_dragon_configs(root)
+        data = [ComboBoxItem(label=n, value=n) for n in names]
+        return ComboBoxOut(
+            code=200,
+            status="success",
+            message=f"共 {len(data)} 个一条龙配置",
+            data=data,
+        )
+    except Exception as e:
+        return ComboBoxOut(
+            code=400 if isinstance(e, (ValueError, KeyError, TypeError, RuntimeError))
+            else 500,
+            status="error",
+            message=f"{type(e).__name__}: {str(e)}",
+            data=[],
+        )
+
+
 @router.get(
     "/hsr/capabilities",
     tags=["HSR"],

app/core/config.py

@@ -49,6 +49,7 @@
     OkwwConfig,
     OkNteConfig,
     HSRConfig,
+    BetterGIConfig,
     HSRUserConfig,
     MaaPlanConfig,
     MaaEndPlanConfig,
@@ -62,6 +63,7 @@
     GeneralUserConfig,
     OkwwUserConfig,
     OkNteUserConfig,
+    BetterGIUserConfig,
     GlobalConfig,
     CLASS_BOOK,
     PLAN_BOOK,
@@ -739,6 +741,7 @@ async def add_script(
             "Okww",
             "OkNte",
             "HSR",
+            "BetterGI",
         ],
         script_id: str | None = None,
     ) -> tuple[
@@ -751,7 +754,8 @@ async def add_script(
         | MaaFWConfig
         | OkwwConfig
         | OkNteConfig
-        | HSRConfig,
+        | HSRConfig
+        | BetterGIConfig,
     ]:
         """添加脚本配置"""
 
@@ -1051,7 +1055,8 @@ async def add_user(
         | MaaFWUserConfig
         | OkwwUserConfig
         | OkNteUserConfig
-        | HSRUserConfig,
+        | HSRUserConfig
+        | BetterGIUserConfig,
     ]:
         """添加用户配置"""
 
@@ -1088,6 +1093,8 @@ async def add_user(
             uid, config = await script_config.UserData.add(MaaFWUserConfig)
         elif isinstance(script_config, HSRConfig):
             uid, config = await script_config.UserData.add(HSRUserConfig)
+        elif isinstance(script_config, BetterGIConfig):
+            uid, config = await script_config.UserData.add(BetterGIUserConfig)
         else:
             raise TypeError(f"不支持的脚本配置类型: {type(script_config)}")
 

app/core/task_manager.py

@@ -40,6 +40,7 @@
     OkNteConfig,
     HSRConfig,
     MaaFWConfig,
+    BetterGIConfig,
 )
 
 # 延迟加载 System，避免 app.services 初始化期间触发循环导入；
@@ -407,6 +408,8 @@ async def _run_main_task(self):
                     task_item = task.M9AManager(script_item)
                 elif isinstance(script_config, HSRConfig):
                     task_item = task.HSRManager(script_item)
+                elif isinstance(script_config, BetterGIConfig):
+                    task_item = task.BetterGIManager(script_item)
                 elif isinstance(script_config, MaaFWConfig):
                     task_item = task.MaaFWEmbeddedManager(script_item)
                 else: