From 5706f3233c0932ea6a217d902310e66fa680ca28 Mon Sep 17 00:00:00 2001 From: Ivy Date: Wed, 21 Apr 2021 18:55:30 -0500 Subject: [PATCH] Elongated RouteToTower so that it requires glider --- .../Scenes/DemoLevels/EnemyTunnel.unity | 2 +- .../Scenes/DemoLevels/RouteToTower.unity | 1094 ++++++++++++----- .../Assets/Scenes/DemoLevels/Spawn.unity | 2 +- .../Assets/Scenes/DemoLevels/Tower.unity | 376 +++++- .../UserSettings/EditorUserSettings.asset | 9 + 5 files changed, 1158 insertions(+), 325 deletions(-) diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 9ad9706..9b6d984 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -2839,7 +2839,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LevelName: RouteToTower - whereTo: {x: 0, y: 0, z: 0} + whereTo: {x: 10.071, y: -0.88, z: 0} --- !u!61 &611288315 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity index 50a220c..96a1feb 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity @@ -214,38 +214,70 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 73552635} m_ColliderPaths: - - - X: 60000000 - Y: 30000000 - - X: 90000000 - Y: 30000000 - - X: 90000000 - Y: 40000000 - - X: 80000000 - Y: 40000000 - - X: 80000000 - Y: 60000000 - - X: 90000000 - Y: 60000000 - - X: 90000000 - Y: 70000000 - - X: 50000000 - Y: 70000000 - - X: 50000000 - Y: 60000000 - - X: 70000000 - Y: 60000000 - - X: 70000000 - Y: 40000000 - - X: 30000000 - Y: 40000000 - - X: 30000000 - Y: 30000000 - - X: 40000000 - Y: 30000000 - - X: 40000000 - Y: -30000000 - - X: 60000000 - Y: -30000000 + - - X: 140000100 + Y: -50000041 + - X: 140000100 + Y: -30000100 + - X: 160000041 + Y: -30000100 + - X: 160000100 + Y: -30000041 + - X: 160000100 + Y: 29999900 + - X: 190000041 + Y: 29999900 + - X: 190000100 + Y: 29999959 + - X: 190000100 + Y: 40000041 + - X: 190000041 + Y: 40000100 + - X: 180000100 + Y: 40000100 + - X: 180000100 + Y: 59999900 + - X: 190000041 + Y: 59999900 + - X: 190000100 + Y: 59999959 + - X: 190000100 + Y: 70000041 + - X: 190000041 + Y: 70000100 + - X: 149999959 + Y: 70000100 + - X: 149999900 + Y: 70000041 + - X: 149999900 + Y: 59999959 + - X: 149999959 + Y: 59999900 + - X: 169999900 + Y: 59999900 + - X: 169999900 + Y: 40000100 + - X: 129999959 + Y: 40000100 + - X: 129999900 + Y: 40000041 + - X: 129999900 + Y: 29999959 + - X: 129999959 + Y: 29999900 + - X: 139999900 + Y: 29999900 + - X: 139999900 + Y: -29999900 + - X: 109999959 + Y: -29999900 + - X: 109999900 + Y: -29999959 + - X: 109999900 + Y: -50000041 + - X: 109999959 + Y: -50000100 + - X: 140000041 + Y: -50000100 - - X: -240000000 Y: -10000000 - X: -230000000 @@ -258,45 +290,65 @@ CompositeCollider2D: Y: -20000000 - X: -240000000 Y: -20000000 - - - X: -90000000 - Y: -80000000 - - X: -50000000 - Y: -80000000 - - X: -50000000 - Y: -70000000 - - X: -40000000 - Y: -70000000 - - X: -40000000 - Y: -50000000 - - X: -10000100 - Y: -50000000 - - X: -10000100 - Y: -39999959 - - X: -10000041 - Y: -39999900 - - X: -10000000 - Y: -39999900 - - X: -10000000 - Y: -30000000 - - X: -50000000 - Y: -30000000 - - X: -50000000 - Y: -50000000 - - X: -60000000 - Y: -50000000 - - X: -60000000 - Y: -70000000 - - X: -100000000 - Y: -70000000 - - X: -100000000 - Y: -80000000 - - X: -110000000 - Y: -80000000 - - X: -110000000 - Y: -20000000 - - X: -130000000 - Y: -20000000 - - X: -130000000 + - - X: 10000100 + Y: -90000041 + - X: 10000100 + Y: -80000100 + - X: 50000041 + Y: -80000100 + - X: 50000100 + Y: -80000041 + - X: 50000100 + Y: -70000100 + - X: 60000041 + Y: -70000100 + - X: 60000100 + Y: -70000041 + - X: 60000100 + Y: -50000100 + - X: 90000041 + Y: -50000100 + - X: 90000100 + Y: -50000041 + - X: 90000100 + Y: -29999959 + - X: 90000041 + Y: -29999900 + - X: 49999959 + Y: -29999900 + - X: 49999900 + Y: -29999959 + - X: 49999900 + Y: -49999900 + - X: 39999959 + Y: -49999900 + - X: 39999900 + Y: -49999959 + - X: 39999900 + Y: -69999900 + - X: -41 + Y: -69999900 + - X: -100 + Y: -69999959 + - X: -100 + Y: -79999900 + - X: -59999900 + Y: -79999900 + - X: -59999900 + Y: -19999959 + - X: -59999959 + Y: -19999900 + - X: -80000041 + Y: -19999900 + - X: -80000100 + Y: -19999959 + - X: -80000100 + Y: -79999900 + - X: -130000041 + Y: -79999900 + - X: -130000100 + Y: -79999959 + - X: -130000100 Y: -80000000 - X: -170000000 Y: -80000000 @@ -322,64 +374,56 @@ CompositeCollider2D: Y: -80000000 - X: -200000000 Y: -90000000 - - X: -90000000 + - X: -130000100 Y: -90000000 - - - X: 40000000 - Y: -30000000 - - X: 10000000 - Y: -30000000 - - X: 10000000 - Y: -39999900 + - X: -130000100 + Y: -90000041 + - X: -130000041 + Y: -90000100 - X: 10000041 - Y: -39999900 - - X: 10000100 - Y: -39999959 - - X: 10000100 - Y: -50000000 - - X: 40000000 - Y: -50000000 + Y: -90000100 m_CompositePaths: m_Paths: - - - {x: 5.999971, y: -3} - - {x: 6.0000296, y: 3} - - {x: 9, y: 3.0000293} - - {x: 8.99997, y: 4} - - {x: 8, y: 4.0000296} - - {x: 8.00003, y: 6} - - {x: 9, y: 6.000029} - - {x: 8.99997, y: 7} - - {x: 5, y: 6.9999704} - - {x: 5.000029, y: 6} - - {x: 7, y: 5.9999704} - - {x: 6.9999704, y: 4} - - {x: 3, y: 3.999971} - - {x: 3.0000293, y: 3} - - {x: 4, y: 2.9999707} - - {x: 4.000029, y: -3} + - - {x: 13.99999, y: -2.999981} + - {x: 16.00001, y: -2.9999747} + - {x: 16.00004, y: 2.99999} + - {x: 19.00001, y: 3.0000253} + - {x: 18.999975, y: 4.00001} + - {x: 18.00001, y: 4.000039} + - {x: 18.00004, y: 5.99999} + - {x: 19.00001, y: 6.0000253} + - {x: 18.999975, y: 7.0000095} + - {x: 14.99999, y: 6.9999743} + - {x: 15.000026, y: 5.99999} + - {x: 16.99999, y: 5.999961} + - {x: 16.99996, y: 4.00001} + - {x: 12.99999, y: 3.9999747} + - {x: 13.000026, y: 2.99999} + - {x: 13.99999, y: 2.9999607} - - {x: -24.000029, y: -2} - {x: -23.999971, y: -1} - {x: -23, y: -0.99997073} - {x: -23.000029, y: 1} - {x: -26, y: 0.99997073} - {x: -25.999971, y: -2} - - - {x: -9.00003, y: -9} - - {x: -8.99997, y: -8} - - {x: -5, y: -7.9999704} - - {x: -4.9999704, y: -7} - - {x: -4, y: -6.9999704} - - {x: -3.9999704, y: -5} - - {x: -1.00001, y: -4.999971} - - {x: -1.0000293, y: -3} - - {x: -5, y: -3.0000293} - - {x: -5.0000296, y: -5} - - {x: -6, y: -5.000029} - - {x: -6.0000296, y: -7} - - {x: -10, y: -7.0000296} - - {x: -10.00003, y: -8} - - {x: -11, y: -7.9999704} - - {x: -11.00003, y: -2} - - {x: -13, y: -2.0000293} - - {x: -13.00003, y: -8} + - - {x: 0.9999748, y: -9.00001} + - {x: 1.0000395, y: -8.00001} + - {x: 5.00001, y: -7.9999747} + - {x: 5.000039, y: -7.0000095} + - {x: 6.00001, y: -6.9999743} + - {x: 6.000039, y: -5.00001} + - {x: 9.00001, y: -4.9999747} + - {x: 8.999974, y: -2.99999} + - {x: 4.99999, y: -3.0000253} + - {x: 4.999961, y: -4.99999} + - {x: 3.99999, y: -5.0000253} + - {x: 3.999961, y: -6.9999905} + - {x: -0.00001, y: -7.0000257} + - {x: -0.0000394, y: -7.9999905} + - {x: -5.99999, y: -7.999961} + - {x: -6.0000253, y: -1.99999} + - {x: -8.00001, y: -2.0000253} + - {x: -8.000039, y: -7.9999905} - {x: -17, y: -7.9999704} - {x: -17.000029, y: -7} - {x: -18, y: -6.9999704} @@ -392,10 +436,10 @@ CompositeCollider2D: - {x: -21.999971, y: -8} - {x: -20, y: -8.00003} - {x: -19.999971, y: -9} - - - {x: 3.999971, y: -5} - - {x: 3.999971, y: -3} - - {x: 1, y: -3.0000293} - - {x: 1.0000393, y: -5} + - - {x: 13.999974, y: -5.00001} + - {x: 13.999981, y: -2.99999} + - {x: 10.99999, y: -3.0000253} + - {x: 11.000026, y: -5.00001} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &73552638 @@ -586,6 +630,106 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -9, y: -9, 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 + - first: {x: -8, y: -9, 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 + - first: {x: -7, y: -9, 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 + - first: {x: -6, y: -9, 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 + - first: {x: -5, y: -9, 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 + - first: {x: -4, y: -9, 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 + - first: {x: -3, y: -9, 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 + - first: {x: -2, y: -9, 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 + - first: {x: -1, y: -9, 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 + - first: {x: 0, y: -9, 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 - first: {x: -22, y: -8, z: 0} second: serializedVersion: 2 @@ -636,7 +780,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -8, z: 0} + - first: {x: -8, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -646,7 +790,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -8, z: 0} + - first: {x: -7, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -656,7 +800,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -10, y: -8, z: 0} + - first: {x: 0, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -666,7 +810,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -9, y: -8, z: 0} + - first: {x: 1, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -676,7 +820,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: -8, z: 0} + - first: {x: 2, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -686,7 +830,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -7, y: -8, z: 0} + - first: {x: 3, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -696,7 +840,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -8, z: 0} + - first: {x: 4, y: -8, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -786,27 +930,27 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -7, z: 0} + - first: {x: -8, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -7, z: 0} + - first: {x: -7, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -7, z: 0} + - first: {x: 4, y: -7, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -816,7 +960,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -7, z: 0} + - first: {x: 5, y: -7, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -896,27 +1040,27 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -6, z: 0} + - first: {x: -8, y: -6, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -6, z: 0} + - first: {x: -7, y: -6, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -6, z: 0} + - first: {x: 4, y: -6, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -926,7 +1070,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -6, z: 0} + - first: {x: 5, y: -6, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -1006,27 +1150,27 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -5, z: 0} + - first: {x: -8, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -5, z: 0} + - first: {x: -7, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -5, z: 0} + - first: {x: 5, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -1036,7 +1180,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -4, y: -5, z: 0} + - first: {x: 6, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1046,7 +1190,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -3, y: -5, z: 0} + - first: {x: 7, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1056,7 +1200,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: -5, z: 0} + - first: {x: 8, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1066,7 +1210,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 1, y: -5, z: 0} + - first: {x: 11, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1076,7 +1220,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: -5, z: 0} + - first: {x: 12, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1086,7 +1230,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: -5, z: 0} + - first: {x: 13, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -1096,117 +1240,117 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -4, z: 0} + - first: {x: -8, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -4, z: 0} + - first: {x: -7, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -4, z: 0} + - first: {x: 5, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -4, y: -4, z: 0} + - first: {x: 6, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -3, y: -4, z: 0} + - first: {x: 7, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: -4, z: 0} + - first: {x: 8, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 1, y: -4, z: 0} + - first: {x: 11, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: -4, z: 0} + - first: {x: 12, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: -4, z: 0} + - first: {x: 13, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -13, y: -3, z: 0} + - first: {x: -8, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -12, y: -3, z: 0} + - first: {x: -7, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: -3, z: 0} + - first: {x: 14, y: -3, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -1216,7 +1360,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: -3, z: 0} + - first: {x: 15, y: -3, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -1246,7 +1390,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: -2, z: 0} + - first: {x: 14, y: -2, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -1256,7 +1400,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: -2, z: 0} + - first: {x: 15, y: -2, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -1296,7 +1440,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: -1, z: 0} + - first: {x: 14, y: -1, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -1306,7 +1450,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: -1, z: 0} + - first: {x: 15, y: -1, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -1346,7 +1490,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 0, z: 0} + - first: {x: 14, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -1356,7 +1500,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 0, z: 0} + - first: {x: 15, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -1366,7 +1510,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 1, z: 0} + - first: {x: 14, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -1376,7 +1520,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 1, z: 0} + - first: {x: 15, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -1386,7 +1530,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 2, z: 0} + - first: {x: 14, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -1396,7 +1540,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 2, z: 0} + - first: {x: 15, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -1406,121 +1550,121 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: 3, z: 0} + - first: {x: 13, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 3, z: 0} + - first: {x: 14, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 3, z: 0} + - first: {x: 15, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 6, y: 3, z: 0} + - first: {x: 16, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 3, z: 0} + - first: {x: 17, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 8, y: 3, z: 0} + - first: {x: 18, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 4, z: 0} + - first: {x: 17, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileIndex: 3 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 5, z: 0} + - first: {x: 17, y: 5, z: 0} second: serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileIndex: 3 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 6, z: 0} + - first: {x: 15, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 6, y: 6, z: 0} + - first: {x: 16, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 6, z: 0} + - first: {x: 17, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 8, y: 6, z: 0} + - first: {x: 18, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1530,35 +1674,35 @@ Tilemap: m_TileAssetArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 10 - m_Data: {fileID: 11400000, guid: 7eb9f2290c10945bb9a085ee4a6601b7, type: 2} - - m_RefCount: 57 - m_Data: {fileID: 11400000, guid: bf5b725b0b6dc49d98871c526e896e19, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 99e5238f0f61b41df9f758a0ddce2954, type: 2} + - m_RefCount: 67 + m_Data: {fileID: 11400000, guid: bf5b725b0b6dc49d98871c526e896e19, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 1f20fa3ddf79c462a8cc869846014ff8, type: 2} - m_RefCount: 3 - m_Data: {fileID: 11400000, guid: 1f20fa3ddf79c462a8cc869846014ff8, type: 2} - - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 7ba0425cfd1d1451e922072a29a16db3, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 44159c5203c4c46f78ab06fa1f8c8d24, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: ebce5bc98e0174632aedd9280f823bce, type: 2} - - m_RefCount: 2 - m_Data: {fileID: 11400000, guid: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} - - m_RefCount: 7 - m_Data: {fileID: 11400000, guid: 684fa0616c60549079f2fbbc29584b04, type: 2} - m_RefCount: 13 m_Data: {fileID: 11400000, guid: a4ae24b1b4e2b4e53961aa8f07ef9164, type: 2} + - m_RefCount: 7 + m_Data: {fileID: 11400000, guid: 684fa0616c60549079f2fbbc29584b04, type: 2} + - m_RefCount: 10 + m_Data: {fileID: 11400000, guid: 7eb9f2290c10945bb9a085ee4a6601b7, type: 2} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 10 - m_Data: {fileID: 7372308142451282855, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 57 - m_Data: {fileID: 5560954434011818755, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 4 m_Data: {fileID: -1535365884315644770, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 67 + m_Data: {fileID: 5560954434011818755, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 3556915880641124632, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 m_Data: {fileID: 4410115334632175332, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 @@ -1567,14 +1711,14 @@ Tilemap: m_Data: {fileID: 4650436327494542774, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 m_Data: {fileID: 1403650607418574919, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 2 - m_Data: {fileID: 3556915880641124632, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 7 - m_Data: {fileID: -7708644975649761358, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 13 m_Data: {fileID: 2870286397712609369, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 7 + m_Data: {fileID: -7708644975649761358, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + - m_RefCount: 10 + m_Data: {fileID: 7372308142451282855, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 105 + - m_RefCount: 115 m_Data: e00: 1 e01: 0 @@ -1593,7 +1737,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 105 + - m_RefCount: 115 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -1748,6 +1892,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -13, y: -8, 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: -12, y: -8, 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: -11, y: -8, z: 0} second: serializedVersion: 2 @@ -1758,6 +1922,86 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -10, y: -8, 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: -9, y: -8, 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: -8, 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: -5, y: -8, 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: -8, 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: -8, 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: -8, 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: -8, 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: -18, y: -7, z: 0} second: serializedVersion: 2 @@ -1808,6 +2052,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -13, y: -7, 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: -12, y: -7, 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: -11, y: -7, z: 0} second: serializedVersion: 2 @@ -1838,7 +2102,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: -7, z: 0} + - first: {x: -6, y: -7, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1848,7 +2112,87 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -7, y: -7, z: 0} + - first: {x: -5, y: -7, 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: -7, 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: -7, 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: -7, 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: -7, 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: -7, 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: -7, 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: -7, 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: -7, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1918,6 +2262,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -13, y: -6, 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: -12, y: -6, 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: -11, y: -6, z: 0} second: serializedVersion: 2 @@ -1948,7 +2312,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: -6, z: 0} + - first: {x: -6, y: -6, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1958,7 +2322,87 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -7, y: -6, z: 0} + - first: {x: -5, y: -6, 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: -6, 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: -6, 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: -6, 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: -6, 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: -6, 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: -6, 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: -6, 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: -6, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2028,6 +2472,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -13, y: -5, 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: -12, y: -5, 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: -11, y: -5, z: 0} second: serializedVersion: 2 @@ -2058,7 +2522,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: -5, z: 0} + - first: {x: -6, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2068,7 +2532,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -7, y: -5, z: 0} + - first: {x: -5, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2078,7 +2542,87 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -5, z: 0} + - first: {x: -4, y: -5, 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: -5, 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: -5, 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: -5, 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: -5, 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: -5, 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: -5, 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: -5, 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: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2090,13 +2634,13 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 38 + - m_RefCount: 78 m_Data: {fileID: 11400000, guid: 8794c5a8fae2c4ffa8547e53f7ab72f4, type: 2} m_TileSpriteArray: - - m_RefCount: 38 + - m_RefCount: 78 m_Data: {fileID: -925572822628993362, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 38 + - m_RefCount: 78 m_Data: e00: 1 e01: 0 @@ -2115,13 +2659,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 38 + - m_RefCount: 78 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: -27, y: -11, z: 0} - m_Size: {x: 27, y: 11, z: 1} + m_Size: {x: 32, y: 11, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -2262,7 +2806,7 @@ Tilemap: m_GameObject: {fileID: 392279113} m_Enabled: 1 m_Tiles: - - first: {x: -1, y: -5, z: 0} + - first: {x: 9, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2272,7 +2816,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: -5, z: 0} + - first: {x: 10, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -2315,7 +2859,7 @@ Tilemap: m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -1, y: -5, z: 0} - m_Size: {x: 2, y: 5, z: 1} + m_Size: {x: 12, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 5b51c37..c499198 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: + sceneToLoad: RouteToTower 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 bca7f63..867b515 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -1048,30 +1048,6 @@ CompositeCollider2D: Y: -130000000 - X: 250000000 Y: -130000000 - - X: 250000000 - Y: -139999900 - - X: 250000041 - Y: -139999900 - - X: 250000100 - Y: -139999959 - - X: 250000100 - Y: -150000041 - - X: 250000041 - Y: -150000100 - - X: 250000000 - Y: -150000100 - - X: 250000000 - Y: -179999900 - - X: 250000041 - Y: -179999900 - - X: 250000100 - Y: -179999959 - - X: 250000100 - Y: -190000041 - - X: 250000041 - Y: -190000100 - - X: 250000000 - Y: -190000100 - X: 250000000 Y: -280000000 - X: 280000000 @@ -1084,26 +1060,30 @@ CompositeCollider2D: Y: -280000000 - X: 160000000 Y: -280000000 - - - 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 + - - X: 280000100 + Y: -330000041 + - X: 280000100 + Y: -309999959 + - X: 280000041 + Y: -309999900 + - X: 280000000 + Y: -309999900 + - X: 280000000 Y: -300000000 - X: 130000000 Y: -300000000 - X: 130000000 - Y: -310000000 - - X: 280000000 - Y: -310000000 + Y: -309999900 + - X: 129999959 + Y: -309999900 + - X: 129999900 + Y: -309999959 + - X: 129999900 + Y: -330000041 + - X: 129999959 + Y: -330000100 + - X: 280000041 + Y: -330000100 m_CompositePaths: m_Paths: - - {x: 27.999971, y: -11} @@ -1126,10 +1106,10 @@ CompositeCollider2D: - {x: 15.999971, y: -13} - {x: 13, y: -13.00003} - {x: 13.00003, y: -28} - - - {x: 27.999971, y: -31} + - - {x: 27.999975, y: -33.00001} - {x: 27.999971, y: -30} - {x: 13, y: -30.000029} - - {x: 13.00003, y: -31} + - {x: 13.000026, y: -33.00001} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1177871983 @@ -1210,6 +1190,306 @@ Tilemap: m_GameObject: {fileID: 1177871978} m_Enabled: 1 m_Tiles: + - first: {x: 13, y: -33, 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: 14, y: -33, 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: 15, y: -33, 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: 16, y: -33, 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: 17, y: -33, 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: 18, y: -33, 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: 19, y: -33, 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: 20, y: -33, 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: 21, y: -33, 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: 22, y: -33, 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: 23, y: -33, 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: 24, y: -33, 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: 25, y: -33, 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: 26, y: -33, 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: 27, y: -33, 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: 13, y: -32, 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: 14, y: -32, 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: 15, y: -32, 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: 16, y: -32, 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: 17, y: -32, 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: 18, y: -32, 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: 19, y: -32, 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: 20, y: -32, 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: 21, y: -32, 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: 22, y: -32, 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: 23, y: -32, 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: 24, y: -32, 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: 25, y: -32, 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: 26, y: -32, 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: 27, y: -32, 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: 13, y: -31, z: 0} second: serializedVersion: 2 @@ -2564,7 +2844,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 18 m_Data: {fileID: 11400000, guid: a4ae24b1b4e2b4e53961aa8f07ef9164, type: 2} - - m_RefCount: 99 + - m_RefCount: 129 m_Data: {fileID: 11400000, guid: da5d182e3f394414b84eaec7328fae4e, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: bf5b725b0b6dc49d98871c526e896e19, type: 2} @@ -2593,7 +2873,7 @@ Tilemap: m_TileSpriteArray: - m_RefCount: 18 m_Data: {fileID: 2870286397712609369, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 99 + - m_RefCount: 129 m_Data: {fileID: -4016574229998233168, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 m_Data: {fileID: 2149588577069445164, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} @@ -2620,7 +2900,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 1403650607418574919, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 135 + - m_RefCount: 165 m_Data: e00: 1 e01: 0 @@ -2639,13 +2919,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 135 + - m_RefCount: 165 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: -12, y: -31, z: 0} - m_Size: {x: 44, y: 38, z: 1} + m_Origin: {x: -12, y: -33, z: 0} + m_Size: {x: 44, y: 40, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 346be60..2559187 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -8,6 +8,15 @@ EditorUserSettings: RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 + RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0