diff --git a/Assets/Scripts/Networking/Client/ClientObject.cs b/Assets/Scripts/Networking/Client/ClientObject.cs index 654f66b..1147044 100644 --- a/Assets/Scripts/Networking/Client/ClientObject.cs +++ b/Assets/Scripts/Networking/Client/ClientObject.cs @@ -40,6 +40,15 @@ namespace Networking.Client [SerializeField] [Tooltip("Client Inventory")] protected Inventory Inventory; + + [SerializeField] + [Tooltip("Current Time in Round")] + public float RoundTime; + + [SerializeField] + [Tooltip("Current Score in Round")] + public float RoundScore; + #endregion Inspector Fields @@ -64,6 +73,7 @@ namespace Networking.Client client.RegisterHandler(LogicProtocols.SendInventory, RecieveInventory); client.RegisterHandler(LoginProtocols.SceneChange, RecieveSceneChange); client.RegisterHandler(MsgType.Disconnect, OnDisconnect); + client.RegisterHandler(LogicProtocols.SendRoundTime, UpdateTime); } public void Stop() @@ -105,6 +115,16 @@ namespace Networking.Client { UnityEngine.SceneManagement.SceneManager.LoadScene(DisconnectScene); } + + public void UpdateTime(NetworkMessage msg) + { + Debug.Log("Recieveing time from server"); + LogicProtocols.FloatMsg floatMsg; + if (!msg.TryRead(out floatMsg)) + return; + + RoundTime = floatMsg.Float; + } } } diff --git a/Assets/Scripts/UI/NetworkedUIManager.cs b/Assets/Scripts/UI/NetworkedUIManager.cs index 40802de..22ed66e 100644 --- a/Assets/Scripts/UI/NetworkedUIManager.cs +++ b/Assets/Scripts/UI/NetworkedUIManager.cs @@ -14,9 +14,6 @@ public class NetworkedUIManager : PlayerUIManager [SerializeField] private RectTransform Title; - [SerializeField] - private float TotalTime; - [Header("Debug")] [SerializeField] private bool isTimePaused; @@ -35,25 +32,14 @@ public class NetworkedUIManager : PlayerUIManager OnClick_Show(); } - private void OnEnable() - { - if (Client.isConnected) - Client.client.RegisterHandler(LogicProtocols.SendRoundTime, UpdateTime); - } - - private void OnDisable() - { - if (Client.isConnected) - Client.client.UnregisterHandler(LogicProtocols.SendRoundTime); - } private void Update() { if (!isTimePaused) { - TimeText.text = ((int)(TotalTime - (Time.time - StartTime))).ToString(); + TimeText.text = ((int)(Client.RoundTime - (Time.time - StartTime))).ToString(); - if (Time.time - StartTime > TotalTime) + if (Time.time - StartTime > Client.RoundTime) OnClick_Play(); } } @@ -79,13 +65,6 @@ public class NetworkedUIManager : PlayerUIManager } - public void UpdateTime(NetworkMessage msg) - { - LogicProtocols.FloatMsg floatMsg; - if (!msg.TryRead(out floatMsg)) - return; - - TotalTime = floatMsg.Float; - } + }