diff --git a/Game/Assets/Scenes/Level 1.unity b/Game/Assets/Scenes/Level 1.unity index 81d65b1..b8d4a76 100644 --- a/Game/Assets/Scenes/Level 1.unity +++ b/Game/Assets/Scenes/Level 1.unity @@ -272,11 +272,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1177416078026475161, guid: 7592a187acd9d91459bac0051c18853d, type: 3} propertyPath: m_LocalPosition.x - value: -100.02585 + value: -65.56 objectReference: {fileID: 0} - target: {fileID: 1177416078026475161, guid: 7592a187acd9d91459bac0051c18853d, type: 3} propertyPath: m_LocalPosition.y - value: 9.379021 + value: 28.98 objectReference: {fileID: 0} - target: {fileID: 1177416078026475161, guid: 7592a187acd9d91459bac0051c18853d, type: 3} propertyPath: m_LocalPosition.z @@ -391,7 +391,7 @@ TilemapRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1315698733 - m_SortingLayer: -4 + m_SortingLayer: -6 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 56.642857, y: 42.357143, z: 0} diff --git a/Game/Assets/Scenes/Level 2.unity b/Game/Assets/Scenes/Level 2.unity index f98d170..51d6874 100644 --- a/Game/Assets/Scenes/Level 2.unity +++ b/Game/Assets/Scenes/Level 2.unity @@ -22869,16 +22869,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: 0, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 94 - m_TileSpriteIndex: 94 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 1, y: 0, z: 0} second: serializedVersion: 2 @@ -23439,6 +23429,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 78, y: 20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 141 + m_TileSpriteIndex: 141 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -73, y: 21, z: 0} second: serializedVersion: 2 @@ -36879,7 +36879,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 92a084e308c048d4e81dbb7b3f8c04f0, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: f7fd8ee20c87b8b4388c25d5f80a3167, type: 2} - - m_RefCount: 4 + - m_RefCount: 3 m_Data: {fileID: 11400000, guid: fa1443f5d34a16640bfd33586a1198e4, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 80d02e0eaa481e247b9a466663b3ce56, type: 2} @@ -36973,6 +36973,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: 6a839554452964a429316eaf0a1f0c2f, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: efb2685631a66d5448fbab16fcca0ad8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 86b4c62de49f1614fadf1fe3bf103999, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: -1865323708, guid: 4568ef38ca2ec7d46b4a4b6b5de118b1, type: 3} @@ -37162,7 +37164,7 @@ Tilemap: m_Data: {fileID: 1549229693, guid: 788b83892769c8147a2d0d8ce58d6d84, type: 3} - m_RefCount: 4 m_Data: {fileID: -2049814645, guid: ecd844a309e8af546b120cb4a867667f, type: 3} - - m_RefCount: 4 + - m_RefCount: 3 m_Data: {fileID: 178683217, guid: ecd844a309e8af546b120cb4a867667f, type: 3} - m_RefCount: 4 m_Data: {fileID: 1908009041, guid: ecd844a309e8af546b120cb4a867667f, type: 3} @@ -37256,6 +37258,8 @@ Tilemap: m_Data: {fileID: -678592217, guid: 478bf96f0b945db41a90e32f1fefb5e3, type: 3} - m_RefCount: 3 m_Data: {fileID: 1458031865, guid: 478bf96f0b945db41a90e32f1fefb5e3, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1140853537, guid: 706bba7812049ab4d8a5e43901934b8e, type: 3} m_TileMatrixArray: - m_RefCount: 1413 m_Data: @@ -119012,22 +119016,6 @@ CompositeCollider2D: Y: 210000000 - X: 277058816 Y: 210000000 - - - X: 820000000 - Y: 202333328 - - X: 820000000 - Y: 208666672 - - X: 818000000 - Y: 210000000 - - X: 811666624 - Y: 210000000 - - X: 810000000 - Y: 208333344 - - X: 810000000 - Y: 201666656 - - X: 812000000 - Y: 200000000 - - X: 818333376 - Y: 200000000 - - X: -40000000 Y: 200000000 - X: -70000000 @@ -119036,14 +119024,6 @@ CompositeCollider2D: Y: 197142848 - X: -40000000 Y: 197142848 - - - X: 880000000 - Y: 170000000 - - X: 850000000 - Y: 170000000 - - X: 850000000 - Y: 167142848 - - X: 880000000 - Y: 167142848 - - X: -40000000 Y: 170000000 - X: -70000000 @@ -119053,20 +119033,28 @@ CompositeCollider2D: - X: -40000000 Y: 167142848 - - X: 880000000 - Y: 140000000 + Y: 170000000 - X: 850000000 - Y: 140000000 + Y: 170000000 - X: 850000000 - Y: 137142864 + Y: 167142848 - X: 880000000 - Y: 137142864 - - - X: -10000000 - Y: 140000000 + Y: 167142848 + - - X: 0 + Y: 150000000 - X: -30000000 - Y: 140000000 + Y: 150000000 - X: -30000000 + Y: 147142864 + - X: 0 + Y: 147142864 + - - X: 880000000 + Y: 140000000 + - X: 850000000 + Y: 140000000 + - X: 850000000 Y: 137142864 - - X: -10000000 + - X: 880000000 Y: 137142864 - - X: 330000000 Y: 130000000 @@ -119076,6 +119064,14 @@ CompositeCollider2D: Y: 127142856 - X: 330000000 Y: 127142856 + - - X: 0 + Y: 120000000 + - X: -40000000 + Y: 120000000 + - X: -40000000 + Y: 117142856 + - X: 0 + Y: 117142856 - - X: -60000000 Y: 110000000 - X: -80000000 @@ -119084,14 +119080,6 @@ CompositeCollider2D: Y: 107142856 - X: -60000000 Y: 107142856 - - - X: 880000000 - Y: 110000000 - - X: 850000000 - Y: 110000000 - - X: 850000000 - Y: 107142856 - - X: 880000000 - Y: 107142856 - - X: 200000000 Y: 110000000 - X: 180000000 @@ -119100,6 +119088,22 @@ CompositeCollider2D: Y: 107142856 - X: 200000000 Y: 107142856 + - - X: 880000000 + Y: 110000000 + - X: 850000000 + Y: 110000000 + - X: 850000000 + Y: 107142856 + - X: 880000000 + Y: 107142856 + - - X: 900000000 + Y: 100000000 + - X: 870000000 + Y: 100000000 + - X: 870000000 + Y: 97142856 + - X: 900000000 + Y: 97142856 - - X: 170000000 Y: 100000000 - X: 140000000 @@ -119116,14 +119120,6 @@ CompositeCollider2D: Y: 97142856 - X: 280000000 Y: 97142856 - - - X: 900000000 - Y: 100000000 - - X: 870000000 - Y: 100000000 - - X: 870000000 - Y: 97142856 - - X: 900000000 - Y: 97142856 - - X: 930000000 Y: 90000000 - X: 900000000 @@ -119670,14 +119666,6 @@ CompositeCollider2D: - {x: -3.999971, y: 21.714285} - {x: 23, y: 21.714256} - {x: 23.000029, y: 21} - - - {x: 81.83333, y: 20} - - {x: 82, y: 20.233341} - - {x: 81.999985, y: 20.866676} - - {x: 81.799995, y: 21} - - {x: 81.16666, y: 20.999992} - - {x: 81, y: 20.833323} - - {x: 81.00001, y: 20.166658} - - {x: 81.200005, y: 20} - - {x: -4.000029, y: 19.714285} - {x: -4.000029, y: 20} - {x: -7, y: 19.999971} @@ -119690,10 +119678,10 @@ CompositeCollider2D: - {x: 87.99997, y: 17} - {x: 85, y: 16.999971} - {x: 85.00003, y: 16.714285} - - - {x: -1.0000293, y: 13.714287} - - {x: -1.0000293, y: 14} - - {x: -3, y: 13.999971} - - {x: -2.999971, y: 13.714287} + - - {x: -0.000029300001, y: 14.714287} + - {x: -0.000029300001, y: 15} + - {x: -3, y: 14.999971} + - {x: -2.999971, y: 14.714287} - - {x: 87.99997, y: 13.714287} - {x: 87.99997, y: 14} - {x: 85, y: 13.999971} @@ -119702,18 +119690,26 @@ CompositeCollider2D: - {x: 32.999973, y: 13} - {x: 30, y: 12.99997} - {x: 30.000029, y: 12.714286} - - - {x: 87.99997, y: 10.714286} - - {x: 87.99997, y: 11} - - {x: 85, y: 10.99997} - - {x: 85.00003, y: 10.714286} - - - {x: 19.999971, y: 10.714286} - - {x: 19.999971, y: 11} - - {x: 18, y: 10.99997} - - {x: 18.000029, y: 10.714286} + - - {x: -0.000029300001, y: 11.714286} + - {x: -0.000029300001, y: 12} + - {x: -4, y: 11.99997} + - {x: -3.999971, y: 11.714286} - - {x: -6.000029, y: 10.714286} - {x: -6.000029, y: 11} - {x: -8, y: 10.99997} - {x: -7.9999704, y: 10.714286} + - - {x: 19.999971, y: 10.714286} + - {x: 19.999971, y: 11} + - {x: 18, y: 10.99997} + - {x: 18.000029, y: 10.714286} + - - {x: 87.99997, y: 10.714286} + - {x: 87.99997, y: 11} + - {x: 85, y: 10.99997} + - {x: 85.00003, y: 10.714286} + - - {x: 16.999971, y: 9.714286} + - {x: 16.999971, y: 10} + - {x: 14, y: 9.99997} + - {x: 14.000029, y: 9.714286} - - {x: 27.999971, y: 9.714286} - {x: 27.999971, y: 10} - {x: 25, y: 9.99997} @@ -119722,10 +119718,6 @@ CompositeCollider2D: - {x: 89.99997, y: 10} - {x: 87, y: 9.99997} - {x: 87.00003, y: 9.714286} - - - {x: 16.999971, y: 9.714286} - - {x: 16.999971, y: 10} - - {x: 14, y: 9.99997} - - {x: 14.000029, y: 9.714286} - - {x: 92.99997, y: 8.714286} - {x: 92.99997, y: 9} - {x: 90, y: 8.99997} @@ -119734,10 +119726,6 @@ CompositeCollider2D: - {x: 95.99997, y: 8} - {x: 93, y: 7.9999704} - {x: 93.00003, y: 7.714286} - - - {x: -6.000029, y: 5.714286} - - {x: -6.000029, y: 6} - - {x: -8, y: 5.999971} - - {x: -7.9999704, y: 5.714286} - - {x: 11.99997, y: 5.714286} - {x: 11.99997, y: 6} - {x: 4, y: 5.999971} @@ -119746,6 +119734,10 @@ CompositeCollider2D: - {x: 0.99997073, y: 6} - {x: -2, y: 5.999971} - {x: -1.9999708, y: 5.714286} + - - {x: -6.000029, y: 5.714286} + - {x: -6.000029, y: 6} + - {x: -8, y: 5.999971} + - {x: -7.9999704, y: 5.714286} - - {x: 100.99997, y: 4.714286} - {x: 100.99997, y: 5} - {x: 98, y: 4.999971} @@ -134631,6 +134623,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -4, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 72, y: 11, z: 0} second: serializedVersion: 2 @@ -135301,26 +135333,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -3, y: 13, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 67 - m_TileSpriteIndex: 65 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -2, y: 13, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 67 - m_TileSpriteIndex: 65 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 69, y: 13, z: 0} second: serializedVersion: 2 @@ -135701,6 +135713,36 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -3, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 67 + m_TileSpriteIndex: 65 + 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: 67 + m_TileSpriteIndex: 65 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 72, y: 14, z: 0} second: serializedVersion: 2 @@ -138141,16 +138183,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 81, y: 20, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 70 - m_TileSpriteIndex: 68 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -48, y: 21, z: 0} second: serializedVersion: 2 @@ -150797,14 +150829,14 @@ Tilemap: m_Data: {fileID: 11400000, guid: 592ecef65d91c8740a1fa27efe1fed3c, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 72ed4d7474dbafa46960d20de169b9aa, type: 2} - - m_RefCount: 29 + - m_RefCount: 34 m_Data: {fileID: 11400000, guid: 47f0bb8f5166e19409a3d4420308ce53, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 7aa82ec8d3a0c8544b39760c5586a484, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: fad43d43984ebaa45bccef82206e933b, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 86b4c62de49f1614fadf1fe3bf103999, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 34 m_Data: {fileID: 11400000, guid: a2befe92aca68f249b0fe38ef5f129c1, type: 2} - m_RefCount: 1 @@ -151074,14 +151106,14 @@ Tilemap: m_Data: {fileID: 749324514, guid: 48b6a0966a929b5468bbc95f531c7c27, type: 3} - m_RefCount: 1 m_Data: {fileID: 493837280, guid: 48b6a0966a929b5468bbc95f531c7c27, type: 3} - - m_RefCount: 29 + - m_RefCount: 34 m_Data: {fileID: -1700748249, guid: 6d26de1de4b803143bf5744898d0a73b, type: 3} - m_RefCount: 1 m_Data: {fileID: 2090500563, guid: 48b6a0966a929b5468bbc95f531c7c27, type: 3} - m_RefCount: 1 m_Data: {fileID: -922562988, guid: 48b6a0966a929b5468bbc95f531c7c27, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1140853537, guid: 706bba7812049ab4d8a5e43901934b8e, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 34 m_Data: {fileID: 1138159621, guid: e0979c4444f13ca42ba64a219dfc1d12, type: 3} - m_RefCount: 1 @@ -151225,7 +151257,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 1458031865, guid: 478bf96f0b945db41a90e32f1fefb5e3, type: 3} m_TileMatrixArray: - - m_RefCount: 3077 + - m_RefCount: 3081 m_Data: e00: 1 e01: 0 @@ -151244,7 +151276,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 3077 + - m_RefCount: 3081 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1