Hooked in the starting game UI functions to network events to load th…

…e next scene and start the online match

Assets/Scripts/Networking/NetworkManager.cs

@@ -3,12 +3,13 @@
 using UnityEngine;
 using KickDive.Match;
 using Photon.Realtime;
+using ExitGames.Client.Photon;
 using Hashtable = ExitGames.Client.Photon.Hashtable;
 
 // All things at the game-level related to network live here
 // Accessible as a singleton
 namespace Photon.Pun {
-    public class NetworkManager : MonoBehaviourPunCallbacks {
+    public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback {
 
         public static NetworkManager instance;
         public static PlayerNumber playerNumber = PlayerNumber.None;
@@ -33,8 +34,10 @@ public class NetworkManager : MonoBehaviourPunCallbacks {
         [SerializeField]
         private string  _playerPrefabName;
         private string  _gameVersion = "1.0";
+        private readonly byte startGameEventCode = 0;
 
         private PhotonView _playerPrefabPhotonView;
+        private MatchManager _matchManagerInstace;
 
         public override void OnEnable() {
             // Register the manager as a callback reciever
@@ -75,18 +78,19 @@ public void ConnectToMaster() {
         }
 
         public override void OnConnectedToMaster() {
-            Debug.Log("Connected to Photon master server");
-            isConnectedToMaster = true;
-
             // Set custom some player properties before joining room
             Hashtable playerProperties = new Hashtable();
             playerProperties["Ping"] = PhotonNetwork.GetPing();
 
             PhotonNetwork.LocalPlayer.SetCustomProperties(playerProperties);
 
             // Fire Event 
-            if (OnConnectedToPhotonMaster != null)
+            if (OnConnectedToPhotonMaster != null && !isConnectedToMaster) {
                 OnConnectedToPhotonMaster();
+
+                Debug.Log("Connected to Photon master server");
+                isConnectedToMaster = true;
+            }
         }
 
         // Joining a room
@@ -97,6 +101,10 @@ public void JoinOrCreateRoom(string roomName) {
             PhotonNetwork.JoinOrCreateRoom(roomName, roomOptions, TypedLobby.Default);
         }
 
+        public void LeaveRoom() {
+            PhotonNetwork.LeaveRoom();
+        }
+
         public override void OnJoinRoomFailed(short returnCode, string message) {
             Debug.LogError("Failed to join room");
             base.OnJoinRoomFailed(returnCode, message);
@@ -129,7 +137,7 @@ public override void OnJoinedRoom() {
             Debug.Log("Joined as Player Number: " + playerNumber);
 
             // TODO: Move these to a new initialization method once network connection between scenes is working
-            //MatchManager.instance.SetPlayerSpawn(playerNumber);
+            //_matchManagerInstace.SetPlayerSpawn(playerNumber);
 
             //InstantiatePlayerPrefab();
 
@@ -144,8 +152,24 @@ public override void OnPlayerLeftRoom(Player otherPlayer) {
             Debug.Log("Other player has disconnected! Shutting down match");
 
             // Teardown
-            MatchManager.instance.EndMatch();
-            MatchManager.instance.EndRound();
+            if (_matchManagerInstace != null) {
+                _matchManagerInstace.EndMatch();
+                _matchManagerInstace.EndRound();
+            }
+        }
+
+        public void RaiseStartGameEvent() {
+            RaiseEventOptions eventOptions = new RaiseEventOptions { Receivers = ReceiverGroup.All };
+            SendOptions sendOptions = new SendOptions { Reliability = true };
+            PhotonNetwork.RaiseEvent(startGameEventCode, null, eventOptions, sendOptions);
+        }
+
+        // Event handler for PHOTON events only!
+        public void OnEvent(EventData photonEvent) {
+            // Load the game scene
+            if (photonEvent.Code == 0) {
+                Debug.Log("Photon start game event recieved!");
+            }
         }
 
         public void InstantiatePlayerPrefab() {
@@ -154,11 +178,11 @@ public void InstantiatePlayerPrefab() {
                 return;
             }
 
-            if (_playerPrefabPhotonView == null) {
-                _playerPrefabPhotonView = PhotonNetwork.Instantiate(_playerPrefabName, MatchManager.instance.playerSpawn.position, MatchManager.instance.playerSpawn.rotation).GetComponent<PhotonView>();
+            if (_playerPrefabPhotonView == null && _matchManagerInstace != null) {
+                _playerPrefabPhotonView = PhotonNetwork.Instantiate(_playerPrefabName, _matchManagerInstace.playerSpawn.position, _matchManagerInstace.playerSpawn.rotation).GetComponent<PhotonView>();
                 _playerPrefabPhotonView.TransferOwnership(PhotonNetwork.LocalPlayer);
 
-                MatchManager.instance.SetPlayerGameObject(_playerPrefabPhotonView.gameObject);
+                _matchManagerInstace.SetPlayerGameObject(_playerPrefabPhotonView.gameObject);
 
                 if (_playerPrefabPhotonView == null) {
                     Debug.LogError("Player prefab has no photon view! This is an error");

Assets/Scripts/UI/LoadingCircle.cs

@@ -17,7 +17,7 @@ public class LoadingCircle : MonoBehaviour {
         private RectTransform   _rectComponent;
         public bool             _isLoading      { get; private set; }
 
-        public void StarLoading() {
+        public void StartLoading() {
             _isLoading = true;
         }
 

Assets/Scripts/UI/MainMenuUI.cs

@@ -21,7 +21,7 @@ public void StartGame() {
 
             // Turn on the loading circle and start the load
             _loadingCircle.gameObject.SetActive(true);
-            _loadingCircle.StarLoading();
+            _loadingCircle.StartLoading();
         }
 
         public void ConnectSuccessful() {

Assets/Scripts/UI/MenuUIManager.cs

@@ -7,8 +7,8 @@
 namespace KickDive.UI {
     public class MenuUIManager : MonoBehaviour {
 
-        private enum JoinHostState {
-            None, 
+        public enum JoinHostState {
+            None,
             Join,
             Host
         }
@@ -31,9 +31,10 @@ private enum JoinHostState {
         private TextMeshProUGUI _joinHostButtonText;
 
         private NetworkManager      _networkManagerInstance;
-        private JoinHostState       _joinHostState;
         private string              _roomName;
 
+        public JoinHostState        joinHostState { get; private set; }
+
         private void Awake() {
             if (NetworkManager.instance != null) {
                 _networkManagerInstance = NetworkManager.instance;
@@ -43,6 +44,7 @@ private void Awake() {
             }
 
             _networkManagerInstance.OnConnectedToPhotonMaster += OnConnectedToMaster;
+            _networkManagerInstance.OnConnectedToRoom += OnConnectedToRoom;
         }
 
         public void ConnectToMaster() {
@@ -84,13 +86,13 @@ IEnumerator PhotonMasterConnectionTimer() {
         }
 
         public void JoinRoom() {
-            _joinHostState = JoinHostState.Join;
+            joinHostState = JoinHostState.Join;
             TransitionToRoomName();
             _joinHostButtonText.SetText("JOIN");
         }
 
         public void HostRoom() {
-            _joinHostState = JoinHostState.Host;
+            joinHostState = JoinHostState.Host;
             TransitionToRoomName();
             _joinHostButtonText.SetText("HOST");
         }
@@ -103,6 +105,19 @@ public void ConnectToRoom() {
             }
         }
 
+        public void LeaveRoom() {
+            _networkManagerInstance.LeaveRoom();
+            _roomName = null;
+        }
+
+        // TODO: Handle the case where the host disconnects but the client remains AFTER client joins the host
+        public void OnConnectedToRoom(string roomName) {
+            if (PhotonNetwork.CurrentRoom.PlayerCount > 1) {
+                // Both players are here, lets start the game!
+                _networkManagerInstance.RaiseStartGameEvent();
+            }
+        }
+
         public void SetRoomName(string roomName) {
             _roomName = roomName;
         }
@@ -120,7 +135,7 @@ private void TransitionToRoomName() {
         }
 
         public void ResetJoinHostData() {
-            _joinHostState = JoinHostState.None;
+            joinHostState = JoinHostState.None;
             _roomName = null;
         }
     }

Assets/Scripts/UI/RoomNameMenuUI.cs

@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+
+namespace KickDive.UI {
+    public class RoomNameMenuUI : MonoBehaviour {
+
+        [SerializeField]
+        private TextMeshProUGUI _titleText;
+
+        [SerializeField]
+        private LoadingCircle _loadingCircle;
+
+        [SerializeField]
+        private Transform _mainContents;
+
+        [SerializeField]
+        private Transform _waitingScreen;
+
+        [SerializeField]
+        private MenuUIManager _uiManager;
+
+        [SerializeField]
+        private TMP_InputField _inputField;
+
+        public bool isWaiting { get; private set; }
+
+        public void LoadWaitingContent() {
+            // Turn on the right context
+            _inputField.DeactivateInputField();
+            _mainContents.gameObject.SetActive(false);
+            _waitingScreen.gameObject.SetActive(true);
+
+            _titleText.SetText("WAITING");
+
+            _loadingCircle.StartLoading();
+
+            isWaiting = true;
+        }
+
+        public void LoadMainContent() {
+            // Turn on the right context
+            _inputField.ActivateInputField();
+            _mainContents.gameObject.SetActive(true);
+
+            _loadingCircle.StopLoading();
+            _waitingScreen.gameObject.SetActive(false);
+
+            _titleText.SetText("ENTER NAME");
+
+            isWaiting = false;
+        }
+    }
+}

ProjectSettings/EditorBuildSettings.asset

@@ -8,6 +8,9 @@ EditorBuildSettings:
   - enabled: 0
     path: 
     guid: 00000000000000000000000000000000
+  - enabled: 1
+    path: Assets/Scenes/Menu.unity
+    guid: e1efdfb722420244b99edc476168cead
   - enabled: 1
     path: Assets/Scenes/SandboxScene.unity
     guid: 1ba2940682727cd4e910279214d8c6c4