diff --git a/AquaMai/.gitignore b/AquaMai/.gitignore index d2f23041..4ddf2a82 100644 --- a/AquaMai/.gitignore +++ b/AquaMai/.gitignore @@ -373,4 +373,5 @@ MigrationBackup/ Output .idea Libs/Assembly-CSharp.dll +Libs/AMDaemon.NET.dll packages \ No newline at end of file diff --git a/AquaMai/AquaMai.csproj b/AquaMai/AquaMai.csproj index 0c89f1ce..eb83fb62 100644 --- a/AquaMai/AquaMai.csproj +++ b/AquaMai/AquaMai.csproj @@ -275,6 +275,7 @@ + @@ -283,7 +284,6 @@ - diff --git a/AquaMai/Fix/BasicFix.cs b/AquaMai/Fix/BasicFix.cs index 3b9ef824..01e12697 100644 --- a/AquaMai/Fix/BasicFix.cs +++ b/AquaMai/Fix/BasicFix.cs @@ -3,15 +3,13 @@ using AMDaemon.Allnet; using HarmonyLib; using Manager; using Manager.Operation; -using IniFile = MAI2System.IniFile; -using Network = AMDaemon.Network; namespace AquaMai.Fix; public class BasicFix { [HarmonyPrefix] - [HarmonyPatch(typeof(IniFile), "clear")] + [HarmonyPatch(typeof(MAI2System.IniFile), "clear")] private static bool PreIniFileClear() { return false; @@ -26,7 +24,7 @@ public class BasicFix } [HarmonyPrefix] - [HarmonyPatch(typeof(Network), "IsLanAvailable", MethodType.Getter)] + [HarmonyPatch(typeof(AMDaemon.Network), "IsLanAvailable", MethodType.Getter)] private static bool PreIsLanAvailable(ref bool __result) { __result = false; @@ -42,4 +40,12 @@ public class BasicFix ____operationData.ServerUri = Auth.GameServerUri; } } + + [HarmonyPrefix] + [HarmonyPatch(typeof(Manager.Credit), "IsFreePlay")] + private static bool PreIsFreePlay(ref bool __result) + { + __result = true; + return false; + } } diff --git a/AquaMai/UX/DisableReboot.cs b/AquaMai/Fix/DisableReboot.cs similarity index 80% rename from AquaMai/UX/DisableReboot.cs rename to AquaMai/Fix/DisableReboot.cs index ace7e2ca..984e381b 100644 --- a/AquaMai/UX/DisableReboot.cs +++ b/AquaMai/Fix/DisableReboot.cs @@ -1,7 +1,7 @@ using HarmonyLib; using Manager.Operation; -namespace AquaMai.UX +namespace AquaMai.Fix { public class DisableReboot { @@ -13,7 +13,7 @@ namespace AquaMai.UX __result = false; return false; } - + // IsUnderServerMaintenance [HarmonyPrefix] [HarmonyPatch(typeof(MaintenanceTimer), "IsUnderServerMaintenance")] @@ -22,7 +22,7 @@ namespace AquaMai.UX __result = false; return false; } - + // RemainingMinutes // Original: private int RemainingMinutes => (this._secServerMaintenance + 59) / 60; [HarmonyPrefix] @@ -32,7 +32,7 @@ namespace AquaMai.UX __result = 600; return false; } - + // GetAutoRebootSec [HarmonyPrefix] [HarmonyPatch(typeof(MaintenanceTimer), "GetAutoRebootSec")] @@ -41,7 +41,7 @@ namespace AquaMai.UX __result = 60 * 60 * 10; return false; } - + // GetServerMaintenanceSec [HarmonyPrefix] [HarmonyPatch(typeof(MaintenanceTimer), "GetServerMaintenanceSec")] @@ -50,7 +50,7 @@ namespace AquaMai.UX __result = 60 * 60 * 10; return false; } - + // Execute [HarmonyPrefix] [HarmonyPatch(typeof(MaintenanceTimer), "Execute")] @@ -58,7 +58,7 @@ namespace AquaMai.UX { return false; } - + // UpdateTimes [HarmonyPrefix] [HarmonyPatch(typeof(MaintenanceTimer), "UpdateTimes")] @@ -66,5 +66,21 @@ namespace AquaMai.UX { return false; } + + [HarmonyPrefix] + [HarmonyPatch(typeof(ClosingTimer), "IsShowRemainingMinutes")] + public static bool IsShowRemainingMinutes(ref bool __result) + { + __result = false; + return false; + } + + [HarmonyPrefix] + [HarmonyPatch(typeof(ClosingTimer), "IsClosed")] + public static bool IsClosed(ref bool __result) + { + __result = false; + return false; + } } -} \ No newline at end of file +}