Meta Data Being Wonky

4 years ago · 3bef4a7d1a
parent 062fcad4ac
commit 3bef4a7d1a
4 changed files with 16 additions and 2 deletions
--- a/MuseumGame/Assets/Prefabs/Player.prefab
+++ b/MuseumGame/Assets/Prefabs/Player.prefab
@ -122,7 +122,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  currentHealth: 0
  maxHealth: 100
-  healthBar: {fileID: 0}
+  healthBar: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
 --- !u!70 &3275569032751403274
 CapsuleCollider2D:
  m_ObjectHideFlags: 0
@ -192,4 +192,3 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_FallSpeed: 0.7
-  IsGliding: 0
--- a/MuseumGame/Assets/Sprites/Artwork
+++ b/MuseumGame/Assets/Sprites/Artwork
@ -1,4 +1,5 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: db04a197a226a47ba9b42ebe509b9f96
 folderAsset: yes
 DefaultImporter:
@ -9,6 +10,9 @@ DefaultImporter:

 fileFormatVersion: 2
 guid: b9f05f68408029e44abb3dcf14c4840c
+=======
+guid: 9cf631f4654250d4588fc170abdb60cc
+>>>>>>> Stashed changes
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/MuseumGame/Assets/Sprites/Artwork
+++ b/MuseumGame/Assets/Sprites/Artwork
@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 8c794bcd8f91ebb4ba8d767157be86d3
+=======
+guid: 079f0c3255811a44b8f9fdd4e1d7780f
+>>>>>>> Stashed changes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/MuseumGame/Assets/Sprites/Artwork
+++ b/MuseumGame/Assets/Sprites/Artwork
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 005ebe5dc46de74478a07b37c0495f07
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: