Skip to content

Commit f701e72

Browse files
Fix: More Lobby Visual Work (#544)
* More visual rework on our lobby ui, focusing on the tabs * Rehooked a broken ref, some more tweaking of the scale of everything, as well as adjusting settings so that the UI looks a little better at other aspect ratios besides 16:9 * Made the backgrounds for the Lobby and IP pop up a bit more transparent * Updated tab labels for IP window
1 parent 966b120 commit f701e72

File tree

10 files changed

+2317
-931
lines changed

10 files changed

+2317
-931
lines changed

Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Lines changed: 1486 additions & 724 deletions
Large diffs are not rendered by default.

Assets/BossRoom/Prefabs/UI/LobbyUI.prefab

Lines changed: 528 additions & 188 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:b934e17a1973dc7998d1d1bdfff5e424458b019f4584ced739718c1afad668b6
3-
size 81425
2+
oid sha256:6902954da5d6368d430ea4373fc5a42c9be98deaebbe313c3d279b0dbece098d
3+
size 78856

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

@@ -119,19 +123,23 @@ public void ToggleJoinIPUI()
119123
m_IPJoiningUI.Show();
120124
m_IPHostingUI.Hide();
121125
m_JoinTabButtonTinter.SetToColor(1);
122-
m_JoinTabButtonBorderTinter.SetToColor(1);
126+
m_JoinTabButtonHighlightTinter.SetToColor(1);
127+
m_JoinTabButtonTabBlockerTinter.SetToColor(1);
123128
m_HostTabButtonTinter.SetToColor(0);
124-
m_HostTabButtonBorderTinter.SetToColor(0);
129+
m_HostTabButtonHighlightTinter.SetToColor(0);
130+
m_HostTabButtonTabBlockerTinter.SetToColor(0);
125131
}
126132

127133
public void ToggleCreateIPUI()
128134
{
129135
m_IPJoiningUI.Hide();
130136
m_IPHostingUI.Show();
131137
m_JoinTabButtonTinter.SetToColor(0);
132-
m_JoinTabButtonBorderTinter.SetToColor(0);
138+
m_JoinTabButtonHighlightTinter.SetToColor(0);
139+
m_JoinTabButtonTabBlockerTinter.SetToColor(0);
133140
m_HostTabButtonTinter.SetToColor(1);
134-
m_HostTabButtonBorderTinter.SetToColor(1);
141+
m_HostTabButtonHighlightTinter.SetToColor(1);
142+
m_HostTabButtonTabBlockerTinter.SetToColor(1);
135143
}
136144

137145
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)