Skip to content

Commit 1a8c534

Browse files
committed
Merge branch 'fix/remove-initial-ugs-popup' into feature/update-readmes-for-new-flow
2 parents d1f7572 + 3ff8d25 commit 1a8c534

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Assets/BossRoom/Scenes/MainMenu.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3e29f674cf2ca1d985d081c3007d2ab431d4ca4feb3e6ac29424536c88bf0de7
3-
size 107472
2+
oid sha256:6c24e9e8c0626eb001167357e87d92e2dc38554afe19293fd562329b225ca7b5
3+
size 116464

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class ClientMainMenuState : GameStateBehaviour
2828
[SerializeField] Button m_LobbyButton;
2929
[SerializeField] GameObject m_SignInSpinner;
3030
[SerializeField] UIProfileSelector m_UIProfileSelector;
31+
[SerializeField] UITooltipDetector m_UGSSetupTooltipDetector;
3132

3233
AuthenticationServiceFacade m_AuthServiceFacade;
3334
LocalLobbyUser m_LocalUser;
@@ -84,6 +85,7 @@ async void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServi
8485
void OnAuthSignIn()
8586
{
8687
m_LobbyButton.interactable = true;
88+
m_UGSSetupTooltipDetector.enabled = false;
8789
m_SignInSpinner.SetActive(false);
8890

8991
Debug.Log($"Signed in. Unity Player ID {AuthenticationService.Instance.PlayerId}");
@@ -98,6 +100,7 @@ void OnSignInFailed()
98100
if (m_LobbyButton)
99101
{
100102
m_LobbyButton.interactable = false;
103+
m_UGSSetupTooltipDetector.enabled = true;
101104
}
102105
if (m_SignInSpinner)
103106
{

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ feat: other players loading progress in loading screen [MTT-2239] (#580)
1717
feat: auto reconnect [MTT-2617] (#611)
1818

1919
### Changed
20+
fix: remove initial ugs popup [MTT-3563] (#650) --> Users who do not use UGS will no longer receive a popup when starting the application telling them how to set it up. It is replaced with a tooltip that appears when hovering on the "Start with Lobby" button with the cursor.
2021
chore: bump NGO to pre.9 (#643)
2122
chore: bump boss room to 2021 [MTT-3022] (#620)
2223
fix: folders and assemblies refactor MTT-2623, MTT-2615 (#628)

0 commit comments

Comments
 (0)