reverting some changes to CharSelectData, ClientCharSelectState isn't a NetworkObject anymore.

Reverting NetcodeHook to this branch's asset ID, so we don't break too many things in current branch (fixed develop's refs to use this as well)

Author: SamuelBellomo

Assets/Prefabs/State/BossRoomState.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 3608714310874968837}
   - component: {fileID: -1764033382396218637}
   - component: {fileID: 5762482089640033414}
-  - component: {fileID: 1290852967062359934}
+  - component: {fileID: 1746867991429315596}
   m_Layer: 0
   m_Name: BossRoomState
   m_TagString: Untagged
@@ -91,7 +91,7 @@ MonoBehaviour:
     TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
   autoRun: 1
   autoInjectGameObjects: []
-  m_NetcodeHooks: {fileID: 1290852967062359934}
+  m_NetcodeHooks: {fileID: 1746867991429315596}
   m_NetworkGameStateTransform: {fileID: 11400000, guid: 07bddcdf06738e74cb79d30065ff96af, type: 2}
   m_PlayerPrefab: {fileID: 6009713983291384767, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
   m_PlayerSpawnPoints:
@@ -103,7 +103,7 @@ MonoBehaviour:
   - {fileID: 6314369147267609336}
   - {fileID: 8725901042666772653}
   - {fileID: 7239491272522478247}
---- !u!114 &1290852967062359934
+--- !u!114 &1746867991429315596
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,7 +112,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 297185343939699586}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
+  m_Script: {fileID: 11500000, guid: e2c949841cd7402f96426d2d177731a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &1088799320945899822

Assets/Prefabs/State/CharSelectState.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 1092063945021251778}
   - component: {fileID: 3565665953789623675}
   - component: {fileID: 3565665953789623673}
-  - component: {fileID: 8494646029522094751}
+  - component: {fileID: 4791671232360312601}
   m_Layer: 0
   m_Name: CharSelectState
   m_TagString: Untagged
@@ -67,6 +67,7 @@ MonoBehaviour:
     TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
   autoRun: 1
   autoInjectGameObjects: []
+  m_NetcodeHooks: {fileID: 4791671232360312601}
 --- !u!114 &3565665953789623673
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -88,7 +89,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f49fc0646d4e9554f88a31ac496afd19, type: 2}
   - {fileID: 11400000, guid: 70d299733c76b0649852336624091fca, type: 2}
   - {fileID: 11400000, guid: 9cc69a593b6ff1b4b95bf7330ec5ab46, type: 2}
---- !u!114 &8494646029522094751
+--- !u!114 &4791671232360312601
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -97,6 +98,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 3565665953789623672}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
+  m_Script: {fileID: 11500000, guid: e2c949841cd7402f96426d2d177731a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

Assets/Prefabs/State/PostGameState.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: -1007214952234040975}
   - component: {fileID: 7475764267130300178}
   - component: {fileID: 4223400095609434710}
-  - component: {fileID: 6576822806953781696}
+  - component: {fileID: 1174523458406545985}
   m_Layer: 0
   m_Name: PostGameState
   m_TagString: Untagged
@@ -67,7 +67,7 @@ MonoBehaviour:
     TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
   autoRun: 1
   autoInjectGameObjects: []
-  m_NetcodeHooks: {fileID: 6576822806953781696}
+  m_NetcodeHooks: {fileID: 1174523458406545985}
 --- !u!114 &4223400095609434710
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -84,7 +84,7 @@ MonoBehaviour:
     TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
   autoRun: 1
   autoInjectGameObjects: []
---- !u!114 &6576822806953781696
+--- !u!114 &1174523458406545985
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -93,6 +93,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 7475764267130300177}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6aedfcf74b3f4f248897af16490caa9d, type: 3}
+  m_Script: {fileID: 11500000, guid: e2c949841cd7402f96426d2d177731a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

Assets/Scenes/CharSelect.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a06acfa155439752257373f6de50ef7537ffab69441f348510b27b67fe160ce5
-size 11023
+oid sha256:e662ef40c062018d8293952d9fbe1eb04c8550e5d3765332cfe737ea9b956abe
+size 7755

Assets/Scenes/CharSelectClient.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ddf334a7900d81da8171553af1e7bc5944cf76407f11f5d4fdeaded1dd3408c
-size 41757
+oid sha256:86df85977bd63d5a87a1882d6ca0b5e214fd6916ec38ffb016f5ec886c8f47f2
+size 42187

Assets/Scripts/Gameplay/GameState/CharSelectData.cs

@@ -79,6 +79,18 @@ private void Awake()
             m_LobbyPlayers = new NetworkList<LobbyPlayerState>();
         }
 
+        public Action OnNetworkSpawnCallback;
+        public override void OnNetworkSpawn()
+        {
+            OnNetworkSpawnCallback?.Invoke();
+        }
+
+        public Action OnNetworkDespawnCallback;
+        public override void OnNetworkDespawn()
+        {
+            OnNetworkDespawnCallback?.Invoke();
+        }
+
         /// <summary>
         /// Current state of all players in the lobby.
         /// </summary>

Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs

@@ -20,8 +20,6 @@ public class ClientCharSelectState : GameStateBehaviour
         /// </summary>
         public static ClientCharSelectState Instance { get; private set; }
 
-        [SerializeField]
-        NetcodeHooks m_NetcodeHooks;
 
         public override GameState ActiveState { get { return GameState.CharSelect; } }
         public CharSelectData CharSelectData { get; private set; }
@@ -116,8 +114,8 @@ protected override void Awake()
 
             // TODO inject or find another way to find CharSelectData
             CharSelectData = FindObjectOfType<CharSelectData>();
-            m_NetcodeHooks.OnNetworkSpawnHook += OnNetworkSpawn;
-            m_NetcodeHooks.OnNetworkDespawnHook += OnNetworkDespawn;
+            CharSelectData.OnNetworkSpawnCallback += OnSpawn; if (CharSelectData.IsSpawned) OnSpawn();
+            CharSelectData.OnNetworkDespawnCallback += OnDespawn;
 
             m_LobbyUIElementsByMode = new Dictionary<LobbyMode, List<GameObject>>()
             {
@@ -150,7 +148,7 @@ protected override void Start()
             UpdateCharacterSelection(CharSelectData.SeatState.Inactive);
         }
 
-        void OnNetworkDespawn()
+        void OnDespawn()
         {
             if (CharSelectData)
             {
@@ -159,7 +157,7 @@ void OnNetworkDespawn()
             }
         }
 
-        void OnNetworkSpawn()
+        void OnSpawn()
         {
             if (!NetworkManager.Singleton.IsClient)
             {