feat: 安装 AquaMai 时选择版本

Author: clansty

MaiChartManager/AquaMai/140/AquaMai.dll MaiChartManager/AquaMai/SDEZ/AquaMai.dllMaiChartManager/AquaMai/140/AquaMai.dll renamed to MaiChartManager/AquaMai/SDEZ/AquaMai.dll

@@ -82,16 +82,18 @@ public void InstallMelonLoader()
         }
     }
 
-    [HttpPost]
-    public void InstallAquaMai()
+    public enum GameEdition
     {
-        var version = "145";
-        if (settings.gameVersion < 45)
-        {
-            version = "140";
-        }
+        SDGA,
+        SDEZ
+    }
 
-        var src = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "AquaMai", version, "AquaMai.dll");
+    public record InstallAquaMaiRequest(GameEdition Version);
+
+    [HttpPost]
+    public void InstallAquaMai(InstallAquaMaiRequest request)
+    {
+        var src = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "AquaMai", request.Version.ToString(), "AquaMai.dll");
         var dest = Path.Combine(StaticSettings.GamePath, @"Mods\AquaMai.dll");
         Directory.CreateDirectory(Path.GetDirectoryName(dest));
         System.IO.File.Copy(src, dest, true);

MaiChartManager/AquaMai/145/AquaMai.dll MaiChartManager/AquaMai/SDGA/AquaMai.dllMaiChartManager/AquaMai/145/AquaMai.dll renamed to MaiChartManager/AquaMai/SDGA/AquaMai.dll

@@ -53,13 +53,21 @@ export interface Config {
   cheat?: CheatConfig;
   performance?: PerformanceConfig;
   fix?: FixConfig;
+  utils?: UtilsConfig;
 }
 
 export interface FixConfig {
   skipVersionCheck?: boolean;
   removeEncryption?: boolean;
   forceAsServer?: boolean;
   forceFreePlay?: boolean;
+  /** @format int32 */
+  extendNotesPool?: number;
+}
+
+export enum GameEdition {
+  SDGA = "SDGA",
+  SDEZ = "SDEZ",
 }
 
 export interface GameModInfo {
@@ -133,6 +141,10 @@ export interface ImportChartResult {
   fatal?: boolean;
 }
 
+export interface InstallAquaMaiRequest {
+  version?: GameEdition;
+}
+
 export enum MessageLevel {
   Info = "Info",
   Warning = "Warning",
@@ -229,6 +241,10 @@ export interface UploadAssetDirResult {
   dirName?: string | null;
 }
 
+export interface UtilsConfig {
+  logUserId?: boolean;
+}
+
 export interface VersionXml {
   assetDir?: string | null;
   /** @format int32 */
@@ -1118,10 +1134,12 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name InstallAquaMai
      * @request POST:/MaiChartManagerServlet/InstallAquaMaiApi
      */
-    InstallAquaMai: (params: RequestParams = {}) =>
+    InstallAquaMai: (data: InstallAquaMaiRequest, params: RequestParams = {}) =>
       this.request<void, any>({
         path: `/MaiChartManagerServlet/InstallAquaMaiApi`,
         method: "POST",
+        body: data,
+        type: ContentType.Json,
         ...params,
       }),
 

MaiChartManager/Controllers/ModController.cs

@@ -1,6 +1,6 @@
 import { computed, defineComponent, onMounted, PropType, ref, watch } from "vue";
 import { NButton, NCheckbox, NDivider, NFlex, NFormItem, NInput, NModal, NScrollbar, NSwitch, useDialog } from "naive-ui";
-import { Config, GameModInfo } from "@/client/apiGen";
+import { Config, GameEdition, GameModInfo } from "@/client/apiGen";
 import comments from './modComments.yaml';
 import api from "@/client/api";
 import { capitalCase } from "change-case";
@@ -30,6 +30,7 @@ export default defineComponent({
     const installingMelonLoader = ref(false)
     const installingAquaMai = ref(false)
     const showAquaMaiInstallDone = ref(false)
+    const showVersionSelect = ref(false);
 
     onMounted(async () => {
       config.value = (await api.GetAquaMaiConfig()).data;
@@ -47,12 +48,17 @@ export default defineComponent({
       }
     }
 
-    const installAquaMai = async () => {
+    const installAquaMai = async (version?: GameEdition) => {
+      showVersionSelect.value = false
       if (showAquaMaiInstallDone.value) return
+      if (!version) {
+        showVersionSelect.value = true
+        return
+      }
       try {
         // 但是你根本看不到这个加载图标，因为太快了
         installingAquaMai.value = true
-        await api.InstallAquaMai()
+        await api.InstallAquaMai({version})
         await props.refresh()
         showAquaMaiInstallDone.value = true
         setTimeout(() => showAquaMaiInstallDone.value = false, 3000);
@@ -85,7 +91,7 @@ export default defineComponent({
           {props.info.aquaMaiInstalled ?
             props.info.aquaMaiVersion === props.info.bundledAquaMaiVersion ? <span class="c-green-6">已安装</span> : <span class="c-orange">可更新</span> :
             <span class="c-red-6">未安装</span>}
-          <NButton secondary loading={installingAquaMai.value} onClick={installAquaMai}
+          <NButton secondary loading={installingAquaMai.value} onClick={() => installAquaMai()}
                    type={showAquaMaiInstallDone.value ? 'success' : 'default'}>
             {showAquaMaiInstallDone.value ? <span class="i-material-symbols-done"/> : props.info.aquaMaiInstalled ? '重新安装 / 更新' : '安装'}
           </NButton>
@@ -110,6 +116,17 @@ export default defineComponent({
           </>)}
         </NScrollbar>}
       </NFlex>
+      <NModal
+        preset="card"
+        class="w-[min(50vw,50em)]"
+        title="请选择你的游戏类型"
+        v-model:show={showVersionSelect.value}
+      >
+        <NFlex vertical>
+          <NButton secondary onClick={() => installAquaMai(GameEdition.SDGA)}>SDGA</NButton>
+          <NButton secondary onClick={() => installAquaMai(GameEdition.SDEZ)}>SDEZ</NButton>
+        </NFlex>
+      </NModal>
     </NModal>;
   }
 })

MaiChartManager/Front/src/client/apiGen.ts

@@ -89,6 +89,12 @@
       <None Update="AquaMai\MelonLoader.x64.zip">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
+      <None Update="AquaMai\SDEZ\AquaMai.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+      <None Update="AquaMai\SDGA\AquaMai.dll">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 
     <ItemGroup>
@@ -98,7 +104,7 @@
 
     <ItemGroup>
       <Reference Include="AquaMai">
-        <HintPath>AquaMai\145\AquaMai.dll</HintPath>
+        <HintPath>AquaMai\SDGA\AquaMai.dll</HintPath>
       </Reference>
       <Reference Include="AssetStudio">
         <HintPath>Libs\AssetStudio.dll</HintPath>
@@ -114,11 +120,6 @@
       </Reference>
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="AquaMai\140\" />
-      <Folder Include="AquaMai\145\" />
-    </ItemGroup>
-
     <ItemGroup>
       <EmbeddedResource Update="Properties\Resources.resx">
         <Generator>ResXFileCodeGenerator</Generator>