diff --git a/AquaMai/UX/QuickSkip.cs b/AquaMai/UX/QuickSkip.cs index 2619ebd9..8cbd3c1a 100644 --- a/AquaMai/UX/QuickSkip.cs +++ b/AquaMai/UX/QuickSkip.cs @@ -34,6 +34,7 @@ namespace AquaMai.UX { _keyPressFrames = 0; MelonLogger.Msg(_container.processManager.Dump()); + MelonLogger.Msg(Singleton.Instance.GetUserData(0).Dump()); return; } @@ -50,6 +51,7 @@ namespace AquaMai.UX { // After login case "Process.ModeSelect.ModeSelectProcess": + case "Process.LoginBonus.LoginBonusProcess": case "Process.RegionalSelectProcess": case "Process.CharacterSelectProcess": case "Process.TicketSelect.TicketSelectProcess": diff --git a/AquaMai/UX/SkipToMusicSelection.cs b/AquaMai/UX/SkipToMusicSelection.cs index e2c7a133..2be1a99f 100644 --- a/AquaMai/UX/SkipToMusicSelection.cs +++ b/AquaMai/UX/SkipToMusicSelection.cs @@ -1,5 +1,9 @@ using HarmonyLib; +using MAI2.Util; using Manager; +using Manager.UserDatas; +using MelonLoader; +using Monitor; using Process; using Process.Information; @@ -22,5 +26,15 @@ namespace AquaMai.UX ___container.processManager.ReleaseProcess(__instance); return false; } + + [HarmonyPrefix] + [HarmonyPatch(typeof(MapResultMonitor), "Initialize")] + public static void MapResultMonitorPreInitialize(int monIndex) + { + var userData = Singleton.Instance.GetUserData(monIndex); + var index = userData.MapList.FindIndex((UserMapData m) => m.ID == userData.Detail.SelectMapID); + if (index >= 0) return; + userData.MapList.Clear(); + } } -} +} \ No newline at end of file