removed art from museum

5 years ago · 24eef1d260
parent c5c4231321
commit 24eef1d260
2 changed files with 6 additions and 120 deletions
--- a/MuseumGame/Assets/Scenes/Museum/Museum.unity
+++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity
@ -11713,7 +11713,7 @@ Tilemap:
    second:
      serializedVersion: 2
      m_TileIndex: 14
-      m_TileSpriteIndex: 14
+      m_TileSpriteIndex: 15
      m_TileMatrixIndex: 0
      m_TileColorIndex: 0
      m_TileObjectToInstantiateIndex: 65535
@ -14452,10 +14452,10 @@ Tilemap:
    m_Data: {fileID: -4930461731810238109, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3}
  - m_RefCount: 127
    m_Data: {fileID: -7847537291072819841, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3}
-  - m_RefCount: 1
-    m_Data: {fileID: 8365424865505523174, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3}
  - m_RefCount: 0
    m_Data: {fileID: 0}
+  - m_RefCount: 1
+    m_Data: {fileID: 8365424865505523174, guid: 152b7c935bbb7bf48ac0fb2e9e9e197c, type: 3}
  m_TileMatrixArray:
  - m_RefCount: 1358
    m_Data:
@ -15223,7 +15223,7 @@ Transform:
  - {fileID: 1620187171}
  - {fileID: 602065595}
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &838624618
 GameObject:
@ -477704,117 +477704,3 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
--- !u!1001 &247571770440168743
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5.6
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.75
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8843438201003174076, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
-      propertyPath: m_Name
-      value: Scarecrow
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
--- !u!1001 &7635576743063053407
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 592821566632945315, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_Name
-      value: DoubleJump art
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 15.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.75
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@ -30,10 +30,10 @@ EditorUserSettings:
      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
      flags: 0
    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
+      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
      flags: 0
    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650