From bc8af46d32b4a3a50c467044b850f2abaddf5204 Mon Sep 17 00:00:00 2001 From: AgataFrancik Date: Fri, 17 Jun 2022 11:17:49 +0200 Subject: [PATCH] Add Quit button --- Assets/Scenes/MainMenu.unity | 127 +++++++------------------- UserSettings/EditorUserSettings.asset | 28 +----- 2 files changed, 36 insertions(+), 119 deletions(-) diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 1fa6714..73aee8b 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -123,9 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} - --- !u!1 &38748998 - GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -138,33 +136,29 @@ GameObject: - component: {fileID: 38749000} m_Layer: 5 m_Name: Text (TMP) - m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 - --- !u!224 &38748999 - RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 38748998} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1242084697} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -9.5971, y: 21.106} + m_SizeDelta: {x: 287.769, y: 82.286} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &38749000 MonoBehaviour: @@ -766,33 +760,26 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 431990161} - - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 669483621} m_Father: {fileID: 1050280001} - m_RootOrder: 2 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: -1.8620316, y: -341} - m_SizeDelta: {x: 306.963, y: 124.499} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &431990163 - MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 431990161} - m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -807,12 +794,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - - m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.9339623, g: 0.9286757, b: 0.9286757, a: 0.24313726} - m_PressedColor: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 0.47058824} - m_SelectedColor: {r: 0.9811321, g: 0.9811321, b: 0.9811321, a: 1} - + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -828,62 +813,32 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - - m_TargetGraphic: {fileID: 431990164} + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1736099727} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 1050280000} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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 + m_Calls: [] --- !u!114 &431990164 - MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 431990161} - m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - - m_Color: {r: 0, g: 0, b: 0, a: 1} - + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -892,15 +847,12 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 - --- !u!222 &431990165 - CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 431990161} m_CullTransparentMesh: 1 --- !u!1 &594417362 @@ -939,7 +891,6 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} - --- !u!1 &597391816 GameObject: m_ObjectHideFlags: 0 @@ -2442,8 +2393,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startButton: {fileID: 950491910} + roomButton: {fileID: 0} loadSceneEvent: {fileID: 11400000, guid: 120889961fbb66a438cf38009c17b0e7, type: 2} RaceTrackScene: {fileID: 11400000, guid: 4a5f016c1d4aa8e449fee3aa25e5a50f, type: 2} + JoinRoomScene: {fileID: 0} --- !u!1 &1399781288 GameObject: m_ObjectHideFlags: 0 @@ -3489,7 +3442,7 @@ RectTransform: m_Children: - {fileID: 1209256344} m_Father: {fileID: 1884714209} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3579,7 +3532,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1884714209} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -3700,9 +3653,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1807255864} m_CullTransparentMesh: 1 - --- !u!1 &1859197189 - GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3738,10 +3689,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: -1.8620316, y: -341} - m_SizeDelta: {x: 306.963, y: 124.499} - + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1859197191 MonoBehaviour: @@ -3877,18 +3826,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - + - {fileID: 1686813655} - {fileID: 1796446988} - {fileID: 1953218676} - - {fileID: 1686813655} m_Father: {fileID: 1301893463} m_RootOrder: 4 - 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: 5.609, y: 72} - m_SizeDelta: {x: 414.94, y: 40} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1884714210 MonoBehaviour: @@ -3902,7 +3849,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -3931,9 +3877,9 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1209256345} - m_FillRect: {fileID: 1329303334} - m_HandleRect: {fileID: 1209256344} + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 m_MaxValue: 1 @@ -3943,7 +3889,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] --- !u!1 &1891572769 - GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3967,22 +3912,20 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1891572769} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1301893463} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.8630066, y: -273} - m_SizeDelta: {x: -79.851, y: -283.13} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1891572771 - MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4108,7 +4051,7 @@ RectTransform: m_Children: - {fileID: 1329303334} m_Father: {fileID: 1884714209} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index a4673de..50992e1 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,37 +12,11 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6a39580216233831 flags: 0 RecentlyUsedScenePath-2: - - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6f1504041139382d28241e2a183de7ae2136ebf32f - flags: 0 - RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c751f1f192a25232568252320092a flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c681813121439082d2b3f6d785326ece92021 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c6d1115122c382d2b2d61633c133af6f9 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c72051a03113a20293f353f0d183eedae2136ebf32f - flags: 0 - RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-9: - - value: 22424703114646680e0b0227036c6c1313191d03222132392c251429e7f27a2decee22f0 - flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 - vcSharedLogLevel: - value: 0d5e400f0650 - flags: 0 m_VCAutomaticAdd: 1 m_VCDebugCom: 0 m_VCDebugCmd: 0