Skip to content

Commit b6ae11d

Browse files
More visual rework on our lobby ui, focusing on the tabs
1 parent fd74095 commit b6ae11d

File tree

10 files changed

+1838
-874
lines changed

10 files changed

+1838
-874
lines changed

Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Lines changed: 1016 additions & 676 deletions
Large diffs are not rendered by default.

Assets/BossRoom/Prefabs/UI/LobbyUI.prefab

Lines changed: 519 additions & 179 deletions
Large diffs are not rendered by default.

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:5790cc2f653d56216f8d97d9759232fc2fb26b956469cb2b2ff1450613e20f82
3+
size 70413

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ public class IPUIMediator : MonoBehaviour
2626

2727
[SerializeField] UITinter m_JoinTabButtonTinter;
2828

29-
[SerializeField] UITinter m_JoinTabButtonBorderTinter;
29+
[SerializeField] UITinter m_JoinTabButtonHighlightTinter;
30+
31+
[SerializeField] UITinter m_JoinTabButtonTabBlockerTinter;
3032

3133
[SerializeField] UITinter m_HostTabButtonTinter;
3234

33-
[SerializeField] UITinter m_HostTabButtonBorderTinter;
35+
[SerializeField] UITinter m_HostTabButtonHighlightTinter;
36+
37+
[SerializeField] UITinter m_HostTabButtonTabBlockerTinter;
3438

3539
[SerializeField] GameObject m_SignInSpinner;
3640

@@ -135,19 +139,23 @@ public void ToggleJoinIPUI()
135139
m_IPJoiningUI.Show();
136140
m_IPHostingUI.Hide();
137141
m_JoinTabButtonTinter.SetToColor(1);
138-
m_JoinTabButtonBorderTinter.SetToColor(1);
142+
m_JoinTabButtonHighlightTinter.SetToColor(1);
143+
m_JoinTabButtonTabBlockerTinter.SetToColor(1);
139144
m_HostTabButtonTinter.SetToColor(0);
140-
m_HostTabButtonBorderTinter.SetToColor(0);
145+
m_HostTabButtonHighlightTinter.SetToColor(0);
146+
m_HostTabButtonTabBlockerTinter.SetToColor(0);
141147
}
142148

143149
public void ToggleCreateIPUI()
144150
{
145151
m_IPJoiningUI.Hide();
146152
m_IPHostingUI.Show();
147153
m_JoinTabButtonTinter.SetToColor(0);
148-
m_JoinTabButtonBorderTinter.SetToColor(0);
154+
m_JoinTabButtonHighlightTinter.SetToColor(0);
155+
m_JoinTabButtonTabBlockerTinter.SetToColor(0);
149156
m_HostTabButtonTinter.SetToColor(1);
150-
m_HostTabButtonBorderTinter.SetToColor(1);
157+
m_HostTabButtonHighlightTinter.SetToColor(1);
158+
m_HostTabButtonTabBlockerTinter.SetToColor(1);
151159
}
152160

153161
public void Show()

Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ public class LobbyUIMediator : MonoBehaviour
1515
[SerializeField] LobbyJoiningUI m_LobbyJoiningUI;
1616
[SerializeField] LobbyCreationUI m_LobbyCreationUI;
1717
[SerializeField] UITinter m_JoinToggle;
18-
[SerializeField] UITinter m_JoinToggleBorder;
18+
[SerializeField] UITinter m_JoinToggleHighlight;
19+
[SerializeField] UITinter m_JoinToggleTabBlocker;
1920
[SerializeField] UITinter m_CreateToggle;
20-
[SerializeField] UITinter m_CreateToggleBorder;
21+
[SerializeField] UITinter m_CreateToggleHighlight;
22+
[SerializeField] UITinter m_CreateToggleTabBlocker;
2123
[SerializeField] TextMeshProUGUI m_PlayerNameLabel;
2224
[SerializeField] GameObject m_LoadingSpinner;
2325

@@ -193,19 +195,23 @@ public void ToggleJoinLobbyUI()
193195
m_LobbyJoiningUI.Show();
194196
m_LobbyCreationUI.Hide();
195197
m_JoinToggle.SetToColor(1);
196-
m_JoinToggleBorder.SetToColor(1);
198+
m_JoinToggleHighlight.SetToColor(1);
199+
m_JoinToggleTabBlocker.SetToColor(1);
197200
m_CreateToggle.SetToColor(0);
198-
m_CreateToggleBorder.SetToColor(0);
201+
m_CreateToggleHighlight.SetToColor(0);
202+
m_CreateToggleTabBlocker.SetToColor(0);
199203
}
200204

201205
public void ToggleCreateLobbyUI()
202206
{
203207
m_LobbyJoiningUI.Hide();
204208
m_LobbyCreationUI.Show();
205209
m_JoinToggle.SetToColor(0);
206-
m_JoinToggleBorder.SetToColor(0);
210+
m_JoinToggleHighlight.SetToColor(0);
211+
m_JoinToggleTabBlocker.SetToColor(0);
207212
m_CreateToggle.SetToColor(1);
208-
m_CreateToggleBorder.SetToColor(1);
213+
m_CreateToggleHighlight.SetToColor(1);
214+
m_CreateToggleTabBlocker.SetToColor(1);
209215
}
210216

211217
public void RegenerateName()
Lines changed: 3 additions & 0 deletions
Loading

Assets/BossRoom/Textures/UI/ui_bg_gradient2.png.meta

Lines changed: 132 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Loading

Assets/BossRoom/Textures/UI/ui_blurred_square.png.meta

Lines changed: 132 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Textures/UI/ui_dialog.png.meta

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)