From a2ac6150466d68f2c04e740c4c468a30d1bad58b Mon Sep 17 00:00:00 2001 From: Colin Girault <colin.girault@etu.unistra.fr> Date: Wed, 15 Dec 2021 18:39:08 +0100 Subject: [PATCH] SUite_Ui --- T3-Unity/Assets/Scenes/Main_Menu.unity | 13 ++++++++++ T3-Unity/Assets/Scenes/ui.unity | 26 +++++++++++++++----- T3-Unity/Assets/Scripts/ExitScene.cs | 12 +++++++++ T3-Unity/Assets/Scripts/ExitScene.cs.meta | 11 +++++++++ T3-Unity/Assets/Scripts/MenuToggle.cs | 8 +++++- T3-Unity/Assets/Scripts/SceneChanger.cs | 14 +++++++++++ T3-Unity/Assets/Scripts/SceneChanger.cs.meta | 11 +++++++++ 7 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 T3-Unity/Assets/Scripts/ExitScene.cs create mode 100644 T3-Unity/Assets/Scripts/ExitScene.cs.meta create mode 100644 T3-Unity/Assets/Scripts/SceneChanger.cs create mode 100644 T3-Unity/Assets/Scripts/SceneChanger.cs.meta diff --git a/T3-Unity/Assets/Scenes/Main_Menu.unity b/T3-Unity/Assets/Scenes/Main_Menu.unity index 1e6600d..d1bf623 100644 --- a/T3-Unity/Assets/Scenes/Main_Menu.unity +++ b/T3-Unity/Assets/Scenes/Main_Menu.unity @@ -1278,6 +1278,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2049136973} + - component: {fileID: 2049136974} - component: {fileID: 2049136972} m_Layer: 5 m_Name: SceneChanger @@ -1317,3 +1318,15 @@ RectTransform: m_AnchoredPosition: {x: 458, y: 174.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2049136974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049136971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7edb75851d32e34d95d4cab1584002c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/T3-Unity/Assets/Scenes/ui.unity b/T3-Unity/Assets/Scenes/ui.unity index 3d2aad0..d33ee88 100644 --- a/T3-Unity/Assets/Scenes/ui.unity +++ b/T3-Unity/Assets/Scenes/ui.unity @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 31888323} - component: {fileID: 31888322} m_Layer: 5 - m_Name: Button (1) + m_Name: ButtonAppear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -148,8 +148,8 @@ RectTransform: 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: 0, y: -60} - m_SizeDelta: {x: 160, y: 53.64884} + m_AnchoredPosition: {x: -0.000015259, y: -43} + m_SizeDelta: {x: 254.77808, y: 128.67554} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &31888322 MonoBehaviour: @@ -202,6 +202,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 976072095} + m_MethodName: changeButtonsProperty + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &31888323 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1409,6 +1420,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Canvas: {fileID: 1135662969} + Button: {fileID: 31888320} --- !u!4 &976072096 Transform: m_ObjectHideFlags: 0 @@ -2344,7 +2356,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button + m_text: 'Appear + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2413,9 +2427,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 1834486501} - characterCount: 6 + characterCount: 7 spriteCount: 0 - spaceCount: 0 + spaceCount: 1 wordCount: 1 linkCount: 0 lineCount: 1 diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs b/T3-Unity/Assets/Scripts/ExitScene.cs new file mode 100644 index 0000000..8592fe0 --- /dev/null +++ b/T3-Unity/Assets/Scripts/ExitScene.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExitScene : MonoBehaviour +{ + // Start is called before the first frame update + public void Exit() + { + Application.Quit(); + } +} diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs.meta b/T3-Unity/Assets/Scripts/ExitScene.cs.meta new file mode 100644 index 0000000..36bd6b1 --- /dev/null +++ b/T3-Unity/Assets/Scripts/ExitScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a7edb75851d32e34d95d4cab1584002c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Scripts/MenuToggle.cs b/T3-Unity/Assets/Scripts/MenuToggle.cs index 865891d..f8402db 100644 --- a/T3-Unity/Assets/Scripts/MenuToggle.cs +++ b/T3-Unity/Assets/Scripts/MenuToggle.cs @@ -8,6 +8,7 @@ public class MenuToggle : MonoBehaviour { public GameObject Canvas; + public GameObject Button; void Start() { Canvas.gameObject.SetActive(false); @@ -16,6 +17,11 @@ public class MenuToggle : MonoBehaviour { Canvas.gameObject.SetActive(true); } - + + public void changeButtonsProperty() + { + Button.gameObject.SetActive(false); + } + } diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs b/T3-Unity/Assets/Scripts/SceneChanger.cs new file mode 100644 index 0000000..0631614 --- /dev/null +++ b/T3-Unity/Assets/Scripts/SceneChanger.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneChanger : MonoBehaviour +{ + public void LoadScene(string sceneName) + { + + SceneManager.LoadScene(sceneName); + } + +} diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs.meta b/T3-Unity/Assets/Scripts/SceneChanger.cs.meta new file mode 100644 index 0000000..32e0899 --- /dev/null +++ b/T3-Unity/Assets/Scripts/SceneChanger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d275982db560c1a49843462e3730a0e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- GitLab