From 24ec6141121c554b57fa86e993ea3903dcd70f7f Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Thu, 15 Jan 2026 15:16:23 -0700 Subject: [PATCH] Make stuff not `public` if it doesn't need to be --- .../AccountMenu/AccountChangePassword.cs | 12 ++--- .../AccountMenu/AccountChangeUsername.cs | 10 ++-- Assets/Scripts/AccountMenu/AccountHandler.cs | 12 ++--- Assets/Scripts/AccountMenu/AccountLoggedIn.cs | 16 +++--- .../Scripts/AccountMenu/AccountLoggedOut.cs | 4 +- Assets/Scripts/AccountMenu/AccountLogin.cs | 10 ++-- .../AccountMenu/AccountRefreshLogin.cs | 10 ++-- Assets/Scripts/AccountMenu/AccountRegister.cs | 16 +++--- Assets/Scripts/BouncyButton.cs | 10 ++-- Assets/Scripts/BouncyPanel.cs | 6 +-- Assets/Scripts/BouncyText.cs | 7 +-- Assets/Scripts/ButtonTextColorSync.cs | 5 +- Assets/Scripts/ButtonToScene.cs | 2 +- Assets/Scripts/ButtonToURL.cs | 2 +- Assets/Scripts/ChatroomMenu.cs | 40 +++++++------- Assets/Scripts/CustomColorObject.cs | 8 +-- Assets/Scripts/CustomGamePlayer.cs | 27 +++++----- Assets/Scripts/CustomGamePlayerPauseMenu.cs | 42 +++++++-------- Assets/Scripts/DraggableUI.cs | 2 +- Assets/Scripts/GameMusicHandler.cs | 2 +- Assets/Scripts/GamePlayer.cs | 31 ++++++----- Assets/Scripts/GamePlayerPauseMenu.cs | 46 ++++++++-------- Assets/Scripts/HideIfSettingFalse.cs | 4 +- .../IconMarketplaceDownloadIcon.cs | 30 +++++------ .../IconMarketplace/IconMarketplaceManager.cs | 16 +++--- .../IconMarketplaceUploadIcon.cs | 18 +++---- Assets/Scripts/IconsMenu.cs | 30 +++++------ Assets/Scripts/LeaderboardsMenu.cs | 54 +++++++++---------- Assets/Scripts/LoadingMenu.cs | 6 +-- Assets/Scripts/MainMenu.cs | 10 ++-- Assets/Scripts/ProfileMenu.cs | 42 +++++++-------- Assets/Scripts/RainbowImage.cs | 2 +- Assets/Scripts/RainbowText.cs | 2 +- Assets/Scripts/SettingsMenu.cs | 28 +++++----- Assets/Scripts/StatsMenu.cs | 2 +- 35 files changed, 282 insertions(+), 282 deletions(-) diff --git a/Assets/Scripts/AccountMenu/AccountChangePassword.cs b/Assets/Scripts/AccountMenu/AccountChangePassword.cs index fadaee2..9b7a941 100644 --- a/Assets/Scripts/AccountMenu/AccountChangePassword.cs +++ b/Assets/Scripts/AccountMenu/AccountChangePassword.cs @@ -6,12 +6,12 @@ using UnityEngine.UI; public class AccountChangePassword : MonoBehaviour { - public TMP_Text changePasswordStatusText; - public TMP_InputField changePasswordCurrentPasswordInput; - public TMP_InputField changePasswordNewPasswordInput; - public TMP_InputField changePasswordRetypeNewPasswordInput; - public Button changePasswordBackButton; - public Button changePasswordSubmitButton; + [SerializeField] private TMP_Text changePasswordStatusText; + [SerializeField] private TMP_InputField changePasswordCurrentPasswordInput; + [SerializeField] private TMP_InputField changePasswordNewPasswordInput; + [SerializeField] private TMP_InputField changePasswordRetypeNewPasswordInput; + [SerializeField] private Button changePasswordBackButton; + [SerializeField] private Button changePasswordSubmitButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountChangeUsername.cs b/Assets/Scripts/AccountMenu/AccountChangeUsername.cs index 2461c25..1bffa6a 100644 --- a/Assets/Scripts/AccountMenu/AccountChangeUsername.cs +++ b/Assets/Scripts/AccountMenu/AccountChangeUsername.cs @@ -6,11 +6,11 @@ using UnityEngine.UI; public class AccountChangeUsername : MonoBehaviour { - public TMP_Text changeUsernameStatusText; - public TMP_InputField changeUsernameCurrentUsernameInput; - public TMP_InputField changeUsernameNewUsernameInput; - public Button changeUsernameBackButton; - public Button changeUsernameSubmitButton; + [SerializeField] private TMP_Text changeUsernameStatusText; + [SerializeField] private TMP_InputField changeUsernameCurrentUsernameInput; + [SerializeField] private TMP_InputField changeUsernameNewUsernameInput; + [SerializeField] private Button changeUsernameBackButton; + [SerializeField] private Button changeUsernameSubmitButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountHandler.cs b/Assets/Scripts/AccountMenu/AccountHandler.cs index 458226c..87752dd 100644 --- a/Assets/Scripts/AccountMenu/AccountHandler.cs +++ b/Assets/Scripts/AccountMenu/AccountHandler.cs @@ -6,12 +6,12 @@ public class AccountHandler : MonoBehaviour { public static AccountHandler instance; public AccountLoggedIn accountLoggedIn; - public AccountLoggedOut accountLoggedOut; - public AccountLogin accountLogin; - public AccountRegister accountRegister; - public AccountChangeUsername accountChangeUsername; - public AccountChangePassword accountChangePassword; - public AccountRefreshLogin accountRefreshLogin; + [SerializeField] private AccountLoggedOut accountLoggedOut; + [SerializeField] private AccountLogin accountLogin; + [SerializeField] private AccountRegister accountRegister; + [SerializeField] private AccountChangeUsername accountChangeUsername; + [SerializeField] private AccountChangePassword accountChangePassword; + [SerializeField] private AccountRefreshLogin accountRefreshLogin; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs index 56d2675..8fc13fb 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs @@ -10,14 +10,14 @@ using UnityEngine.UI; public class AccountLoggedIn : MonoBehaviour { public TMP_Text loggedInText; - public AccountLoggedOut accountLoggedOut; - public Button loggedInChangeUsernameButton; - public Button loggedInChangePasswordButton; - public Button loggedInSaveButton; - public Button loggedInLoadButton; - public Button loggedInRefreshLoginButton; - public Button loggedInLogoutButton; - public Button loggedInBackButton; + [SerializeField] private AccountLoggedOut accountLoggedOut; + [SerializeField] private Button loggedInChangeUsernameButton; + [SerializeField] private Button loggedInChangePasswordButton; + [SerializeField] private Button loggedInSaveButton; + [SerializeField] private Button loggedInLoadButton; + [SerializeField] private Button loggedInRefreshLoginButton; + [SerializeField] private Button loggedInLogoutButton; + [SerializeField] private Button loggedInBackButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs index f9f07ba..fb20c2d 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs @@ -3,8 +3,8 @@ using UnityEngine.UI; public class AccountLoggedOut : MonoBehaviour { - public Button loggedOutLoginButton; - public Button loggedOutRegisterButton; + [SerializeField] private Button loggedOutLoginButton; + [SerializeField] private Button loggedOutRegisterButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountLogin.cs b/Assets/Scripts/AccountMenu/AccountLogin.cs index 5cf92d0..66cf6af 100644 --- a/Assets/Scripts/AccountMenu/AccountLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountLogin.cs @@ -7,11 +7,11 @@ using UnityEngine.UI; public class AccountLogin : MonoBehaviour { - public TMP_Text loginPanelStatusText; - public TMP_InputField loginUsernameInput; - public TMP_InputField loginPasswordInput; - public Button loginBackButton; - public Button loginSubmitButton; + [SerializeField] private TMP_Text loginPanelStatusText; + [SerializeField] private TMP_InputField loginUsernameInput; + [SerializeField] private TMP_InputField loginPasswordInput; + [SerializeField] private Button loginBackButton; + [SerializeField] private Button loginSubmitButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs index 701bf06..20be64a 100644 --- a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs @@ -7,11 +7,11 @@ using UnityEngine.UI; public class AccountRefreshLogin : MonoBehaviour { - public TMP_Text refreshLoginStatusText; - public TMP_InputField refreshLoginUsernameInput; - public TMP_InputField refreshLoginPasswordInput; - public Button refreshLoginBackButton; - public Button refreshLoginSubmitButton; + [SerializeField] private TMP_Text refreshLoginStatusText; + [SerializeField] private TMP_InputField refreshLoginUsernameInput; + [SerializeField] private TMP_InputField refreshLoginPasswordInput; + [SerializeField] private Button refreshLoginBackButton; + [SerializeField] private Button refreshLoginSubmitButton; void Awake() { diff --git a/Assets/Scripts/AccountMenu/AccountRegister.cs b/Assets/Scripts/AccountMenu/AccountRegister.cs index de0b180..ffc8cec 100644 --- a/Assets/Scripts/AccountMenu/AccountRegister.cs +++ b/Assets/Scripts/AccountMenu/AccountRegister.cs @@ -6,14 +6,14 @@ using UnityEngine.UI; public class AccountRegister : MonoBehaviour { - public TMP_Text registerPanelStatusText; - public TMP_InputField registerUsernameInput; - public TMP_InputField registerEmailInput; - public TMP_InputField registerRetypeEmailInput; - public TMP_InputField registerPasswordInput; - public TMP_InputField registerRetypePasswordInput; - public Button registerBackButton; - public Button registerSubmitButton; + [SerializeField] private TMP_Text registerPanelStatusText; + [SerializeField] private TMP_InputField registerUsernameInput; + [SerializeField] private TMP_InputField registerEmailInput; + [SerializeField] private TMP_InputField registerRetypeEmailInput; + [SerializeField] private TMP_InputField registerPasswordInput; + [SerializeField] private TMP_InputField registerRetypePasswordInput; + [SerializeField] private Button registerBackButton; + [SerializeField] private Button registerSubmitButton; void Awake() { diff --git a/Assets/Scripts/BouncyButton.cs b/Assets/Scripts/BouncyButton.cs index e09142e..aa36986 100644 --- a/Assets/Scripts/BouncyButton.cs +++ b/Assets/Scripts/BouncyButton.cs @@ -4,11 +4,11 @@ using UnityEngine.InputSystem; public class BouncyButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler { - bool isHovered = false; - bool isHeld = false; - bool didBounce = false; - Vector3 originalScale; - Vector3 finalScale; + private bool isHovered = false; + private bool isHeld = false; + private bool didBounce = false; + private Vector3 originalScale; + private Vector3 finalScale; void Start() { diff --git a/Assets/Scripts/BouncyPanel.cs b/Assets/Scripts/BouncyPanel.cs index 670718e..aeb53a2 100644 --- a/Assets/Scripts/BouncyPanel.cs +++ b/Assets/Scripts/BouncyPanel.cs @@ -2,9 +2,9 @@ using UnityEngine; public class BouncyPanel : MonoBehaviour { - public float frequency = 8f; - public float minSize = 1f; - public float maxSize = 1.1f; + [SerializeField] private float frequency = 8f; + [SerializeField] private float minSize = 1f; + [SerializeField] private float maxSize = 1.1f; void Update() { diff --git a/Assets/Scripts/BouncyText.cs b/Assets/Scripts/BouncyText.cs index a7e71bd..18f1c3a 100644 --- a/Assets/Scripts/BouncyText.cs +++ b/Assets/Scripts/BouncyText.cs @@ -1,11 +1,12 @@ using TMPro; using UnityEngine; +[RequireComponent(typeof(TextMeshProUGUI))] public class BouncyText : MonoBehaviour { - public float frequency = 2f; - public float minSize = 10f; - public float maxSize = 12f; + [SerializeField] private float frequency = 2f; + [SerializeField] private float minSize = 10f; + [SerializeField] private float maxSize = 12f; private TextMeshProUGUI text; void Start() diff --git a/Assets/Scripts/ButtonTextColorSync.cs b/Assets/Scripts/ButtonTextColorSync.cs index ca6c43d..3c2983e 100644 --- a/Assets/Scripts/ButtonTextColorSync.cs +++ b/Assets/Scripts/ButtonTextColorSync.cs @@ -1,10 +1,11 @@ +using System; using TMPro; using UnityEngine; public class ImageColorSync : MonoBehaviour { - public TMP_Text originalText; - public TMP_Text toSync; + [SerializeField] private TMP_Text originalText; + [SerializeField] private TMP_Text toSync; void Update() { diff --git a/Assets/Scripts/ButtonToScene.cs b/Assets/Scripts/ButtonToScene.cs index eb39c60..8d84294 100644 --- a/Assets/Scripts/ButtonToScene.cs +++ b/Assets/Scripts/ButtonToScene.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; public class ButtonToScene : MonoBehaviour { - public string sceneName; + [SerializeField] private string sceneName; void Awake() { diff --git a/Assets/Scripts/ButtonToURL.cs b/Assets/Scripts/ButtonToURL.cs index 52a5602..3eea878 100644 --- a/Assets/Scripts/ButtonToURL.cs +++ b/Assets/Scripts/ButtonToURL.cs @@ -3,7 +3,7 @@ using UnityEngine.UI; public class ButtonToURL : MonoBehaviour { - public string url; + [SerializeField] private string url; void Awake() { diff --git a/Assets/Scripts/ChatroomMenu.cs b/Assets/Scripts/ChatroomMenu.cs index 468582b..bcbefed 100644 --- a/Assets/Scripts/ChatroomMenu.cs +++ b/Assets/Scripts/ChatroomMenu.cs @@ -17,36 +17,36 @@ public class ChatroomMenu : MonoBehaviour { private readonly static WaitForSeconds _waitForSeconds2 = new(2f); private readonly static WaitForSeconds _waitForSeconds3 = new(3f); - public TMP_Text statusText; - public Button backButton; - public Button sendButton; - public TMP_InputField messageInputField; - public GameObject content; - public GameObject sampleObject; + [SerializeField] private TMP_Text statusText; + [SerializeField] private Button backButton; + [SerializeField] private Button sendButton; + [SerializeField] private TMP_InputField messageInputField; + [SerializeField] private GameObject content; + [SerializeField] private GameObject sampleObject; private string statusMessage; private Coroutine statusRoutine; private Coroutine refreshLoopRoutine; private bool shouldScrollToBottom = true; - public Button downButton; + [SerializeField] private Button downButton; private bool isPaused; - public ProfileMenu profilePrefab; + [SerializeField] private ProfileMenu profilePrefab; - public GameObject optionsPanel; - public Button optionsPanelExitButton; - public Button optionsPanelDeleteButton; - public Button optionsPanelEditButton; - public Button optionsPanelReportButton; - public Button optionsPanelCopyButton; + [SerializeField] private GameObject optionsPanel; + [SerializeField] private Button optionsPanelExitButton; + [SerializeField] private Button optionsPanelDeleteButton; + [SerializeField] private Button optionsPanelEditButton; + [SerializeField] private Button optionsPanelReportButton; + [SerializeField] private Button optionsPanelCopyButton; private ChatroomMessage selectedMessageForOptions; - public GameObject editMessagePanelSample; + [SerializeField] private GameObject editMessagePanelSample; private GameObject editMessagePanelCurrent; - public GameObject reportMessagePanel; - public Button reportMessagePanelExitButton; - public Button reportMessagePanelSubmitButton; - public TMP_InputField reportMessagePanelReportReason; - public Dictionary customIcons; + [SerializeField] private GameObject reportMessagePanel; + [SerializeField] private Button reportMessagePanelExitButton; + [SerializeField] private Button reportMessagePanelSubmitButton; + [SerializeField] private TMP_InputField reportMessagePanelReportReason; + [SerializeField] private Dictionary customIcons; void Start() { diff --git a/Assets/Scripts/CustomColorObject.cs b/Assets/Scripts/CustomColorObject.cs index d13386c..c717163 100644 --- a/Assets/Scripts/CustomColorObject.cs +++ b/Assets/Scripts/CustomColorObject.cs @@ -5,10 +5,10 @@ using UnityEngine.UI; public class CustomColorObject : MonoBehaviour { - public ColorObjectType type; - public bool invert; - public Color addMore; - public bool reverseAdd; + [SerializeField] private ColorObjectType type; + [SerializeField] private bool invert; + [SerializeField] private Color addMore; + [SerializeField] private bool reverseAdd; Color ApplyModifiers(Color baseColor) { diff --git a/Assets/Scripts/CustomGamePlayer.cs b/Assets/Scripts/CustomGamePlayer.cs index 7e38323..ed7bd07 100644 --- a/Assets/Scripts/CustomGamePlayer.cs +++ b/Assets/Scripts/CustomGamePlayer.cs @@ -18,23 +18,22 @@ public class CustomGamePlayer : MonoBehaviour private float antiLeft; private float screenWidth; internal bool isGrounded; - public TMP_Text scoreText; - public TMP_Text boostText; - public GameObject bird; - public GameObject pausePanel; - public Rigidbody2D rb; + [SerializeField] private TMP_Text scoreText; + [SerializeField] private TMP_Text boostText; + [SerializeField] private GameObject bird; + [SerializeField] private GameObject pausePanel; + [SerializeField] private Rigidbody2D rb; public AudioSource backgroundMusic; - private float nextUpdate; - public SpriteRenderer overlayRender; + [SerializeField] private SpriteRenderer overlayRender; private float lastMoveTime; - public GameObject berryParent; + [SerializeField] private GameObject berryParent; - public GameObject mobileButtons; - public Button pauseButton; - public Button restartButton; - public Button jumpButton; - public Button rightButton; - public Button leftButton; + [SerializeField] private GameObject mobileButtons; + [SerializeField] private Button pauseButton; + [SerializeField] private Button restartButton; + [SerializeField] private Button jumpButton; + [SerializeField] private Button rightButton; + [SerializeField] private Button leftButton; private float normalBerryChance; private float poisonBerryChance; diff --git a/Assets/Scripts/CustomGamePlayerPauseMenu.cs b/Assets/Scripts/CustomGamePlayerPauseMenu.cs index 8bf7aa2..e7d9355 100644 --- a/Assets/Scripts/CustomGamePlayerPauseMenu.cs +++ b/Assets/Scripts/CustomGamePlayerPauseMenu.cs @@ -6,32 +6,32 @@ using UnityEngine.UI; public class CustomGamePlayerPauseMenu : MonoBehaviour { public static CustomGamePlayerPauseMenu Instance; - public Button backButton; - public Button continueButton; - public Button statsButton; - public Button editUiButton; - public Button resetUiButton; - public AudioSource songLoop; - public TMP_Text scoreText; - public TMP_Text boostText; - public Button pauseButton; - public Button restartButton; - public Button jumpButton; - public Button rightButton; - public Button leftButton; + [SerializeField] private Button backButton; + [SerializeField] private Button continueButton; + [SerializeField] private Button statsButton; + [SerializeField] private Button editUiButton; + [SerializeField] private Button resetUiButton; + [SerializeField] private AudioSource songLoop; + [SerializeField] private TMP_Text scoreText; + [SerializeField] private TMP_Text boostText; + [SerializeField] private Button pauseButton; + [SerializeField] private Button restartButton; + [SerializeField] private Button jumpButton; + [SerializeField] private Button rightButton; + [SerializeField] private Button leftButton; internal bool editingUI = false; public GameObject statsMenu; public Button statsMenuExitButton; - public TMP_Text statsText; + [SerializeField] private TMP_Text statsText; - public Toggle settingFullscreenToggle; - public Toggle settingVSyncToggle; - public Toggle settingRandomMusicToggle; - public Slider musicSlider; - public Slider sfxSlider; - public TMP_Text musicSliderText; - public TMP_Text sfxSliderText; + [SerializeField] private Toggle settingFullscreenToggle; + [SerializeField] private Toggle settingVSyncToggle; + [SerializeField] private Toggle settingRandomMusicToggle; + [SerializeField] private Slider musicSlider; + [SerializeField] private Slider sfxSlider; + [SerializeField] private TMP_Text musicSliderText; + [SerializeField] private TMP_Text sfxSliderText; void Awake() { diff --git a/Assets/Scripts/DraggableUI.cs b/Assets/Scripts/DraggableUI.cs index 43c722a..2131357 100644 --- a/Assets/Scripts/DraggableUI.cs +++ b/Assets/Scripts/DraggableUI.cs @@ -7,7 +7,7 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IBeginDragHandler { public static DraggableUI Instance; private Vector2 offset; - public string uiName; + [SerializeField] private string uiName; public bool canDrag = false; private readonly List outlineSides = new(); diff --git a/Assets/Scripts/GameMusicHandler.cs b/Assets/Scripts/GameMusicHandler.cs index 663c97f..6535283 100644 --- a/Assets/Scripts/GameMusicHandler.cs +++ b/Assets/Scripts/GameMusicHandler.cs @@ -3,7 +3,7 @@ using UnityEngine; [RequireComponent(typeof(AudioSource))] public class GameMusicHandler : MonoBehaviour { - public AudioClip[] audioClips; + [SerializeField] private AudioClip[] audioClips; private AudioSource audioSource; private int lastIndex = -1; private int currentIndex = 0; diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 1dc604c..8ffac38 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -29,25 +29,24 @@ public class GamePlayer : MonoBehaviour private float antiLeft; private float screenWidth; internal bool isGrounded; - public TMP_Text scoreText; - public TMP_Text highScoreText; - public TMP_Text boostText; - public TMP_Text coinText; - public GameObject bird; - public GameObject pausePanel; - public Rigidbody2D rb; + [SerializeField] private TMP_Text scoreText; + [SerializeField] private TMP_Text highScoreText; + [SerializeField] private TMP_Text boostText; + [SerializeField] private TMP_Text coinText; + [SerializeField] private GameObject bird; + [SerializeField] private GameObject pausePanel; + [SerializeField] private Rigidbody2D rb; public AudioSource backgroundMusic; - private float nextUpdate; - public SpriteRenderer overlayRender; + [SerializeField] private SpriteRenderer overlayRender; private float lastMoveTime; - public GameObject berryParent; + [SerializeField] private GameObject berryParent; - public GameObject mobileButtons; - public Button pauseButton; - public Button restartButton; - public Button jumpButton; - public Button rightButton; - public Button leftButton; + [SerializeField] private GameObject mobileButtons; + [SerializeField] private Button pauseButton; + [SerializeField] private Button restartButton; + [SerializeField] private Button jumpButton; + [SerializeField] private Button rightButton; + [SerializeField] private Button leftButton; void Start() { diff --git a/Assets/Scripts/GamePlayerPauseMenu.cs b/Assets/Scripts/GamePlayerPauseMenu.cs index 6608b1d..5806e6d 100644 --- a/Assets/Scripts/GamePlayerPauseMenu.cs +++ b/Assets/Scripts/GamePlayerPauseMenu.cs @@ -6,34 +6,34 @@ using UnityEngine.UI; public class GamePlayerPauseMenu : MonoBehaviour { public static GamePlayerPauseMenu Instance; - public Button backButton; - public Button continueButton; - public Button statsButton; - public Button editUiButton; - public Button resetUiButton; - public AudioSource songLoop; - public TMP_Text scoreText; - public TMP_Text highScoreText; - public TMP_Text boostText; - public TMP_Text coinsText; - public Button pauseButton; - public Button restartButton; - public Button jumpButton; - public Button rightButton; - public Button leftButton; + [SerializeField] private Button backButton; + [SerializeField] private Button continueButton; + [SerializeField] private Button statsButton; + [SerializeField] private Button editUiButton; + [SerializeField] private Button resetUiButton; + [SerializeField] private AudioSource songLoop; + [SerializeField] private TMP_Text scoreText; + [SerializeField] private TMP_Text highScoreText; + [SerializeField] private TMP_Text boostText; + [SerializeField] private TMP_Text coinsText; + [SerializeField] private Button pauseButton; + [SerializeField] private Button restartButton; + [SerializeField] private Button jumpButton; + [SerializeField] private Button rightButton; + [SerializeField] private Button leftButton; internal bool editingUI = false; public GameObject statsMenu; public Button statsMenuExitButton; - public TMP_Text statsText; + [SerializeField] private TMP_Text statsText; - public Toggle settingFullscreenToggle; - public Toggle settingVSyncToggle; - public Toggle settingRandomMusicToggle; - public Slider musicSlider; - public Slider sfxSlider; - public TMP_Text musicSliderText; - public TMP_Text sfxSliderText; + [SerializeField] private Toggle settingFullscreenToggle; + [SerializeField] private Toggle settingVSyncToggle; + [SerializeField] private Toggle settingRandomMusicToggle; + [SerializeField] private Slider musicSlider; + [SerializeField] private Slider sfxSlider; + [SerializeField] private TMP_Text musicSliderText; + [SerializeField] private TMP_Text sfxSliderText; void Awake() { diff --git a/Assets/Scripts/HideIfSettingFalse.cs b/Assets/Scripts/HideIfSettingFalse.cs index fd94791..81aa758 100644 --- a/Assets/Scripts/HideIfSettingFalse.cs +++ b/Assets/Scripts/HideIfSettingFalse.cs @@ -2,8 +2,8 @@ using UnityEngine; public class HideIfSettingFalse : MonoBehaviour { - public SettingTypes setting; - public bool reverse; + [SerializeField] private SettingTypes setting; + [SerializeField] private bool reverse; void Start() { diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs index bcaa114..2566778 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs @@ -13,35 +13,35 @@ using UnityEngine.UI; public class IconMarketplaceDownloadIcon : MonoBehaviour { private readonly static WaitForSeconds _waitForSeconds2 = new(2f); - public IconMarketplaceManager marketplaceManager; - public TMP_Text statusText; - public TMP_Text balanceText; - public Button backButton; + [SerializeField] private IconMarketplaceManager marketplaceManager; + [SerializeField] private TMP_Text statusText; + [SerializeField] private TMP_Text balanceText; + [SerializeField] private Button backButton; public GameObject content; - public GameObject sample; + [SerializeField] private GameObject sample; private string statusMessage; private Coroutine statusRoutine; public AudioSource iconPurchaseSound; - public Button refreshButton; - public Button optionsButton; - public GameObject optionsPanel; - public Button optionsPanelSubmitButton; - public Button optionsPanelResetButton; + [SerializeField] private Button refreshButton; + [SerializeField] private Button optionsButton; + [SerializeField] private GameObject optionsPanel; + [SerializeField] private Button optionsPanelSubmitButton; + [SerializeField] private Button optionsPanelResetButton; public TMP_Dropdown optionsPanelSortByDropdown; public Toggle optionsPanelPriceRangeToggle; - public TMP_InputField optionsPanelPriceRangeMinInput; - public TMP_InputField optionsPanelPriceRangeMaxInput; + [SerializeField] private TMP_InputField optionsPanelPriceRangeMinInput; + [SerializeField] private TMP_InputField optionsPanelPriceRangeMaxInput; internal string priceRangeMin = "10"; internal string priceRangeMax = "250"; public Toggle optionsPanelSearchForToggle; - public TMP_InputField optionsPanelSearchForInputField; + [SerializeField] private TMP_InputField optionsPanelSearchForInputField; internal string searchForValue = ""; - public Toggle optionsPanelOnlyShowToggle; - public TMP_Dropdown optionsPanelOnlyShowDropdown; + [SerializeField] private Toggle optionsPanelOnlyShowToggle; + [SerializeField] private TMP_Dropdown optionsPanelOnlyShowDropdown; internal bool anyChanges = false; diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs index a33bdb0..bcbfac6 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs @@ -6,16 +6,16 @@ using UnityEngine.UI; public class IconMarketplaceManager : MonoBehaviour { - public GameObject normalPanel; - public GameObject downloadPanel; - public GameObject uploadPanel; + [SerializeField] private GameObject normalPanel; + [SerializeField] private GameObject downloadPanel; + [SerializeField] private GameObject uploadPanel; - public IconMarketplaceUploadIcon uploadPanelScript; - public IconMarketplaceDownloadIcon downloadPanelScript; + [SerializeField] private IconMarketplaceUploadIcon uploadPanelScript; + [SerializeField] private IconMarketplaceDownloadIcon downloadPanelScript; - public Button downloadButton; - public Button uploadButton; - public TMP_Text coinText; + [SerializeField] private Button downloadButton; + [SerializeField] private Button uploadButton; + [SerializeField] private TMP_Text coinText; void Start() { diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs index 4e27f75..561bacc 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs @@ -10,15 +10,15 @@ using UnityEngine.UI; public class IconMarketplaceUploadIcon : MonoBehaviour { - public IconMarketplaceManager marketplaceManager; - public TMP_Text statusText; - public Button backButton; - public Button uploadButton; - public Button selectButton; - public TMP_InputField birdNameInput; - public TMP_InputField birdPriceInput; - public Image birdImage; - public GameObject birdImageNone; + [SerializeField] private IconMarketplaceManager marketplaceManager; + [SerializeField] private TMP_Text statusText; + [SerializeField] private Button backButton; + [SerializeField] private Button uploadButton; + [SerializeField] private Button selectButton; + [SerializeField] private TMP_InputField birdNameInput; + [SerializeField] private TMP_InputField birdPriceInput; + [SerializeField] private Image birdImage; + [SerializeField] private GameObject birdImageNone; private string birdData = null; void Awake() diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs index 7a003c9..78be051 100644 --- a/Assets/Scripts/IconsMenu.cs +++ b/Assets/Scripts/IconsMenu.cs @@ -8,22 +8,22 @@ using UnityEngine.UI; public class Iconsmenu : MonoBehaviour { - public GameObject iconsPanel; - public GameObject overlaysPanel; - public GameObject marketplaceIconsPanel; - public GameObject marketplaceIconsContent; - public GameObject marketplaceIconsSample; - public Sprite defaultIcon; - public Button placeholderButton; - public TMP_Text selectionText; - public Image previewBird; - public Image previewOverlay; - public Button[] icons; - public Button[] overlays; + [SerializeField] private GameObject iconsPanel; + [SerializeField] private GameObject overlaysPanel; + [SerializeField] private GameObject marketplaceIconsPanel; + [SerializeField] private GameObject marketplaceIconsContent; + [SerializeField] private GameObject marketplaceIconsSample; + [SerializeField] private Sprite defaultIcon; + [SerializeField] private Button placeholderButton; + [SerializeField] private TMP_Text selectionText; + [SerializeField] private Image previewBird; + [SerializeField] private Image previewOverlay; + [SerializeField] private Button[] icons; + [SerializeField] private Button[] overlays; private Dictionary customIcons = new(); - public GameObject previewBirdObject; - public ColorPanel iconColorPanel; - public ColorPanel overlayColorPanel; + [SerializeField] private GameObject previewBirdObject; + [SerializeField] private ColorPanel iconColorPanel; + [SerializeField] private ColorPanel overlayColorPanel; private void Start() { diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs index 09cdacb..e8ae660 100644 --- a/Assets/Scripts/LeaderboardsMenu.cs +++ b/Assets/Scripts/LeaderboardsMenu.cs @@ -11,40 +11,40 @@ using UnityEngine.UI; public class LeaderboardsMenu : MonoBehaviour { - public TMP_Text statusText; - public Button backButton; - public Button refreshButton; - public ProfileMenu profilePrefab; + [SerializeField] private TMP_Text statusText; + [SerializeField] private Button backButton; + [SerializeField] private Button refreshButton; + [SerializeField] private ProfileMenu profilePrefab; - public GameObject selectionPanel; - public Button selectionScoreButton; - public Button selectionBerryButton; - public Button selectionCoinButton; - public Button selectionLegacyButton; - public Button selectionTotalBerriesButton; + [SerializeField] private GameObject selectionPanel; + [SerializeField] private Button selectionScoreButton; + [SerializeField] private Button selectionBerryButton; + [SerializeField] private Button selectionCoinButton; + [SerializeField] private Button selectionLegacyButton; + [SerializeField] private Button selectionTotalBerriesButton; - public GameObject scorePanel; - public GameObject scoreContent; - public GameObject scoreSampleObject; + [SerializeField] private GameObject scorePanel; + [SerializeField] private GameObject scoreContent; + [SerializeField] private GameObject scoreSampleObject; - public GameObject berryPanel; - public GameObject berryContent; - public TMP_Dropdown berryShowTypeDropdown; - public GameObject berrySampleObject; + [SerializeField] private GameObject berryPanel; + [SerializeField] private GameObject berryContent; + [SerializeField] private TMP_Dropdown berryShowTypeDropdown; + [SerializeField] private GameObject berrySampleObject; - public GameObject coinPanel; - public GameObject coinContent; - public GameObject coinSampleObject; + [SerializeField] private GameObject coinPanel; + [SerializeField] private GameObject coinContent; + [SerializeField] private GameObject coinSampleObject; - public GameObject legacyPanel; - public GameObject legacyContent; - public GameObject legacySampleObject; + [SerializeField] private GameObject legacyPanel; + [SerializeField] private GameObject legacyContent; + [SerializeField] private GameObject legacySampleObject; - public GameObject totalBerriesPanel; - public GameObject totalBerriesContent; - public GameObject totalBerriesSampleObject; + [SerializeField] private GameObject totalBerriesPanel; + [SerializeField] private GameObject totalBerriesContent; + [SerializeField] private GameObject totalBerriesSampleObject; - public Dictionary customIcons; + [SerializeField] private Dictionary customIcons; void Awake() { diff --git a/Assets/Scripts/LoadingMenu.cs b/Assets/Scripts/LoadingMenu.cs index 2460266..481e634 100644 --- a/Assets/Scripts/LoadingMenu.cs +++ b/Assets/Scripts/LoadingMenu.cs @@ -7,9 +7,9 @@ using UnityEngine.UI; public class LoadingMenu : MonoBehaviour { - public TMP_Text text; - public Button updateButton; - public Button continueButton; + [SerializeField] private TMP_Text text; + [SerializeField] private Button updateButton; + [SerializeField] private Button continueButton; void Start() { diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs index 67de6ff..ca53e9f 100644 --- a/Assets/Scripts/MainMenu.cs +++ b/Assets/Scripts/MainMenu.cs @@ -4,11 +4,11 @@ using UnityEngine.UI; public class MenuScript : MonoBehaviour { - public Button exitButton; - public TMP_Text updateText; - public Button updateButton; - public Button profileButton; - public ProfileMenu profilePrefab; + [SerializeField] private Button exitButton; + [SerializeField] private TMP_Text updateText; + [SerializeField] private Button updateButton; + [SerializeField] private Button profileButton; + [SerializeField] private ProfileMenu profilePrefab; void Awake() { diff --git a/Assets/Scripts/ProfileMenu.cs b/Assets/Scripts/ProfileMenu.cs index 247e9e2..dc3d03d 100644 --- a/Assets/Scripts/ProfileMenu.cs +++ b/Assets/Scripts/ProfileMenu.cs @@ -13,30 +13,30 @@ using UnityEngine.UI; public class ProfileMenu : MonoBehaviour { - public Button exitButton; - public Button refreshButton; - public Button postButton; + [SerializeField] private Button exitButton; + [SerializeField] private Button refreshButton; + [SerializeField] private Button postButton; - public GameObject contentPanel; - public TMP_Text loadingText; - public GameObject voteOverlay; - public GameObject postOverlay; + [SerializeField] private GameObject contentPanel; + [SerializeField] private TMP_Text loadingText; + [SerializeField] private GameObject voteOverlay; + [SerializeField] private GameObject postOverlay; - public TMP_Text normalBerryStat; - public TMP_Text poisonBerryStat; - public TMP_Text slowBerryStat; - public TMP_Text ultraBerryStat; - public TMP_Text speedyBerryStat; - public TMP_Text coinBerryStat; - public TMP_Text randomBerryStat; - public TMP_Text antiBerryStat; - public TMP_Text coinStat; - public TMP_Text playerNameText; - public Image playerIconImage; - public Image playerOverlayImage; - public GameObject postSample; + [SerializeField] private TMP_Text normalBerryStat; + [SerializeField] private TMP_Text poisonBerryStat; + [SerializeField] private TMP_Text slowBerryStat; + [SerializeField] private TMP_Text ultraBerryStat; + [SerializeField] private TMP_Text speedyBerryStat; + [SerializeField] private TMP_Text coinBerryStat; + [SerializeField] private TMP_Text randomBerryStat; + [SerializeField] private TMP_Text antiBerryStat; + [SerializeField] private TMP_Text coinStat; + [SerializeField] private TMP_Text playerNameText; + [SerializeField] private Image playerIconImage; + [SerializeField] private Image playerOverlayImage; + [SerializeField] private GameObject postSample; - public bool canVote = true; + [SerializeField] private bool canVote = true; void Awake() diff --git a/Assets/Scripts/RainbowImage.cs b/Assets/Scripts/RainbowImage.cs index 235c9f3..bd93e78 100644 --- a/Assets/Scripts/RainbowImage.cs +++ b/Assets/Scripts/RainbowImage.cs @@ -3,7 +3,7 @@ using UnityEngine.UI; public class RainbowImage : MonoBehaviour { - public float frequency = 1f; + [SerializeField] private float frequency = 1f; private Image targetImage; void Awake() diff --git a/Assets/Scripts/RainbowText.cs b/Assets/Scripts/RainbowText.cs index b631da1..c65acd2 100644 --- a/Assets/Scripts/RainbowText.cs +++ b/Assets/Scripts/RainbowText.cs @@ -3,7 +3,7 @@ using UnityEngine; public class RainbowText : MonoBehaviour { - public float frequency = 1f; + [SerializeField] private float frequency = 1f; private TMP_Text targetImage; void Awake() diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs index 290096f..22c9170 100644 --- a/Assets/Scripts/SettingsMenu.cs +++ b/Assets/Scripts/SettingsMenu.cs @@ -7,22 +7,22 @@ using UnityEngine.UI; public class SettingsMenu : MonoBehaviour { - public GameObject settingsMenu; - public ColorPanel colorMenu; - public Button toggleButton; + [SerializeField] private GameObject settingsMenu; + [SerializeField] private ColorPanel colorMenu; + [SerializeField] private Button toggleButton; - public Toggle setting1toggle; - public Toggle setting2toggle; - public Toggle setting3toggle; - public Toggle setting4toggle; - public Toggle setting5toggle; - public Slider musicSlider; - public Slider sfxSlider; - public GameObject settingsUI; + [SerializeField] private Toggle setting1toggle; + [SerializeField] private Toggle setting2toggle; + [SerializeField] private Toggle setting3toggle; + [SerializeField] private Toggle setting4toggle; + [SerializeField] private Toggle setting5toggle; + [SerializeField] private Slider musicSlider; + [SerializeField] private Slider sfxSlider; + [SerializeField] private GameObject settingsUI; - public Button switchColorTypeButton; - public int colorType = 0; - public bool colorCanSave = true; + [SerializeField] private Button switchColorTypeButton; + [SerializeField] private int colorType = 0; + [SerializeField] private bool colorCanSave = true; private void Start() { diff --git a/Assets/Scripts/StatsMenu.cs b/Assets/Scripts/StatsMenu.cs index a22bf72..419b414 100644 --- a/Assets/Scripts/StatsMenu.cs +++ b/Assets/Scripts/StatsMenu.cs @@ -6,7 +6,7 @@ using UnityEngine.SceneManagement; public class StatsMenu : MonoBehaviour { - public TMP_Text statText; + [SerializeField] private TMP_Text statText; void Start() {