diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs index 82755f6..472aa49 100644 --- a/Assets/Scripts/LeaderboardsMenu.cs +++ b/Assets/Scripts/LeaderboardsMenu.cs @@ -25,16 +25,16 @@ public class LeaderboardsMenu : MonoBehaviour [SerializeField] private GameObject sampleObject; [SerializeField] private TMP_Dropdown berryShowTypeDropdown; - private int mode = -1; + private LeaderboardMode mode = LeaderboardMode.None; private bool changedByCode = false; void Awake() { - selectionScoreButton.onClick.AddListener(() => { mode = 0; SwitchMenu(1); }); - selectionBerryButton.onClick.AddListener(() => { mode = 1; SwitchMenu(1); }); - selectionCoinButton.onClick.AddListener(() => { mode = 2; SwitchMenu(1); }); - selectionLegacyButton.onClick.AddListener(() => { mode = 3; SwitchMenu(1); }); - selectionTotalBerriesButton.onClick.AddListener(() => { mode = 4; SwitchMenu(1); }); + selectionScoreButton.onClick.AddListener(() => { mode = LeaderboardMode.Score; SwitchMenu(1); }); + selectionBerryButton.onClick.AddListener(() => { mode = LeaderboardMode.Berry; SwitchMenu(1); }); + selectionCoinButton.onClick.AddListener(() => { mode = LeaderboardMode.Coin; SwitchMenu(1); }); + selectionLegacyButton.onClick.AddListener(() => { mode = LeaderboardMode.Legacy; SwitchMenu(1); }); + selectionTotalBerriesButton.onClick.AddListener(() => { mode = LeaderboardMode.TotalBerries; SwitchMenu(1); }); berryShowTypeDropdown.onValueChanged.AddListener(_ => GetTopPlayers()); backButton.onClick.AddListener(async () => @@ -61,16 +61,16 @@ public class LeaderboardsMenu : MonoBehaviour if (menu == 0) { - mode = -1; + mode = LeaderboardMode.None; refreshButton.gameObject.SetActive(false); selectionPanel.SetActive(true); scoresPanel.SetActive(false); } else if (menu == 1) { - refreshButton.transform.localPosition = mode == 1 ? new Vector2(402.5f, 282.33f) : new Vector2(-402.5f, -282.33f); + refreshButton.transform.localPosition = mode == LeaderboardMode.Berry ? new Vector2(402.5f, 282.33f) : new Vector2(-402.5f, -282.33f); refreshButton.gameObject.SetActive(true); - berryShowTypeDropdown.gameObject.SetActive(mode == 1); + berryShowTypeDropdown.gameObject.SetActive(mode == LeaderboardMode.Berry); changedByCode = true; berryShowTypeDropdown.value = 0; changedByCode = false; @@ -93,13 +93,13 @@ public class LeaderboardsMenu : MonoBehaviour } } UpdateStatus(true, "Loading..."); - using UnityWebRequest request = UnityWebRequest.Get(mode == 0 + using UnityWebRequest request = UnityWebRequest.Get(mode == LeaderboardMode.Score ? Endpoints.LEADERBOARDS_SCORE_ENDPOINT - : mode == 1 + : mode == LeaderboardMode.Berry ? Endpoints.LEADERBOARDS_BERRY_ENDPOINT + "?berry=" + berryShowTypeDropdown.value - : mode == 2 + : mode == LeaderboardMode.Coin ? Endpoints.LEADERBOARDS_COIN_ENDPOINT - : mode == 3 + : mode == LeaderboardMode.Legacy ? Endpoints.LEADERBOARDS_LEGACY_ENDPOINT : Endpoints.LEADERBOARDS_TOTAL_ENDPOINT); request.SetRequestHeader("Requester", "BerryDashClient"); @@ -125,7 +125,7 @@ public class LeaderboardsMenu : MonoBehaviour var scoreText = entryInfo.transform.GetChild(1).GetComponent(); usernameText.text = $"{entry.Username} (#{entry.UserID + 1})"; - scoreText.text = (mode == 1 || mode == 4 ? "Berries: " : mode == 2 ? "Coins: " : "Score: ") + Tools.FormatWithCommas(entry.Value); + scoreText.text = (mode == LeaderboardMode.Berry || mode == LeaderboardMode.TotalBerries ? "Berries: " : mode == LeaderboardMode.Coin ? "Coins: " : "Score: ") + Tools.FormatWithCommas(entry.Value); if (BazookaManager.Instance.GetAccountID() == entry.UserID) { diff --git a/Assets/Scripts/Types/LeaderboardMode.cs b/Assets/Scripts/Types/LeaderboardMode.cs new file mode 100644 index 0000000..cf417ed --- /dev/null +++ b/Assets/Scripts/Types/LeaderboardMode.cs @@ -0,0 +1,9 @@ +public enum LeaderboardMode +{ + None, + Score, + Berry, + Coin, + Legacy, + TotalBerries +} diff --git a/Assets/Scripts/Types/LeaderboardMode.cs.meta b/Assets/Scripts/Types/LeaderboardMode.cs.meta new file mode 100644 index 0000000..de3805b --- /dev/null +++ b/Assets/Scripts/Types/LeaderboardMode.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1f90bcbfacbcb444a8eea859852d8a01 \ No newline at end of file