[+] Splash+ support

AquaMai/Fix/BasicFix.cs

@@ -48,14 +48,6 @@ public class BasicFix
         return false;
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(GameManager), "CalcSpecialNum")]
-    private static bool CalcSpecialNum(ref int __result)
-    {
-        __result = 1024;
-        return false;
-    }
-
     [HarmonyPostfix]
     [HarmonyPatch(typeof(NetHttpClient), MethodType.Constructor)]
     private static void OnNetHttpClientConstructor(NetHttpClient __instance)
@@ -75,4 +67,21 @@ public class BasicFix
         // Unset the certificate validation callback (SSL pinning) to restore the default behavior
         ServicePointManager.ServerCertificateValidationCallback = null;
     }
+
+    public static void DoCustomPatch(HarmonyLib.Harmony h)
+    {
+        if (typeof(GameManager).GetMethod("CalcSpecialNum") is null) return;
+        h.PatchAll(typeof(CalcSpecialNumPatch));
+    }
+
+    private class CalcSpecialNumPatch
+    {
+        [HarmonyPrefix]
+        [HarmonyPatch(typeof(GameManager), "CalcSpecialNum")]
+        private static bool CalcSpecialNum(ref int __result)
+        {
+            __result = 1024;
+            return false;
+        }
+    }
 }

AquaMai/Helpers/GameInfo.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using MAI2System;
+
+namespace AquaMai.Helpers;
+
+public class GameInfo
+{
+    public static uint GameVersion { get; } = GetGameVersion();
+
+    private static uint GetGameVersion()
+    {
+        return (uint)typeof(ConstParameter).GetField("NowGameVersion", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).GetValue(null);
+    }
+
+    public static string GameId { get; } = GetGameId();
+
+    private static string GetGameId()
+    {
+        return typeof(ConstParameter).GetField("GameIDStr", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).GetValue(null) as string;
+    }
+}

AquaMai/Main.cs

@@ -155,11 +155,14 @@ namespace AquaMai
             Patch(typeof(FixCharaCrash));
             Patch(typeof(BasicFix));
             Patch(typeof(DisableReboot));
+            if (GameInfo.GameVersion >= 23000)
                 Patch(typeof(ExtendNotesPool));
             Patch(typeof(FixCheckAuth));
             Patch(typeof(DebugFeature));
+            if (GameInfo.GameVersion >= 23000)
                 Patch(typeof(FixConnSlide));
             Patch(typeof(SlideAutoPlayTweak));
+            if (GameInfo.GameVersion >= 24000)
                 Patch(typeof(FixLevelDisplay));
             // UX
             Patch(typeof(CustomVersionString));

AquaMai/Resources/Locale.Designer.cs

@@ -70,7 +70,6 @@ namespace AquaMai.Resources {
         
         /// <summary>
         ///   Looks up a localized string similar to Errors detected while loading!
-        ///- Check if you have installed the wrong version of AquaMai, such as using SDEZ version on SDGA
         ///- Are you using a modified Assembly-CSharp.dll, which will cause inconsistent functions and cannot find the functions that need to be modified
         ///- Check for conflicting mods, or enabled incompatible options.
         /// </summary>

AquaMai/Resources/Locale.resx

@@ -59,7 +59,6 @@
     </data>
     <data name="LoadError" xml:space="preserve">
         <value>Errors detected while loading!
-- Check if you have installed the wrong version of AquaMai, such as using SDEZ version on SDGA
 - Are you using a modified Assembly-CSharp.dll, which will cause inconsistent functions and cannot find the functions that need to be modified
 - Check for conflicting mods, or enabled incompatible options</value>
     </data>

AquaMai/Resources/Locale.zh.resx

@@ -52,7 +52,6 @@
     </data>
     <data name="LoadError" xml:space="preserve">
         <value>加载过程中检测到错误！
-- 请检查你是否安装了错误的 AquaMai 版本，比如在 SDGA 上使用了 SDEZ 的版本
 - 你是否正在使用魔改的 Assembly-CSharp.dll，这会导致函数不一致而无法找到需要修改的函数
 - 请检查是否有冲突的 Mod，或者开启了不兼容的选项</value>
     </data>

AquaMai/UX/QuickSkip.cs

@@ -10,8 +10,8 @@ using Monitor;
 using Process;
 using UnityEngine;
 
-namespace AquaMai.UX
-{
+namespace AquaMai.UX;
+
 public class QuickSkip
 {
     private static int _keyPressFrames;
@@ -79,13 +79,21 @@ namespace AquaMai.UX
             traverse.Method("SetRelease").GetValue();
         }
 
-            if (Input.GetKey(KeyCode.Alpha7) || InputManager.GetSystemInputPush(InputManager.SystemButtonSetting.ButtonService))
+        if (Input.GetKey(KeyCode.Alpha7) || InputManager.GetSystemInputPush(InputManager.SystemButtonSetting.ButtonService) && GameInfo.GameVersion >= 23000)
         {
             // This is original typo in Assembly-CSharp
             Singleton<GamePlayManager>.Instance.SetQuickRetryFrag(flag: true);
         }
     }
 
+    public static void DoCustomPatch(HarmonyLib.Harmony h)
+    {
+        if (GameInfo.GameVersion < 23000) return;
+        h.PatchAll(typeof(FestivalAndLaterQuickRetryPatch));
+    }
+
+    private class FestivalAndLaterQuickRetryPatch
+    {
         [HarmonyPrefix]
         [HarmonyPatch(typeof(QuickRetry), "IsQuickRetryEnable")]
         public static bool OnQuickRetryIsQuickRetryEnable(ref bool __result)

AquaMai/Utils/GameInfo.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using MAI2System;
-
-namespace AquaMai.Utils;
-
-public class GameInfo
-{
-    public static uint GetGameVersion()
-    {
-        return (uint) typeof(ConstParameter).GetField("NowGameVersion", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).GetValue(null);
-    }
-    
-    public static string GetGameId()
-    {
-        return typeof(ConstParameter).GetField("GameIDStr", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy).GetValue(null) as string;
-    }
-}