From 1644584ebf88e0b1933ae7c4da29b86e0b972ef8 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 5 Apr 2022 13:59:28 -0700 Subject: [PATCH] change connect text --- QSB/Menus/MenuManager.cs | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs index 20b62ef8..7a13e4ba 100644 --- a/QSB/Menus/MenuManager.cs +++ b/QSB/Menus/MenuManager.cs @@ -5,7 +5,6 @@ using QSB.Player.TransformSync; using QSB.SaveSync.Messages; using QSB.Utility; using System; -using System.Text; using UnityEngine; using UnityEngine.UI; @@ -30,9 +29,8 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart private GameObject NewGameButton; private GameObject ConnectButton; private PopupInputMenu ConnectPopup; - private StringBuilder _nowLoadingSB; - private Text _loadingText; - private const int _titleButtonIndex = 2; + private Text _connectButtonText; + private const int _connectButtonIndex = 2; private const string HostString = "OPEN TO MULTIPLAYER"; private const string ConnectString = "CONNECT TO MULTIPLAYER"; @@ -75,31 +73,17 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart } } - private void ResetStringBuilder() - { - if (_nowLoadingSB == null) - { - _nowLoadingSB = new StringBuilder(); - return; - } - - _nowLoadingSB.Length = 0; - } - private void Update() { if (QSBCore.IsInMultiplayer && LoadManager.GetLoadingScene() is OWScene.SolarSystem or OWScene.EyeOfTheUniverse - && _loadingText != null) + && _connectButtonText != null) { var num = LoadManager.GetAsyncLoadProgress(); num = num < 0.1f ? Mathf.InverseLerp(0f, 0.1f, num) * 0.9f : 0.9f + Mathf.InverseLerp(0.1f, 1f, num) * 0.1f; - ResetStringBuilder(); - _nowLoadingSB.Append(UITextLibrary.GetString(UITextType.LoadingMessage)); - _nowLoadingSB.Append(num.ToString("P0")); - _loadingText.text = _nowLoadingSB.ToString(); + _connectButtonText.text = $"{UITextLibrary.GetString(UITextType.LoadingMessage)}{num:P0}"; } } @@ -245,8 +229,8 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart { CreateCommonPopups(); - ConnectButton = QSBCore.MenuApi.TitleScreen_MakeMenuOpenButton(ConnectString, _titleButtonIndex, ConnectPopup); - _loadingText = ConnectButton.transform.GetChild(0).GetChild(1).GetComponent(); + ConnectButton = QSBCore.MenuApi.TitleScreen_MakeMenuOpenButton(ConnectString, _connectButtonIndex, ConnectPopup); + _connectButtonText = ConnectButton.transform.GetChild(0).GetChild(1).GetComponent(); ResumeGameButton = GameObject.Find("MainMenuLayoutGroup/Button-ResumeGame"); NewGameButton = GameObject.Find("MainMenuLayoutGroup/Button-NewGame"); @@ -357,6 +341,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart SetButtonActive(ResumeGameButton, false); SetButtonActive(NewGameButton, false); + _connectButtonText.text = "CONNECTING..."; ConnectButton.GetComponent().enabled = false; } @@ -424,6 +409,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart Delay.RunWhen(PlayerData.IsLoaded, () => SetButtonActive(ResumeGameButton, PlayerData.LoadLoopCount() > 1)); SetButtonActive(NewGameButton, true); + _connectButtonText.text = ConnectString; ConnectButton.GetComponent().enabled = true; } }