From 98faaf22904488f6663a244defbda8519d065ac8 Mon Sep 17 00:00:00 2001 From: Anthony Berg Date: Mon, 30 Nov 2020 23:49:57 +0000 Subject: [PATCH] Created a link to the play menu from the main menu --- .idea/.idea.Monopoly/.idea/indexLayout.xml | 3 ++- Assets/Scenes/menu.unity | 2 ++ Assets/Scripts/menu/MainMenu.cs | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.idea/.idea.Monopoly/.idea/indexLayout.xml b/.idea/.idea.Monopoly/.idea/indexLayout.xml index 39c9d21..6bb84a2 100644 --- a/.idea/.idea.Monopoly/.idea/indexLayout.xml +++ b/.idea/.idea.Monopoly/.idea/indexLayout.xml @@ -9,7 +9,7 @@ Library/PackageCache/com.unity.ide.visualstudio@2.0.3 Library/PackageCache/com.unity.ide.vscode@1.2.3 Library/PackageCache/com.unity.test-framework@1.1.18 - Library/PackageCache/com.unity.textmeshpro@3.0.1 + Library/PackageCache/com.unity.textmeshpro@3.0.3 Library/PackageCache/com.unity.timeline@1.3.4 Packages ProjectSettings @@ -20,6 +20,7 @@ .vs Library Logs + Temp UserSettings obj diff --git a/Assets/Scenes/menu.unity b/Assets/Scenes/menu.unity index 7720ee0..cd8b3ef 100644 --- a/Assets/Scenes/menu.unity +++ b/Assets/Scenes/menu.unity @@ -362,6 +362,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PlayButton: {fileID: 710092055} + MainMenuUI: {fileID: 409713701} + PlayUI: {fileID: 820348871} --- !u!1 &514864490 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/menu/MainMenu.cs b/Assets/Scripts/menu/MainMenu.cs index 0b1e62d..658939c 100644 --- a/Assets/Scripts/menu/MainMenu.cs +++ b/Assets/Scripts/menu/MainMenu.cs @@ -7,10 +7,13 @@ public class MainMenu : MonoBehaviour { public Button PlayButton; //Imports the play button + public GameObject MainMenuUI; + public GameObject PlayUI; private string existingProperties; //The variable for the properties private string existingCards; void Start() { + PlayButton.onClick.AddListener(OpenPlayMenu); Debug.Log("User ID: " + UserManager.userID); Debug.Log("Username: " + UserManager.username); if (!PropertiesHandler.CheckPropertyExists()) //Checks if the properties file doesn't exist. @@ -46,6 +49,12 @@ public class MainMenu : MonoBehaviour } } + public void OpenPlayMenu() + { + MainMenuUI.SetActive(false); + PlayUI.SetActive(true); + } + public void QuitGame() { Debug.Log("QUIT!");