Merge branch 'develop' into feature/auto-reconnect

Author: LPLafontaineB

Assets/BossRoom/Scenes/MainMenu.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab88f74282581bf8420dfd32062ed2908d6284179c47f46170c513b5de2c862a
-size 87040
+oid sha256:94ba7d5188c030aa53bd078d4044cc7c0deb9a542aac6f189e0f97b5a564a647
+size 90859

Assets/BossRoom/Scripts/Client/Game/State/ClientMainMenuState.cs

@@ -7,7 +7,7 @@
 using Unity.Services.Authentication;
 using Unity.Services.Core;
 using UnityEngine;
-
+using UnityEngine.UI;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Client
 {
@@ -25,13 +25,12 @@ public class ClientMainMenuState : GameStateBehaviour
         [SerializeField] NameGenerationData m_NameGenerationData;
         [SerializeField] LobbyUIMediator m_LobbyUIMediator;
         [SerializeField] IPUIMediator m_IPUIMediator;
-
-        [SerializeField] CanvasGroup m_MainMenuButtonsCanvasGroup;
+        [SerializeField] Button m_LobbyButton;
         [SerializeField] GameObject m_SignInSpinner;
 
         protected override void Awake()
         {
-            m_MainMenuButtonsCanvasGroup.interactable = false;
+            m_LobbyButton.interactable = false;
             m_LobbyUIMediator.Hide();
             base.Awake();
         }
@@ -46,6 +45,15 @@ protected override void InitializeScope()
         [Inject]
         async void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFacade, LocalLobbyUser localUser, LocalLobby localLobby)
         {
+            #if UNITY_EDITOR
+            if (string.IsNullOrEmpty(UnityEditor.CloudProjectSettings.projectId))
+            {
+                PopupManager.ShowPopupPanel("Unity Game Services ProjectID not set up" ,"Please follow the steps outlined in Readme to set up your project id - it is required for the services to function.");
+                OnSignInFailed();
+                return;
+            }
+            #endif
+
             try
             {
                 var unityAuthenticationInitOptions = new InitializationOptions();
@@ -65,7 +73,7 @@ async void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServi
 
             void OnAuthSignIn()
             {
-                m_MainMenuButtonsCanvasGroup.interactable = true;
+                m_LobbyButton.interactable = true;
                 m_SignInSpinner.SetActive(false);
 
                 Debug.Log($"Signed in. Unity Player ID {AuthenticationService.Instance.PlayerId}");
@@ -77,6 +85,7 @@ void OnAuthSignIn()
 
             void OnSignInFailed()
             {
+                m_LobbyButton.interactable = false;
                 m_SignInSpinner.SetActive(false);
             }
         }

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/GameNetPortal.cs

@@ -8,6 +8,7 @@
 using Unity.Netcode.Transports.UNET;
 using Unity.Netcode.Transports.UTP;
 using Unity.Services.Authentication;
+using Unity.Services.Core;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -262,6 +263,11 @@ public void RequestDisconnect()
 
         public string GetPlayerId()
         {
+            if (UnityServices.State != ServicesInitializationState.Initialized)
+            {
+                return ClientPrefs.GetGuid() + ProfileManager.Profile;
+            }
+
             return AuthenticationService.Instance.IsSignedIn ? AuthenticationService.Instance.PlayerId : ClientPrefs.GetGuid() + ProfileManager.Profile;
         }
     }

Assets/Readme.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:512ffb044e4ca1c4b125eea4266125dfe7c6c600bea20545afbe0ab3333350a5
-size 1634
+oid sha256:f829608f4fac5c3637e5daa00e20806530c3bf0420acfe14611195954e515f35
+size 1879

README.md

@@ -29,6 +29,10 @@ See [ART_NOTES.md](Documentation/ART_NOTES.md) for more information on the art o
 
 This project uses Git Large Files Support (LFS), which ensures all large assets required locally are handled for the project. See [Git LFS installation options](https://github.com/git-lfs/git-lfs/wiki/Installation) for Windows and Mac instructions. 
 
+## Registering the project with Unity Gaming Services (UGS)
+
+This project leverages several services from UGS to facilitate connectivity between players. In order to use these services inside your project, one must first [create an organization](https://support.unity.com/hc/en-us/articles/208592876-How-do-I-create-a-new-Organization-) inside Unity Dashboard, and enable both the [Relay](https://docs.unity.com/relay/get-started.html) and [Lobby](https://docs.unity.com/lobby/game-lobby-sample.html) services.
+
 ## Opening the project for the first time
 
 Once you have downloaded the project, the steps below should get you up and running: