Merge pull request #2 from Unity-Technologies/Update/disabling-services

Adding warnings for services when these are disabled
Unity-Technologies · Jun 8, 2023 · 4ef9f87 · 4ef9f87
2 parents 37fa6c7 + 78c9213
commit 4ef9f87
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/Assets/Scripts/Gameplay/UI/MonoBehaviours/MainMenu/MainMenu.cs b/Assets/Scripts/Gameplay/UI/MonoBehaviours/MainMenu/MainMenu.cs
@@ -72,9 +72,20 @@ private async void Awake()
                 Destroy(gameObject);
                 return;
             }
-
             MatchMakingConnector = new MatchMakingConnector(m_ServerSettings);
-            await MatchMakingConnector.Init();
+            if (string.IsNullOrEmpty(Application.cloudProjectId))
+            {
+                Debug.LogWarning($"To use Unity's dashboard services, " +
+                                 "you need to link your Unity project to a project ID. " +
+                                 "To do this, go to Project Settings to select your organization, " +
+                                 "select your project and then link a project ID. " +
+                                 "You also need to make sure your organization has access to the required products. " +
+                                 "Visit https://dashboard.unity3d.com to sign up.");
+            }
+            else
+            {
+                await MatchMakingConnector.Init();    
+            }
         }
 
         private void OnDestroy()

diff --git a/Assets/Scripts/Gameplay/UI/MonoBehaviours/Matchmaker/MatchMakingConnector.cs b/Assets/Scripts/Gameplay/UI/MonoBehaviours/Matchmaker/MatchMakingConnector.cs
@@ -34,6 +34,7 @@ public class MatchMakingConnector
         public MatchMakingConnector(MultiplayerServerSettings ServerSettings)
         {
             m_ServerSettings = ServerSettings;
+            m_DefaultName = Environment.UserName.ToUpper();
         }
 
         public async Task Init()
@@ -43,8 +44,6 @@ public async Task Init()
 #if UNITY_SERVER && !UNITY_EDITOR
             return;
 #endif
-            m_DefaultName = Environment.UserName.ToUpper();
-
             #region ServiceSignin
 
             m_ProfileService = new PlayerAuthentication();
@@ -59,6 +58,17 @@ public async Task Matchmake()
             Debug.Log("Beginning Matchmaking.");
             m_ConnectionStatusLabel.text = "Beginning Matchmaking.";
 
+            if (string.IsNullOrEmpty(Application.cloudProjectId))
+            {
+                Debug.LogWarning($"To use Unity's dashboard services, " +
+                                 "you need to link your Unity project to a project ID. " +
+                                 "To do this, go to Project Settings to select your organization, " +
+                                 "select your project and then link a project ID. " +
+                                 "You also need to make sure your organization has access to the required products. " +
+                                 "Visit https://dashboard.unity3d.com to sign up.");
+                return;
+            }
+
             try
             {
                 var matchmakingResult = await m_Matchmaker.Matchmake(m_ProfileService.LocalPlayer);

diff --git a/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxManager.cs b/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxManager.cs
@@ -29,6 +29,13 @@ private void Awake()
                 Destroy(this);
                 return;
             }
+
+            if (string.IsNullOrEmpty(Application.cloudProjectId))
+            {
+                Debug.LogWarning(VivoxEvents.k_SetupProjectInTheCloud);
+                Destroy(this);
+                return;
+            }
 
             Instance = this;
             m_IsReady = false;
@@ -39,7 +46,8 @@ private void Awake()
 
         private async void Start()
         {
-            // if the Unity project is not linked to a Unity services project. 
+            // if the Unity project is not linked to a Unity services project.
+            Debug.Log($"vivox applciation project {Application.cloudProjectId}");
             if (string.IsNullOrEmpty(Application.cloudProjectId))
             {
                 Debug.LogWarning(VivoxEvents.k_SetupProjectInTheCloud);

diff --git a/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxPanel.cs b/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxPanel.cs
@@ -23,6 +23,9 @@ private void Awake()
 
         private void Start()
         {
+            if(VivoxManager.Instance == null || VivoxSession == null)
+                return;
+
             VivoxSession.OnUserLoggedInEvent += ShowPanel;
             VivoxSession.OnUserLoggedInEvent += OnUserLoggedIn;
             VivoxSession.OnUserLoggedOutEvent += OnUserLoggedOut;
@@ -40,6 +43,8 @@ private void Start()
 
         private void OnDestroy()
         {
+            if (VivoxManager.Instance == null || VivoxSession == null)
+                return;
             VivoxSession.OnUserLoggedInEvent -= OnUserLoggedIn;
             VivoxSession.OnUserLoggedOutEvent -= OnUserLoggedOut;
             VivoxSession.OnUserLoggedOutEvent -= HidePanel;

diff --git a/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxPlayerList.cs b/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxPlayerList.cs
@@ -65,14 +65,20 @@ private void Update()
 
         private void Start()
         {
-            VivoxManager.Instance.Channel.OnParticipantAddedEvent += OnParticipantAdded;
-            VivoxManager.Instance.Channel.OnParticipantRemovedEvent += OnParticipantRemoved;
+            if (VivoxManager.Instance != null && VivoxManager.Instance.Channel != null)
+            {
+                VivoxManager.Instance.Channel.OnParticipantAddedEvent += OnParticipantAdded;
+                VivoxManager.Instance.Channel.OnParticipantRemovedEvent += OnParticipantRemoved;    
+            }
         }
 
         private void OnDestroy()
         {
-            VivoxManager.Instance.Channel.OnParticipantAddedEvent -= OnParticipantAdded;
-            VivoxManager.Instance.Channel.OnParticipantRemovedEvent -= OnParticipantRemoved;
+            if (VivoxManager.Instance != null && VivoxManager.Instance.Channel != null)
+            {
+                VivoxManager.Instance.Channel.OnParticipantAddedEvent -= OnParticipantAdded;
+                VivoxManager.Instance.Channel.OnParticipantRemovedEvent -= OnParticipantRemoved;    
+            }
         }
 
         private void OnParticipantAdded(string username, ChannelId channel, IParticipant participant)