From e92af9ffa3392fb527e4ccea789b0ef6dd2feb36 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Thu, 15 Apr 2021 15:27:47 -0500 Subject: [PATCH] fixed something that messed up --- MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity | 2 +- .../Assets/Sprites/Artwork Sprites.meta~HEAD.meta | 7 +++++++ .../Assets/Sprites/Artwork Sprites.meta~main.meta | 15 --------------- 3 files changed, 8 insertions(+), 16 deletions(-) create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta delete mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 5f65e9b..da1b9ff 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -2054,7 +2054,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: fd1491541d871d84284b16d6c036ec00, type: 3} + m_Sprite: {fileID: 21300000, guid: 7947595c5ebf72648aab3049c3c7f7bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta new file mode 100644 index 0000000..7c50ed5 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c794bcd8f91ebb4ba8d767157be86d3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta deleted file mode 100644 index a849c03..0000000 --- a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: d22892c17a6a249e3a27ea6dd48b04ab -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: - -fileFormatVersion: 2 -guid: dd6bddc55b7f7fe42946cbeddbad8150 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: