From 7a34b33113a3744b0af1bed6d42f9328a578c4b7 Mon Sep 17 00:00:00 2001 From: KeyKoder Date: Tue, 17 Nov 2020 19:41:28 +0100 Subject: [PATCH] Add Lobby selection to menu --- unity/Assets/Scripts/MainMenuController.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/unity/Assets/Scripts/MainMenuController.cs b/unity/Assets/Scripts/MainMenuController.cs index 5828263..f77a1c5 100644 --- a/unity/Assets/Scripts/MainMenuController.cs +++ b/unity/Assets/Scripts/MainMenuController.cs @@ -136,7 +136,7 @@ public class MainMenuController : MonoBehaviour { if (conn != null) { var lobby = conn.GetLobby(); if (lobby != null) { - //conn.LeaveLobby(); + conn.LeaveLobby(); mainMenu.SetActive(false); serverMenu.SetActive(true); lobbyMenu.SetActive(false); @@ -154,15 +154,17 @@ public class MainMenuController : MonoBehaviour { var conn = Client.GetConnection(); if(conn != null) { foreach(string lobby in conn.GetPublicLobbies()) { - Debug.Log(lobby); + var lobbyGO = Instantiate(serverScroll.transform.GetChild(0), serverScroll.transform); + lobbyGO.GetComponentInChildren().text = lobby; + lobbyGO.gameObject.SetActive(true); } // conn.Close(); } - for (int i = 0; i < Random.Range(2, 15); i++) { - var lobby = Instantiate(serverScroll.transform.GetChild(0), serverScroll.transform); - lobby.GetComponentInChildren().text = "LBY" + Random.Range(0, 10) + Random.Range(0, 10) + Random.Range(0, 10); - lobby.gameObject.SetActive(true); - } + //for (int i = 0; i < Random.Range(2, 15); i++) { + // var lobby = Instantiate(serverScroll.transform.GetChild(0), serverScroll.transform); + // lobby.GetComponentInChildren().text = "LBY" + Random.Range(0, 10) + Random.Range(0, 10) + Random.Range(0, 10); + // lobby.gameObject.SetActive(true); + //} serverName.text = Client.GetConnection().Name(); serverMenu.GetComponentInChildren().Reload(); }