refactor (Network): Simplified and removed some part of code

Author: atrakeur

Assets/Resources/NetworkManager.prefab renamed to Assets/Resources/GameManager.prefab

@@ -28,7 +28,7 @@ GameObject:
   - 114: {fileID: 11475710}
   - 114: {fileID: 11415652}
   m_Layer: 0
-  m_Name: NetworkManager
+  m_Name: GameManager
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resources/NetworkManager.prefab.meta renamed to Assets/Resources/GameManager.prefab.meta

@@ -9,31 +9,17 @@
 /// </summary>
 public class GameNetworkManager : NetworkManager {
 
-    PlayerManager playerManager;
-
-    void Awake()
-    {
-        playerManager = GetComponentInChildren<PlayerManager>();
-        
-    }
-
-    public override void OnServerAddPlayer(NetworkConnection conn, short playerControllerId)
-    {
-        base.OnServerAddPlayer(conn, playerControllerId);
-
-        playerManager.AddPlayer(conn.connectionId, conn.hostId);
-    }
-
-    public override void OnServerRemovePlayer(NetworkConnection conn, PlayerController player)
-    {
-        playerManager.RemovePlayer(conn.connectionId, conn.hostId);
-
-        base.OnServerRemovePlayer(conn, player);
-    }
-
-    public override void OnServerDisconnect(NetworkConnection conn)
+    private static GameNetworkManager instance;
+    public static GameNetworkManager Instance
     {
-        base.OnServerDisconnect(conn);
+        get
+        {
+            if (instance == null)
+            {
+                instance = FindObjectOfType<GameNetworkManager>();
+            }
+            return instance;
+        }
     }
 
 }

Assets/Scripts/NetworkManager/GameNetworkManager.cs

@@ -10,62 +10,17 @@
 [NetworkSettings(channel=0, sendInterval=2f)]
 public class PlayerManager : NetworkBehaviour {
 
-    [Serializable]
-    public struct PlayerInfo
+    private static PlayerManager instance;
+    public static PlayerManager Instance
     {
-        public string name;
-        public short rtt;
-
-        public int hostID;
-        public int connID;
-    };
-
-    public class SyncListPlayer : SyncListStruct<PlayerInfo> { }
-    public SyncListPlayer players = new SyncListPlayer();
-
-    public void AddPlayer(int connID, int hostID)
-    {
-        PlayerInfo player = new PlayerInfo();
-
-        player.name = "?";
-        player.rtt = 999;
-        player.connID = connID;
-        player.hostID = hostID;
-
-        players.Add(player);
-    }
-
-    public int GetPlayerIndex(int connID, int hostID)
-    {
-        for (int i = 0; i < players.Count; i++)
+        get
         {
-            if (players[i].connID == connID && players[i].hostID == hostID)
+            if (instance == null)
             {
-                return i;
+                instance = FindObjectOfType<PlayerManager>();
             }
+            return instance;
         }
-
-        return -1;
-    }
-
-    public PlayerInfo GetPlayer(int connID, int hostID) 
-    {
-        int index = GetPlayerIndex(connID, hostID);
-        if (index == -1)
-        {
-            throw new Exception("Can't find player with connID " + connID);
-        }
-        return players[index];
-    }
-
-    public void RemovePlayer(int connID, int hostID)
-    {
-        players.Remove(GetPlayer(connID, hostID));
-    }
-
-    void Update()
-    {
-        //TODO update ping
     }
 
 }

Assets/Scripts/NetworkManager/PlayerManager.cs

@@ -28,6 +28,7 @@ public class RemotePlayer : NetworkBehaviour {
 
     void Start()
     {
+        transform.parent = PlayerManager.Instance.transform;
         if (isLocalPlayer)
         {
             CmdSetDisplayName("Atrakeur");
@@ -76,6 +77,7 @@ void Update()
     void CmdSetDisplayName(string name)
     {
         this.displayName = name;
+        this.gameObject.name = "Player " + name;
     }
 
     /// <summary>