From e4f5dfda53b925609d08aa75d1eb6e9554eb69e7 Mon Sep 17 00:00:00 2001 From: Ivy Date: Wed, 21 Apr 2021 18:46:26 -0500 Subject: [PATCH] Cleaned up platforms in tower, changed to one way platforms --- MuseumGame/Assets/Prefabs/Player.prefab | 4 +- .../Assets/Scenes/DemoLevels/Spawn.unity | 2 +- .../Assets/Scenes/DemoLevels/Tower.unity | 648 +++++++++++------- .../UserSettings/EditorUserSettings.asset | 3 + 4 files changed, 388 insertions(+), 269 deletions(-) diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index 6d8722a..7f1c060 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -140,8 +140,8 @@ CapsuleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.06668711, y: 0.15004826} - m_Size: {x: 4.88177, y: 11.650097} + m_Offset: {x: 0, y: 0} + m_Size: {x: 1.28, y: 1.28} m_Direction: 0 --- !u!50 &4572441351392969366 Rigidbody2D: diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 914b29c..5b51c37 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -2322,7 +2322,7 @@ MonoBehaviour: artImage: {fileID: 430284682} obtainedPowerups: powerupStatus: - sceneToLoad: BossRoom + sceneToLoad: music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} --- !u!4 &637676178 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index 3c6e53a..bca7f63 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -1050,49 +1050,33 @@ CompositeCollider2D: Y: -130000000 - X: 250000000 Y: -139999900 - - X: 239999959 + - X: 250000041 Y: -139999900 - - X: 239999900 + - X: 250000100 Y: -139999959 - - X: 239999900 + - X: 250000100 Y: -150000041 - - X: 239999959 + - X: 250000041 Y: -150000100 - X: 250000000 Y: -150000100 - X: 250000000 Y: -179999900 - - X: 229999959 + - X: 250000041 Y: -179999900 - - X: 229999900 + - X: 250000100 Y: -179999959 - - X: 229999900 + - X: 250000100 Y: -190000041 - - X: 229999959 + - X: 250000041 Y: -190000100 - X: 250000000 Y: -190000100 - - X: 250000000 - Y: -260000000 - - X: 230000000 - Y: -260000000 - - X: 230000000 - Y: -270000000 - - X: 250000000 - Y: -270000000 - X: 250000000 Y: -280000000 - X: 280000000 Y: -280000000 - - X: 160000000 - Y: -230000000 - - X: 180000000 - Y: -230000000 - - X: 180000000 - Y: -220000000 - - X: 160000000 - Y: -220000000 - - X: 160000000 Y: -130000000 - X: 130000000 Y: -130000000 @@ -1100,48 +1084,20 @@ CompositeCollider2D: Y: -280000000 - X: 160000000 Y: -280000000 - - - X: 220000100 - Y: -170000041 - - X: 220000100 - Y: -159999959 - - X: 220000041 - Y: -159999900 - - X: 189999959 - Y: -159999900 - - X: 189999900 - Y: -159999959 - - X: 189999900 - Y: -170000041 - - X: 189999959 - Y: -170000100 - - X: 220000041 - Y: -170000100 - - - X: 220000000 - Y: -200000000 - - X: 200000000 - Y: -200000000 - - X: 200000000 - Y: -210000000 - - X: 220000000 - Y: -210000000 - - - X: 210000000 - Y: -240000000 - - X: 190000000 - Y: -240000000 - - X: 190000000 - Y: -250000000 - - X: 210000000 - Y: -250000000 - - - X: 210000000 - Y: -280000000 - - X: 200000000 - Y: -280000000 - - X: 200000000 - Y: -290000000 - - X: 210000000 - Y: -290000000 - - X: 280000000 Y: -300000000 + - X: 210000100 + Y: -300000000 + - X: 210000100 + Y: -300000041 + - X: 210000041 + Y: -300000100 + - X: 199999959 + Y: -300000100 + - X: 199999900 + Y: -300000041 + - X: 199999900 + Y: -300000000 - X: 130000000 Y: -300000000 - X: 130000000 @@ -1165,43 +1121,11 @@ CompositeCollider2D: - - {x: 27.999971, y: -28} - {x: 27.999971, y: -13} - {x: 25, y: -13.00003} - - {x: 24.999971, y: -13.99999} - - {x: 23.99999, y: -14.000026} - - {x: 24.000027, y: -15.00001} - - {x: 25, y: -15.00004} - - {x: 24.999971, y: -17.99999} - - {x: 22.99999, y: -18.000027} - - {x: 23.000027, y: -19.00001} - - {x: 25, y: -19.00004} - - {x: 24.999971, y: -26} - - {x: 23, y: -26.000029} - - {x: 23.000029, y: -27} - - {x: 25, y: -27.000029} - {x: 25.000029, y: -28} - - {x: 15.999971, y: -28} - - {x: 16.000029, y: -23} - - {x: 18, y: -22.999971} - - {x: 17.999971, y: -22} - - {x: 16, y: -21.999971} - {x: 15.999971, y: -13} - {x: 13, y: -13.00003} - {x: 13.00003, y: -28} - - - {x: 21.999975, y: -17.00001} - - {x: 21.999975, y: -15.99999} - - {x: 18.99999, y: -16.000027} - - {x: 19.000027, y: -17.00001} - - - {x: 21.999971, y: -21} - - {x: 21.999971, y: -20} - - {x: 20, y: -20.000029} - - {x: 20.000029, y: -21} - - - {x: 20.999971, y: -25} - - {x: 20.999971, y: -24} - - {x: 19, y: -24.000029} - - {x: 19.000029, y: -25} - - - {x: 20.999971, y: -29} - - {x: 20.999971, y: -28} - - {x: 20, y: -28.000029} - - {x: 20.000029, y: -29} - - {x: 27.999971, y: -31} - {x: 27.999971, y: -30} - {x: 13, y: -30.000029} @@ -1436,16 +1360,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 20, y: -29, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 13, y: -28, z: 0} second: serializedVersion: 2 @@ -1536,26 +1450,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 23, y: -27, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 24, y: -27, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -27, z: 0} second: serializedVersion: 2 @@ -1676,26 +1570,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 19, y: -25, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 20, y: -25, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -25, z: 0} second: serializedVersion: 2 @@ -1816,26 +1690,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -23, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 17, y: -23, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -23, z: 0} second: serializedVersion: 2 @@ -1956,26 +1810,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 20, y: -21, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 21, y: -21, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -21, z: 0} second: serializedVersion: 2 @@ -2096,26 +1930,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 23, y: -19, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 24, y: -19, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -19, z: 0} second: serializedVersion: 2 @@ -2236,36 +2050,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 19, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 11 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 20, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 11 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 21, y: -17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 11 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -17, z: 0} second: serializedVersion: 2 @@ -2386,16 +2170,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 24, y: -15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 12 - m_TileSpriteIndex: 12 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 25, y: -15, z: 0} second: serializedVersion: 2 @@ -2490,7 +2264,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 9 - m_TileSpriteIndex: 9 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2500,7 +2274,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2530,7 +2304,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2540,7 +2314,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 4 - m_TileSpriteIndex: 5 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2788,7 +2562,7 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 29 + - m_RefCount: 18 m_Data: {fileID: 11400000, guid: a4ae24b1b4e2b4e53961aa8f07ef9164, type: 2} - m_RefCount: 99 m_Data: {fileID: 11400000, guid: da5d182e3f394414b84eaec7328fae4e, type: 2} @@ -2810,12 +2584,14 @@ Tilemap: m_Data: {fileID: 11400000, guid: ebce5bc98e0174632aedd9280f823bce, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 1aa2deb6e59444332b8b4e1d24d929c9, type: 2} - - m_RefCount: 3 - m_Data: {fileID: 11400000, guid: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 462c8271aeecb4e6b8b50996982dd328, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 29 + - m_RefCount: 18 m_Data: {fileID: 2870286397712609369, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 99 m_Data: {fileID: -4016574229998233168, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} @@ -2825,24 +2601,26 @@ Tilemap: m_Data: {fileID: -7995846982363831464, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 m_Data: {fileID: 5560954434011818755, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 2 + m_Data: {fileID: -6959196687471451608, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 4410115334632175332, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 3 + m_Data: {fileID: -6925154376186504650, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 m_Data: {fileID: -8473965523027447877, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 2 - m_Data: {fileID: -6959196687471451608, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 m_Data: {fileID: 4650436327494542774, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 m_Data: {fileID: 1403650607418574919, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 3 - m_Data: {fileID: -6925154376186504650, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 3 - m_Data: {fileID: 3556915880641124632, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 2147015527136506264, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 150 + - m_RefCount: 135 m_Data: e00: 1 e01: 0 @@ -2861,7 +2639,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 150 + - m_RefCount: 135 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -3501,6 +3279,343 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1716577439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1716577440} + - component: {fileID: 1716577444} + - component: {fileID: 1716577443} + - component: {fileID: 1716577442} + - component: {fileID: 1716577441} + m_Layer: 0 + m_Name: Oneway + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1716577440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 23, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1991976501} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!19719996 &1716577441 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!251 &1716577442 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 +--- !u!483693784 &1716577443 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1716577444 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_Tiles: + - first: {x: -1, y: -27, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -27, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -27, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -24, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: -22, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: -22, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -18, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -18, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -16, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 11 + m_Data: {fileID: 11400000, guid: a4ae24b1b4e2b4e53961aa8f07ef9164, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 462c8271aeecb4e6b8b50996982dd328, type: 2} + m_TileSpriteArray: + - m_RefCount: 11 + m_Data: {fileID: 2870286397712609369, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 3556915880641124632, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2147015527136506264, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + m_TileMatrixArray: + - m_RefCount: 15 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 15 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -7, y: -27, z: 0} + m_Size: {x: 9, y: 27, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &1746136367 GameObject: m_ObjectHideFlags: 0 @@ -3937,6 +4052,7 @@ Transform: - {fileID: 1746136368} - {fileID: 1912187127} - {fileID: 908243559} + - {fileID: 1716577440} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index d2ce6fb..346be60 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -5,6 +5,9 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0