Fix player components injection. Add lobby reloading when clients change

Assets/Scripts/UI/HandMenuUI.cs

@@ -1,14 +1,13 @@
 using HurricaneVR.Framework.ControllerInput;
 using HurricaneVR.Framework.Core.UI;
 using Sirenix.OdinInspector;
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
+using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.UI;
 using Zenject;
 
-public class HandMenuUI : MonoBehaviour
+public class HandMenuUI : NetworkBehaviour
 {
     [Inject]
     [ReadOnly]
@@ -89,6 +88,14 @@ public class HandMenuUI : MonoBehaviour
         settingsButton.onClick.AddListener(() => SettingsClicked());
     }
 
+    public override void OnNetworkSpawn()
+    {
+        base.OnNetworkSpawn();
+        
+        // Player components need to be injected manualy again, because NetworkManager doesn't inject them.
+        gameObject.Inject();
+    }
+
     private void Update()
     {
         CheckInput();

Assets/Scripts/UI/LobbyMenuUI.cs

@@ -1,5 +1,6 @@
 using HurricaneVR.Framework.Core.UI;
 using Sirenix.OdinInspector;
+using System.Collections.Generic;
 using TMPro;
 using Unity.Netcode;
 using UnityEngine;
@@ -51,6 +52,8 @@ public class LobbyMenuUI : MonoBehaviour
 
     private bool isConnected => gameManager.IsMultiplayer;
 
+    private IReadOnlyList<NetworkClient> networkClients = new List<NetworkClient>();
+
     private void Start()
     {
         if (uiInput == null) return;
@@ -64,6 +67,12 @@ public class LobbyMenuUI : MonoBehaviour
         gameManager.OnConnected.AddListener(() => UpdateUI());
         gameManager.OnDisconnected.AddListener(() => UpdateUI());
 
+        gameManager.OnClientsChanged.AddListener((clients) => 
+        {
+            networkClients = clients;
+            UpdateUI();
+        });
+
         UpdateUI();
     }
 
@@ -73,6 +82,28 @@ public class LobbyMenuUI : MonoBehaviour
         connected.SetActive(isConnected);
         joinButton.interactable = true;
         hostButton.interactable = true;
+
+        for (int i = 0; i < playerItems.Length; i++)
+        {
+            var item = playerItems[i];
+
+            if (i > networkClients.Count -1)
+            {
+                item.Setup(null);
+            }
+            else
+            {
+                var client = networkClients[i];
+
+                var playerInfo = new PlayerInfo()
+                { 
+                    Name = client.ClientId.ToString(),
+                    isLocalPlayer = client.ClientId == gameManager.LocalClient.ClientId
+                };
+
+                item.Setup(playerInfo);
+            }
+        }
     }
 
     private void JoinClicked()

Assets/Scripts/UI/PlayerItemUI.cs

@@ -23,6 +23,9 @@ public class PlayerItemUI : MonoBehaviour
     [SerializeField]
     private PlayerInfo? playerInfo;
 
+    [SerializeField]
+    private Sprite defaultPlayerImage;
+
     bool isEmpty => playerInfo == null;
 
     private void Start()
@@ -44,7 +47,7 @@ public class PlayerItemUI : MonoBehaviour
         if (!isEmpty)
         {
             nameText.text = playerInfo?.Name;
-            playerImage.sprite = playerInfo?.Image;
+            playerImage.sprite = playerInfo?.Image ?? defaultPlayerImage;
         }
     }
 }