From 56799ba33dfd70b4b5fe7f5de9d5f44e0dd724ec Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Tue, 4 May 2021 19:55:45 -0500 Subject: [PATCH] fixed some things --- MuseumGame/Assets/Scenes/MainMenu.unity | 4 ++-- MuseumGame/Assets/Scenes/MainMenu.unity.meta | 7 +++++++ .../Assets/Scenes/Winter/WinterThree.unity | 4 ++-- .../ProjectSettings/EditorBuildSettings.asset | 6 +++--- .../UserSettings/EditorUserSettings.asset | 18 ++++-------------- 5 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 MuseumGame/Assets/Scenes/MainMenu.unity.meta diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 138c5b3..73b6122 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -4000,8 +4000,8 @@ MonoBehaviour: shrinkPowerupButton: {fileID: 974869911} otherPowerupButton: {fileID: 847247611} powerupText: {fileID: 829770868} - sceneToLoad: DogTunnel - positionToLoad: {x: 15.422754, y: -3.08, z: 0} + sceneToLoad: WinterOne + positionToLoad: {x: -7, y: -2, z: 0} music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} - {fileID: 8300000, guid: 327636dbdcb895b478ac95086f383d8a, type: 3} diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity.meta b/MuseumGame/Assets/Scenes/MainMenu.unity.meta new file mode 100644 index 0000000..eb0cf07 --- /dev/null +++ b/MuseumGame/Assets/Scenes/MainMenu.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7300d731d3c70594eb82aad6d248fbdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Scenes/Winter/WinterThree.unity b/MuseumGame/Assets/Scenes/Winter/WinterThree.unity index e673fe5..edeb809 100644 --- a/MuseumGame/Assets/Scenes/Winter/WinterThree.unity +++ b/MuseumGame/Assets/Scenes/Winter/WinterThree.unity @@ -3966,8 +3966,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} m_Name: m_EditorClassIdentifier: - LevelName: - whereTo: {x: 0, y: 0, z: 0} + LevelName: WinterFour + whereTo: {x: -6, y: -2, z: 0} --- !u!19719996 &814577414 TilemapCollider2D: m_ObjectHideFlags: 0 diff --git a/MuseumGame/ProjectSettings/EditorBuildSettings.asset b/MuseumGame/ProjectSettings/EditorBuildSettings.asset index 1f134a8..ce76fe9 100644 --- a/MuseumGame/ProjectSettings/EditorBuildSettings.asset +++ b/MuseumGame/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/MainMenu.unity - guid: 0d91fd8700663154b83fa475b7aea9ef + - enabled: 0 + path: + guid: 00000000000000000000000000000000 - enabled: 1 path: Assets/Scenes/DemoLevels/Spawn.unity guid: eaf2cb5b0460c45979b9dbd52915e53e diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index c9f8b67..a8c6a70 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -7,43 +7,33 @@ EditorUserSettings: m_ConfigSettings: RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 - value: 22424703114646680e0b0227036c7b1f113b1d3c29246903253b143de9d03b2fe7f523f9a92f31352d1b flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f1cece57a2decee22f0 - value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07f5ef7a2decee22f0 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a - value: 22424703114646680e0b0227036c7b1f113b1d3c29246904221a1521ebee3f08edf033fbf22a7129370bfb25 + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f11edf32776f7e93ffdfe flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07eaf2313dacf238e0f323 - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f15edf52676f7e93ffdfe flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f15edf52676f7e93ffdfe - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323 + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f11edf32776f7e93ffdfe - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c681918031d38631f2f3e392c0f07eaf2313dacf238e0f323 flags: 0 vcSharedLogLevel: value: 0d5e400f0650