From dfed2cc0e43a63271157a75fb9d4f1610288c07e Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 4 Mar 2023 04:08:28 +1100 Subject: [PATCH] Add pause menu and fix static data dulpication when loading scenes --- Assets/Scenes/MainMenuScene.unity | 44 +++++++++++++++++++++++++++ UserSettings/EditorUserSettings.asset | 4 +-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/MainMenuScene.unity b/Assets/Scenes/MainMenuScene.unity index 8c73fcf..812f4fc 100644 --- a/Assets/Scenes/MainMenuScene.unity +++ b/Assets/Scenes/MainMenuScene.unity @@ -650,6 +650,50 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1207270340} m_PrefabAsset: {fileID: 0} +--- !u!1 &763767013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 763767015} + - component: {fileID: 763767014} + m_Layer: 0 + m_Name: ResetStaticDataManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &763767014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763767013} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab00a0befbfe39c4b83c3eac30dc82d8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &763767015 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 763767013} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &871174887 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f34dec3..310bb8e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 5355030455530b0f0b5d5d7143730c44404e4a737f2c2560787d4862e7b16d6a flags: 0 RecentlyUsedSceneGuid-1: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 0605505051025f0c54590e71437a0744414f4e732f712235757c4b6ab7b1323d flags: 0 RecentlyUsedSceneGuid-2: - value: 0605505051025f0c54590e71437a0744414f4e732f712235757c4b6ab7b1323d + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7