Skip to content

Cherrypick: More Lobby UI Visual Work #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,210 changes: 1,486 additions & 724 deletions Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Large diffs are not rendered by default.

716 changes: 528 additions & 188 deletions Assets/BossRoom/Prefabs/UI/LobbyUI.prefab

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/MainMenu.unity
Git LFS file not shown
20 changes: 14 additions & 6 deletions Assets/BossRoom/Scripts/Client/UI/IPUIMediator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ public class IPUIMediator : MonoBehaviour

[SerializeField] UITinter m_JoinTabButtonTinter;

[SerializeField] UITinter m_JoinTabButtonBorderTinter;
[SerializeField] UITinter m_JoinTabButtonHighlightTinter;

[SerializeField] UITinter m_JoinTabButtonTabBlockerTinter;

[SerializeField] UITinter m_HostTabButtonTinter;

[SerializeField] UITinter m_HostTabButtonBorderTinter;
[SerializeField] UITinter m_HostTabButtonHighlightTinter;

[SerializeField] UITinter m_HostTabButtonTabBlockerTinter;

[SerializeField] GameObject m_SignInSpinner;

Expand Down Expand Up @@ -119,19 +123,23 @@ public void ToggleJoinIPUI()
m_IPJoiningUI.Show();
m_IPHostingUI.Hide();
m_JoinTabButtonTinter.SetToColor(1);
m_JoinTabButtonBorderTinter.SetToColor(1);
m_JoinTabButtonHighlightTinter.SetToColor(1);
m_JoinTabButtonTabBlockerTinter.SetToColor(1);
m_HostTabButtonTinter.SetToColor(0);
m_HostTabButtonBorderTinter.SetToColor(0);
m_HostTabButtonHighlightTinter.SetToColor(0);
m_HostTabButtonTabBlockerTinter.SetToColor(0);
}

public void ToggleCreateIPUI()
{
m_IPJoiningUI.Hide();
m_IPHostingUI.Show();
m_JoinTabButtonTinter.SetToColor(0);
m_JoinTabButtonBorderTinter.SetToColor(0);
m_JoinTabButtonHighlightTinter.SetToColor(0);
m_JoinTabButtonTabBlockerTinter.SetToColor(0);
m_HostTabButtonTinter.SetToColor(1);
m_HostTabButtonBorderTinter.SetToColor(1);
m_HostTabButtonHighlightTinter.SetToColor(1);
m_HostTabButtonTabBlockerTinter.SetToColor(1);
}

public void Show()
Expand Down
18 changes: 12 additions & 6 deletions Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ public class LobbyUIMediator : MonoBehaviour
[SerializeField] LobbyJoiningUI m_LobbyJoiningUI;
[SerializeField] LobbyCreationUI m_LobbyCreationUI;
[SerializeField] UITinter m_JoinToggle;
[SerializeField] UITinter m_JoinToggleBorder;
[SerializeField] UITinter m_JoinToggleHighlight;
[SerializeField] UITinter m_JoinToggleTabBlocker;
[SerializeField] UITinter m_CreateToggle;
[SerializeField] UITinter m_CreateToggleBorder;
[SerializeField] UITinter m_CreateToggleHighlight;
[SerializeField] UITinter m_CreateToggleTabBlocker;
[SerializeField] TextMeshProUGUI m_PlayerNameLabel;
[SerializeField] GameObject m_LoadingSpinner;

Expand Down Expand Up @@ -193,19 +195,23 @@ public void ToggleJoinLobbyUI()
m_LobbyJoiningUI.Show();
m_LobbyCreationUI.Hide();
m_JoinToggle.SetToColor(1);
m_JoinToggleBorder.SetToColor(1);
m_JoinToggleHighlight.SetToColor(1);
m_JoinToggleTabBlocker.SetToColor(1);
m_CreateToggle.SetToColor(0);
m_CreateToggleBorder.SetToColor(0);
m_CreateToggleHighlight.SetToColor(0);
m_CreateToggleTabBlocker.SetToColor(0);
}

public void ToggleCreateLobbyUI()
{
m_LobbyJoiningUI.Hide();
m_LobbyCreationUI.Show();
m_JoinToggle.SetToColor(0);
m_JoinToggleBorder.SetToColor(0);
m_JoinToggleHighlight.SetToColor(0);
m_JoinToggleTabBlocker.SetToColor(0);
m_CreateToggle.SetToColor(1);
m_CreateToggleBorder.SetToColor(1);
m_CreateToggleHighlight.SetToColor(1);
m_CreateToggleTabBlocker.SetToColor(1);
}

public void RegenerateName()
Expand Down
3 changes: 3 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_bg_gradient2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
132 changes: 132 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_bg_gradient2.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_blurred_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
132 changes: 132 additions & 0 deletions Assets/BossRoom/Textures/UI/ui_blurred_square.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Assets/BossRoom/Textures/UI/ui_dialog.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.