From 5070423ea086934ae6a4d012324ab94a0f532254 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Sun, 2 May 2021 15:13:06 -0500 Subject: [PATCH] re-applied a couple things --- MuseumGame/Assets/Scenes/Museum/Museum.unity | 66 ++----------------- MuseumGame/Assets/Scripts/GameManager.cs | 2 +- .../UserSettings/EditorUserSettings.asset | 10 +-- 3 files changed, 7 insertions(+), 71 deletions(-) diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 380f232..a670690 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -123,52 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &2613657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2613659} - - component: {fileID: 2613658} - m_Layer: 0 - m_Name: Artwork - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2613658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2613657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca8106578153b4c4cb86229f1b0c975f, type: 3} - m_Name: - m_EditorClassIdentifier: - artId: 0 - artworkToEnable: {fileID: 1783916102} ---- !u!4 &2613659 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2613657} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 83.236404, y: 2.2672524, z: -32.17468} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1783916103} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &73552633 GameObject: m_ObjectHideFlags: 0 @@ -17813,11 +17767,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2613659} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalScale.x @@ -17829,15 +17783,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.x - value: -77.486404 + value: 5.75 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.y - value: -4.0172524 + value: -1.75 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.z - value: 33.17468 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalRotation.w @@ -17877,16 +17831,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} ---- !u!1 &1783916102 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - m_PrefabInstance: {fileID: 1783916101} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1783916103 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - m_PrefabInstance: {fileID: 1783916101} - m_PrefabAsset: {fileID: 0} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index dd39454..35abb1c 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -201,7 +201,7 @@ public class GameManager : MonoBehaviour disableAllPowerups(); player.SetActive(true); LoadLevel(sceneToLoad, positionToLoad); - title.GetComponent().text = "Paused"; + title.GetComponent().text = "Menu"; startButton.transform.Find("Text").GetComponent().text = "Restart"; diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 967b1c0..f150ee7 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -7,35 +7,27 @@ EditorUserSettings: m_ConfigSettings: RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb