Hopefully fixed what the merge messed up

5 years ago · d7759b9489
parent 2c20b06aa6
commit d7759b9489
4 changed files with 18 additions and 2 deletions
--- a/MuseumGame/Assets/Scenes/DemoLevels/Spike
+++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 297cf2de6c239934ba985a97912b24c4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed
+++ b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d09540dbafa36436c910a9a2fbf9c191
-PrefabImporter:
+guid: 602763653dee1c94f86c93c46a01efac
+DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated
+++ b/MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce6abb1e102545240939a18c71a13801
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MuseumGame/ProjectSettings/TagManager.asset
+++ b/MuseumGame/ProjectSettings/TagManager.asset
@ -5,6 +5,7 @@ TagManager:
  serializedVersion: 2
  tags:
  - EnemyProjectile
+  - Platform
  layers:
  - Default
  - TransparentFX