Merge branch 'develop' into fix/more-lobby-visual-work

# Conflicts resolved with unity merge tool:
#	Assets/BossRoom/Scenes/MainMenu.unity
#	Assets/BossRoom/Scripts/Client/UI/IPUIMediator.cs

Author: jilfranco-unity

Assets/BossRoom/Scenes/MainMenu.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5790cc2f653d56216f8d97d9759232fc2fb26b956469cb2b2ff1450613e20f82
-size 70413
+oid sha256:c35a9ba013ee2c28224c5aaee30e2ce0b8b3773c1c24cf119b643d7a9acdead7
+size 84071

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

@@ -29,6 +29,7 @@ public class ClientMainMenuState : GameStateBehaviour
 
         [SerializeField] NameGenerationData m_NameGenerationData;
         [SerializeField] LobbyUIMediator m_LobbyUIMediator;
+        [SerializeField] IPUIMediator m_IPUIMediator;
 
         [SerializeField] CanvasGroup m_MainMenuButtonsCanvasGroup;
         [SerializeField] GameObject m_SignInSpinner;
@@ -47,6 +48,7 @@ void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFaca
 
             m_Scope.BindInstanceAsSingle(m_NameGenerationData);
             m_Scope.BindInstanceAsSingle(m_LobbyUIMediator);
+            m_Scope.BindInstanceAsSingle(m_IPUIMediator);
 
             var unityAuthenticationInitOptions = new InitializationOptions();
 
@@ -115,5 +117,11 @@ public void OnStartClicked()
             m_LobbyUIMediator.ToggleJoinLobbyUI();
             m_LobbyUIMediator.Show();
         }
+
+        public void OnDirectIPClicked()
+        {
+            m_LobbyUIMediator.Hide();
+            m_IPUIMediator.Show();
+        }
     }
 }

Assets/BossRoom/Scripts/Client/UI/IPUIMediator.cs

@@ -31,7 +31,7 @@ public class IPUIMediator : MonoBehaviour
         [SerializeField] UITinter m_JoinTabButtonTabBlockerTinter;
 
         [SerializeField] UITinter m_HostTabButtonTinter;
-        
+
         [SerializeField] UITinter m_HostTabButtonHighlightTinter;
 
         [SerializeField] UITinter m_HostTabButtonTabBlockerTinter;
@@ -67,22 +67,6 @@ void Start()
             ToggleCreateIPUI();
         }
 
-        void Update()
-        {
-            if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() ||
-                m_OpenIPWindowKeyCode != KeyCode.None && Input.GetKeyDown(m_OpenIPWindowKeyCode))
-            {
-                if (m_CanvasGroup.interactable)
-                {
-                    Hide();
-                }
-                else
-                {
-                    Show();
-                }
-            }
-        }
-
         static bool AnyTouchDown()
         {
             foreach (var touch in Input.touches)

Assets/BossRoom/Scripts/Client/UI/UnityServicesUIHandler.cs

@@ -27,12 +27,15 @@ void ServiceErrorHandler(UnityServiceErrorMessage error)
             var errorMessage = error.Message;
             if (error.AffectedService == UnityServiceErrorMessage.Service.Lobby)
             {
-                if ((error.OriginalException as LobbyServiceException).Reason == LobbyExceptionReason.LobbyConflict)
+                if (error.OriginalException is LobbyServiceException lobbyServiceException)
                 {
-                    // LobbyConflict can have multiple causes. Let's add other solutions here if there's other situations that arise for this.
-                    errorMessage += "\nSee logs for possible causes and solution.";
-                    Debug.LogError($"Got service error {error.Message} with LobbyConflict. Possible conflict cause: Trying to play with two builds on the " +
-                                   $"same machine. Please use command line arg '{ClientMainMenuState.AuthProfileCommandLineArg} someName' to set a different auth profile.\n");
+                    if (lobbyServiceException.Reason == LobbyExceptionReason.LobbyConflict)
+                    {
+                        // LobbyConflict can have multiple causes. Let's add other solutions here if there's other situations that arise for this.
+                        errorMessage += "\nSee logs for possible causes and solution.";
+                        Debug.LogError($"Got service error {error.Message} with LobbyConflict. Possible conflict cause: Trying to play with two builds on the " +
+                            $"same machine. Please use command line arg '{ClientMainMenuState.AuthProfileCommandLineArg} someName' to set a different auth profile.\n");
+                    }
                 }
             }