From 60cb1c814ab75d6a65db1d2cc28c30a7b1082846 Mon Sep 17 00:00:00 2001 From: Anthony Date: Tue, 24 Nov 2020 18:35:01 +0000 Subject: [PATCH] Starting new play menu --- .idea/.idea.Monopoly/.idea/indexLayout.xml | 7 ++-- Assets/Scenes/menu.unity | 47 ++++++++++++---------- Assets/Scripts/GameSettings.cs | 7 ++++ Assets/Scripts/GameSettings.cs.meta | 11 +++++ Assets/Scripts/login/UserManager.cs | 1 - Assets/Scripts/menu/LevelLoader.cs | 4 +- 6 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 Assets/Scripts/GameSettings.cs create mode 100644 Assets/Scripts/GameSettings.cs.meta diff --git a/.idea/.idea.Monopoly/.idea/indexLayout.xml b/.idea/.idea.Monopoly/.idea/indexLayout.xml index 5dd61ff..c25d7b8 100644 --- a/.idea/.idea.Monopoly/.idea/indexLayout.xml +++ b/.idea/.idea.Monopoly/.idea/indexLayout.xml @@ -3,12 +3,13 @@ + Assets Library/PackageCache/com.unity.collab-proxy@1.3.9 Library/PackageCache/com.unity.ext.nunit@1.0.0 Library/PackageCache/com.unity.ide.rider@1.2.1 - Library/PackageCache/com.unity.ide.visualstudio@2.0.2 - Library/PackageCache/com.unity.ide.vscode@1.2.1 - Library/PackageCache/com.unity.test-framework@1.1.16 + 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.timeline@1.3.4 Packages diff --git a/Assets/Scenes/menu.unity b/Assets/Scenes/menu.unity index 43cfb90..8364460 100644 --- a/Assets/Scenes/menu.unity +++ b/Assets/Scenes/menu.unity @@ -155,11 +155,11 @@ RectTransform: m_Father: {fileID: 820348872} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -430.5, y: 253} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &239567295 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3031,11 +3031,11 @@ RectTransform: m_Father: {fileID: 820348872} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -450.5, y: 203} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.5, y: -50} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &1814574228 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3200,6 +3200,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 89cbcb58c8de8f14baaea829e70e2cb7, type: 3} m_Name: m_EditorClassIdentifier: + playersInput: {fileID: 0} loadingScreen: {fileID: 821978300} slider: {fileID: 952453483} --- !u!4 &1824002929 @@ -3805,6 +3806,7 @@ GameObject: - component: {fileID: 2129375866} - component: {fileID: 2129375865} - component: {fileID: 2129375864} + - component: {fileID: 2129375867} m_Layer: 5 m_Name: PlayButton m_TagString: Untagged @@ -3874,19 +3876,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2129375865} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1824002928} - m_TargetAssemblyTypeName: - m_MethodName: LoadLevel - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: monopoly - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &2129375865 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3925,6 +3915,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129375862} m_CullTransparentMesh: 0 +--- !u!114 &2129375867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129375862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89cbcb58c8de8f14baaea829e70e2cb7, type: 3} + m_Name: + m_EditorClassIdentifier: + playersInput: {fileID: 0} + loadingScreen: {fileID: 0} + slider: {fileID: 0} --- !u!1 &2143598660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameSettings.cs b/Assets/Scripts/GameSettings.cs new file mode 100644 index 0000000..1dde0d7 --- /dev/null +++ b/Assets/Scripts/GameSettings.cs @@ -0,0 +1,7 @@ +using System.Collections; +using System.Collections.Generic; + +public static class GameSettings +{ + public static int players; +} diff --git a/Assets/Scripts/GameSettings.cs.meta b/Assets/Scripts/GameSettings.cs.meta new file mode 100644 index 0000000..ec23ede --- /dev/null +++ b/Assets/Scripts/GameSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f148b73ca47a09e41937504b91d18c47 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/login/UserManager.cs b/Assets/Scripts/login/UserManager.cs index 50376d3..c0319ae 100644 --- a/Assets/Scripts/login/UserManager.cs +++ b/Assets/Scripts/login/UserManager.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using UnityEngine; public static class UserManager { diff --git a/Assets/Scripts/menu/LevelLoader.cs b/Assets/Scripts/menu/LevelLoader.cs index 0f7672f..aeb6eb1 100644 --- a/Assets/Scripts/menu/LevelLoader.cs +++ b/Assets/Scripts/menu/LevelLoader.cs @@ -4,10 +4,12 @@ using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.Networking; using UnityEngine.UI; +using TMPro; public class LevelLoader : MonoBehaviour { - + + public TMP_InputField playersInput; //This is for how many players the user has selected. public GameObject loadingScreen; //Gets the loading screen public Slider slider; //Gets the slider