Skip to content

Commit 788eb23

Browse files
Merge develop into feature/replace-guid-with-auth-playerid
2 parents d119ffb + ee838ef commit 788eb23

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
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:8b407a8f749be46081c218ec3301374a0a59fdc5abbd670d91af35e2c4055b4b
3-
size 70143
2+
oid sha256:b934e17a1973dc7998d1d1bdfff5e424458b019f4584ced739718c1afad668b6
3+
size 81425

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class ClientMainMenuState : GameStateBehaviour
2525

2626
[SerializeField] NameGenerationData m_NameGenerationData;
2727
[SerializeField] LobbyUIMediator m_LobbyUIMediator;
28+
[SerializeField] IPUIMediator m_IPUIMediator;
2829

2930
[SerializeField] CanvasGroup m_MainMenuButtonsCanvasGroup;
3031
[SerializeField] GameObject m_SignInSpinner;
@@ -43,6 +44,7 @@ void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFaca
4344

4445
m_Scope.BindInstanceAsSingle(m_NameGenerationData);
4546
m_Scope.BindInstanceAsSingle(m_LobbyUIMediator);
47+
m_Scope.BindInstanceAsSingle(m_IPUIMediator);
4648

4749
var unityAuthenticationInitOptions = new InitializationOptions();
4850
var profile = ProfileManager.Profile;
@@ -89,5 +91,11 @@ public void OnStartClicked()
8991
m_LobbyUIMediator.ToggleJoinLobbyUI();
9092
m_LobbyUIMediator.Show();
9193
}
94+
95+
public void OnDirectIPClicked()
96+
{
97+
m_LobbyUIMediator.Hide();
98+
m_IPUIMediator.Show();
99+
}
92100
}
93101
}

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class IPUIMediator : MonoBehaviour
2929
[SerializeField] UITinter m_JoinTabButtonBorderTinter;
3030

3131
[SerializeField] UITinter m_HostTabButtonTinter;
32-
32+
3333
[SerializeField] UITinter m_HostTabButtonBorderTinter;
3434

3535
[SerializeField] GameObject m_SignInSpinner;
@@ -63,22 +63,6 @@ void Start()
6363
ToggleCreateIPUI();
6464
}
6565

66-
void Update()
67-
{
68-
if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() ||
69-
m_OpenIPWindowKeyCode != KeyCode.None && Input.GetKeyDown(m_OpenIPWindowKeyCode))
70-
{
71-
if (m_CanvasGroup.interactable)
72-
{
73-
Hide();
74-
}
75-
else
76-
{
77-
Show();
78-
}
79-
}
80-
}
81-
8266
static bool AnyTouchDown()
8367
{
8468
foreach (var touch in Input.touches)

0 commit comments

Comments
 (0)