initial state machine implementation

Author: LPLafontaineB

Assets/BossRoom/Prefabs/GameNetPortal.prefab

@@ -9,9 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5062837533140207352}
-  - component: {fileID: 5062837533140207350}
-  - component: {fileID: 5062837533140207353}
-  - component: {fileID: 5062837533140207351}
+  - component: {fileID: 1984353324962460586}
   m_Layer: 0
   m_Name: GameNetPortal
   m_TagString: GameNetPortal
@@ -29,11 +27,12 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5062837533140207350
+--- !u!114 &1984353324962460586
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -42,34 +41,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 5062837533140207349}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7ba4a1d598313d94a81a08ceae147b57, type: 3}
+  m_Script: {fileID: 11500000, guid: bf51ea31bbc84cc3aa883cc5f1caae06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_NetworkManager: {fileID: 0}
   m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}
-  PlayerName: 
---- !u!114 &5062837533140207353
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5062837533140207349}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5bd31edc1b1fd1342b3bf8193a5a03b2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &5062837533140207351
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5062837533140207349}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 54b0859a1da930541adf0b2d1bb8d977, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
   m_GameState: {fileID: 7151198093957655792, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}

Assets/BossRoom/Scenes/Startup.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57ebb73c6fac9cb948a60578d22c0c76ac8980c78e51e261e867c06eeb10013e
-size 46492
+oid sha256:6361055f2512c46595263043d91a3a0fe186dd34e66e0f27eccde053ad88c4a1
+size 45826

Assets/BossRoom/Scripts/ApplicationLifecycle/ApplicationController.cs

@@ -19,9 +19,7 @@ namespace Unity.Multiplayer.Samples.BossRoom.Shared
     public class ApplicationController : MonoBehaviour
     {
         [SerializeField] UpdateRunner m_UpdateRunner;
-        [SerializeField] GameNetPortal m_GameNetPortal;
-        [SerializeField] ClientGameNetPortal m_ClientNetPortal;
-        [SerializeField] ServerGameNetPortal m_ServerGameNetPortal;
+        [SerializeField] ConnectionManager m_ConnectionManager;
 
         LocalLobby m_LocalLobby;
         LobbyServiceFacade m_LobbyServiceFacade;
@@ -40,9 +38,7 @@ private void Awake()
 
             scope.BindInstanceAsSingle(this);
             scope.BindInstanceAsSingle(m_UpdateRunner);
-            scope.BindInstanceAsSingle(m_GameNetPortal);
-            scope.BindInstanceAsSingle(m_ClientNetPortal);
-            scope.BindInstanceAsSingle(m_ServerGameNetPortal);
+            scope.BindInstanceAsSingle(m_ConnectionManager);
 
             //the following singletons represent the local representations of the lobby that we're in and the user that we are
             //they can persist longer than the lifetime of the UI in MainMenu where we set up the lobby that we create or join

Assets/BossRoom/Scripts/Gameplay/ConnectionManagement/ClientGameNetPortal.cs

@@ -60,6 +60,12 @@ void Start()
             m_Portal = GetComponent<GameNetPortal>();
 
             m_Portal.NetManager.OnClientDisconnectCallback += OnDisconnectOrTimeout;
+            m_Portal.NetManager.OnClientConnectedCallback += NetManagerOnOnClientConnectedCallback;
+        }
+
+        void NetManagerOnOnClientConnectedCallback(ulong obj)
+        {
+            Debug.Log("Client connected callback");
         }
 
         void OnDestroy()
@@ -69,6 +75,7 @@ void OnDestroy()
                 if (m_Portal.NetManager != null)
                 {
                     m_Portal.NetManager.OnClientDisconnectCallback -= OnDisconnectOrTimeout;
+                    m_Portal.NetManager.OnClientConnectedCallback -= NetManagerOnOnClientConnectedCallback;
                 }
 
                 if (NetworkManager.Singleton != null && NetworkManager.Singleton.CustomMessagingManager != null)
@@ -146,6 +153,7 @@ private void OnDisconnectReasonReceived(ConnectStatus status)
 
         private void OnDisconnectOrTimeout(ulong clientID)
         {
+            Debug.Log("DisconnectCallback");
             // This is also called on the Host when a different client disconnects. To make sure we only handle our own disconnection, verify that we are either
             // not a host (in which case we know this is about us) or that the clientID is the same as ours if we are the host.
             if (!NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsHost && NetworkManager.Singleton.LocalClientId == clientID)
@@ -180,7 +188,7 @@ private void OnDisconnectOrTimeout(ulong clientID)
                     default:
                         throw new NotImplementedException(DisconnectReason.Reason.ToString());
                 }
-
+                Debug.Log(DisconnectReason.Reason);
                 m_ConnectStatusPub.Publish(DisconnectReason.Reason);
                 DisconnectReason.Clear();
             }