diff --git a/MiraAPI/Patches/Menu/HatsTabPatches.cs b/MiraAPI/Patches/Menu/HatsTabPatches.cs index f985027..8d36e9c 100644 --- a/MiraAPI/Patches/Menu/HatsTabPatches.cs +++ b/MiraAPI/Patches/Menu/HatsTabPatches.cs @@ -84,7 +84,7 @@ public static class HatsTabPatches text.gameObject.transform.localScale = Vector3.one; text.GetComponent().Destroy(); text.EnableStencilMasking(); - text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages"; + text.text = $"{groupName} ({currentPage + 1}/{sortedHats.Count})\nPress Ctrl or Tab to cycle pages"; text.alignment = TextAlignmentOptions.Center; text.fontSize = 3f; text.fontSizeMax = 3f; diff --git a/MiraAPI/Patches/Menu/NameplatesTabPatches.cs b/MiraAPI/Patches/Menu/NameplatesTabPatches.cs index bb5482a..11657a0 100644 --- a/MiraAPI/Patches/Menu/NameplatesTabPatches.cs +++ b/MiraAPI/Patches/Menu/NameplatesTabPatches.cs @@ -73,7 +73,7 @@ public static class NameplatesTabPatches text.gameObject.transform.localScale = Vector3.one; text.GetComponent().Destroy(); text.EnableStencilMasking(); - text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages"; + text.text = $"{groupName} ({currentPage + 1}/{SortedNameplates.Count})\nPress Ctrl or Tab to cycle pages"; text.alignment = TextAlignmentOptions.Center; text.fontSize = 3f; text.fontSizeMax = 3f; diff --git a/MiraAPI/Patches/Menu/SkinsTabPatches.cs b/MiraAPI/Patches/Menu/SkinsTabPatches.cs index 2e9ef2e..9378d8b 100644 --- a/MiraAPI/Patches/Menu/SkinsTabPatches.cs +++ b/MiraAPI/Patches/Menu/SkinsTabPatches.cs @@ -76,7 +76,7 @@ public static class SkinsTabPatches text.gameObject.transform.localScale = Vector3.one; text.GetComponent().Destroy(); text.EnableStencilMasking(); - text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages"; + text.text = $"{groupName} ({currentPage + 1}/{sortedSkins.Count})\nPress Ctrl or Tab to cycle pages"; text.alignment = TextAlignmentOptions.Center; text.fontSize = 3f; text.fontSizeMax = 3f; diff --git a/MiraAPI/Patches/Menu/VisorsTabPatches.cs b/MiraAPI/Patches/Menu/VisorsTabPatches.cs index d88cdab..92d5b8e 100644 --- a/MiraAPI/Patches/Menu/VisorsTabPatches.cs +++ b/MiraAPI/Patches/Menu/VisorsTabPatches.cs @@ -72,7 +72,7 @@ public static class VisorsTabPatches text.gameObject.transform.localScale = Vector3.one; text.GetComponent().Destroy(); text.EnableStencilMasking(); - text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages"; + text.text = $"{groupName} ({currentPage + 1}/{SortedVisors.Count})\nPress Ctrl or Tab to cycle pages"; text.alignment = TextAlignmentOptions.Center; text.fontSize = 3f; text.fontSizeMax = 3f; diff --git a/MiraAPI/Patches/ServerDropdownPatch.cs b/MiraAPI/Patches/ServerDropdownPatch.cs index 0fb96e3..36da2d7 100644 --- a/MiraAPI/Patches/ServerDropdownPatch.cs +++ b/MiraAPI/Patches/ServerDropdownPatch.cs @@ -1,6 +1,7 @@ using HarmonyLib; using UnityEngine; using UnityEngine.Events; +using UnityEngine.SceneManagement; namespace MiraAPI.Patches; @@ -14,6 +15,8 @@ public static class ServerDropdownPatch foreach (var regionInfo in DestroyableSingleton.Instance.AvailableRegions) { + var findingGame = SceneManager.GetActiveScene().name is "FindAGame"; + if (DestroyableSingleton.Instance.CurrentRegion.Equals(regionInfo)) { __instance.defaultButtonSelected = __instance.firstOption; @@ -27,6 +30,10 @@ public static class ServerDropdownPatch var region = regionInfo; var serverListButton = __instance.ButtonPool.Get(); var x = num % 2 == 0 ? -2 : 2; + if (findingGame) + { + x += 2; + } var y = -0.55f * (num / 2); serverListButton.transform.localPosition = new Vector3(x, __instance.y_posButton + y, -1f); serverListButton.transform.localScale = Vector3.one; @@ -39,7 +46,7 @@ public static class ServerDropdownPatch serverListButton.Button.OnClick.AddListener((UnityAction)(() => { __instance.ChooseOption(region); })); __instance.controllerSelectable.Add(serverListButton.Button); __instance.background.transform.localPosition = new Vector3( - 0f, + findingGame ? 2f : 0f, __instance.initialYPos + (-0.3f * (num / 2)), 0f); __instance.background.size = new Vector2(__instance.background.size.x, 1.2f + (0.6f * (num / 2)));