From 8f6a8151f97f07aa78e457f3415ef8132921089e Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 04:53:17 +0100 Subject: [PATCH 1/3] Tile palettes cleaned up --- .../Textures/Environ/castle_tileset.png.meta | 71 +------- .../Environment/DarkCastle/DarkCastle.prefab | 162 +++++++++--------- .../Tiles/Environment/Death/Spikes.asset | 2 +- .../Tiles/Environment/Main Palette.prefab | 60 +++++-- Assets/Scenes/ParallaxTest.unity | 4 +- 5 files changed, 136 insertions(+), 163 deletions(-) diff --git a/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta b/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta index fd53908..e696a1f 100644 --- a/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta +++ b/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta @@ -777,69 +777,6 @@ TextureImporter: indices: edges: [] weights: [] - - serializedVersion: 2 - name: castle_torch1 - rect: - serializedVersion: 2 - x: 19 - y: 50 - width: 15 - height: 17 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 02d4f9138e5e480d0800000000000000 - internalID: -3421357031467037408 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: castle_torch2 - rect: - serializedVersion: 2 - x: 39 - y: 50 - width: 17 - height: 17 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: ce0a00b1f2579d0c0800000000000000 - internalID: -4550477103304236820 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: castle_torch3 - rect: - serializedVersion: 2 - x: 60 - y: 50 - width: 17 - height: 17 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 61b0fbeadb13a6b70800000000000000 - internalID: 8892975104946801430 - vertices: [] - indices: - edges: [] - weights: [] - serializedVersion: 2 name: castle_chest_closed rect: @@ -847,7 +784,7 @@ TextureImporter: x: 19 y: 19 width: 17 - height: 11 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -868,9 +805,9 @@ TextureImporter: x: 51 y: 19 width: 22 - height: 13 - alignment: 9 - pivot: {x: 0.38136014, y: 0.42625353} + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab b/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab index e8214cc..bf91a23 100644 --- a/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab +++ b/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab @@ -115,16 +115,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 39 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -1, y: 1, z: 0} second: serializedVersion: 2 @@ -135,21 +125,21 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: 1, z: 0} + - first: {x: -8, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 41 - m_TileSpriteIndex: 41 + m_TileIndex: 34 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: 2, z: 0} + - first: {x: -6, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 30 - m_TileSpriteIndex: 30 + m_TileIndex: 39 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -159,7 +149,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 31 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -169,7 +159,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 32 - m_TileSpriteIndex: 32 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -179,27 +169,17 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -1, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 + m_TileSpriteIndex: 4294967295 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: 2, z: 0} + - first: {x: -6, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 35 - m_TileSpriteIndex: 35 + m_TileIndex: 5 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -209,7 +189,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 24 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 32 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -219,7 +199,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 25 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -265,11 +245,21 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 1, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 30 + m_TileSpriteIndex: 30 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -5, y: 4, z: 0} second: serializedVersion: 2 m_TileIndex: 18 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -279,7 +269,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 19 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -329,7 +319,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 12 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -339,7 +329,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 13 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 18 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -385,10 +375,30 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: 6, z: 0} + - first: {x: -8, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 5 + m_TileIndex: 8 + m_TileSpriteIndex: 13 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 2 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 m_TileSpriteIndex: 3 m_TileMatrixIndex: 2 m_TileColorIndex: 0 @@ -398,8 +408,8 @@ Tilemap: - first: {x: -4, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 4 - m_TileSpriteIndex: 2 + m_TileIndex: 41 + m_TileSpriteIndex: 41 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -408,8 +418,8 @@ Tilemap: - first: {x: -3, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 3 - m_TileSpriteIndex: 1 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -419,7 +429,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 2 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 2 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -475,16 +485,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: 7, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 6 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -1, y: 7, z: 0} second: serializedVersion: 2 @@ -514,9 +514,9 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 83c4b5c87f0fc6041aa84bec17b0ba96, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: de0da1b32039d8c47a1fac19dca06dfd, type: 2} + m_Data: {fileID: 11400000, guid: ce1bdc952b6e7c94b9b8357c51bf797c, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: ccc69a668b99a2c4d9df39f06de9356c, type: 2} + m_Data: {fileID: 11400000, guid: 608160a2cb3f36147846f785b145706f, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2992134453a6ee9438cbaefb421df2a5, type: 2} - m_RefCount: 1 @@ -524,7 +524,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 408ed7921ea5cd349b8139d956b039c3, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 608160a2cb3f36147846f785b145706f, type: 2} + m_Data: {fileID: 11400000, guid: ccc69a668b99a2c4d9df39f06de9356c, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: ba2a568fb0b1d7343990792a3f94611f, type: 2} - m_RefCount: 1 @@ -576,7 +576,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 5e20722eb5a14d541a883ae6b814d959, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: ce1bdc952b6e7c94b9b8357c51bf797c, type: 2} + m_Data: {fileID: 11400000, guid: de0da1b32039d8c47a1fac19dca06dfd, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: f3a8749ad16142e4eb6238e1dec9744e, type: 2} - m_RefCount: 1 @@ -592,20 +592,20 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 85de75962b9d082458d8c0ee1bcb5701, type: 2} m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 - m_Data: {fileID: -7942416386050951872, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -5326141136139767430, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 273879184105483932, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 6305001539380983403, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -3558780021574804381, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -103271942643739679, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -7566060138666255044, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: 4228440405271853654, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -7942416386050951872, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -8521826306073999734, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -617,9 +617,9 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -1039700332371458674, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -9139008751814321509, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 4228440405271853654, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: 4568356793979889031, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 273879184105483932, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -6230219710624029089, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -629,9 +629,9 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -5719356691628346840, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: 2514963777356231920, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 4568356793979889031, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -6001697971818802755, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -9139008751814321509, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -2961456314115940528, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -641,9 +641,9 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -6906180668185743109, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -5606420013504265295, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -6001697971818802755, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: 324862578571705095, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 2514963777356231920, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: 8105675743699643353, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -655,13 +655,13 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 2387449198960282751, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -1301010405072374266, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 324862578571705095, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -6372375123409887586, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -5606420013504265295, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: 2886372406120980275, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: 6305001539380983403, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 - m_Data: {fileID: -3558780021574804381, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + m_Data: {fileID: -5326141136139767430, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: 5757036725632424348, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -739,8 +739,8 @@ Tilemap: m_Data: {fileID: 0} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -6, y: -3, z: 0} - m_Size: {x: 14, y: 12, z: 1} + m_Origin: {x: -8, y: -3, z: 0} + m_Size: {x: 16, y: 12, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -801,14 +801,14 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.7950001, y: 1.2549999, z: 0} + m_ChunkCullingBounds: {x: 0.7950001, y: 1.4256251, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &2645672050300527322 +--- !u!114 &2403586544446495185 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset index 38e29a0..e462b74 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee2a75a261dc3c8b2c758b0b8eaefa4e24d99f7ca7b4d1475c906cfd3f349e8c +oid sha256:00ebc50e827fb82f30372c24bd12e6a4b2173d87ccd9541bb7f890f8367a224d size 1029 diff --git a/Assets/Art Assets/Tiles/Environment/Main Palette.prefab b/Assets/Art Assets/Tiles/Environment/Main Palette.prefab index 951f6cb..4ae457b 100644 --- a/Assets/Art Assets/Tiles/Environment/Main Palette.prefab +++ b/Assets/Art Assets/Tiles/Environment/Main Palette.prefab @@ -71,6 +71,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 - first: {x: -3, y: 1, z: 0} second: serializedVersion: 2 @@ -85,7 +95,27 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 + - first: {x: -2, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 + - first: {x: -1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 0 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -112,16 +142,16 @@ Tilemap: - {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: -6668061196424841238, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: 9092607584915671340, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - m_AnimationSpeed: 10 + m_AnimationSpeed: 20 m_AnimationTimeOffset: 0 m_IsLooping: 1 m_TileAssetArray: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 41dc0ce13e6dac749be38cdb2fd3f82c, type: 2} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 801e7deada1d1f74aa59f589a72283ba, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2d0fbfd998c41a54490519bec3c02a68, type: 2} - m_RefCount: 1 @@ -130,13 +160,15 @@ Tilemap: m_Data: {fileID: 11400000, guid: 074912d52a78cb14ead26e018f885e97, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d74d57b7ff7cf6f4abb145381fdcf614, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2} m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: -667873837454055024, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1039700332371458674, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1078892822073738303, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -145,8 +177,12 @@ Tilemap: m_Data: {fileID: 9092607584915671340, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - m_RefCount: 1 m_Data: {fileID: 7149751655148466542, guid: 907033fa4bb32a0429d4c09e84be38c5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -5763186658515932357, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_TileMatrixArray: - - m_RefCount: 4 + - m_RefCount: 7 m_Data: e00: 1 e01: 0 @@ -183,13 +219,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 5 + - m_RefCount: 8 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: -3, y: -1, z: 0} - m_Size: {x: 4, y: 3, z: 1} + m_Size: {x: 5, y: 4, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -301,7 +337,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &8641224787687036702 +--- !u!114 &5208258535334843641 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scenes/ParallaxTest.unity b/Assets/Scenes/ParallaxTest.unity index d72b0cb..f940c7e 100644 --- a/Assets/Scenes/ParallaxTest.unity +++ b/Assets/Scenes/ParallaxTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aeacc24ca98c94a30e390e37aa07773f4ad8a6202d71fa3044ac1fb26c074d58 -size 464125 +oid sha256:b4bbeb46e3c888f6ff8fde55a7482eb0192d11e2c8f6d3338c475c1e3e5769f9 +size 466481 From ad156071c65e8e561626c07f3ac699cf4650e22e Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 15:00:08 +1100 Subject: [PATCH 2/3] Added collider to death sprites --- Assets/Art Assets/Tiles/Environment/Death/Poison.asset | 2 +- Assets/Art Assets/Tiles/Environment/Death/Spikes.asset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Art Assets/Tiles/Environment/Death/Poison.asset b/Assets/Art Assets/Tiles/Environment/Death/Poison.asset index 00dd788..9698c2f 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Poison.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Poison.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57ee9c5b334424f0ec080808ba66c60e1558396400e3919261bc04991479db9c +oid sha256:26d48b195ab346b82a2d2352956909a8089228ff55f95e3bd641006b7433a596 size 943 diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset index e462b74..594c8db 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00ebc50e827fb82f30372c24bd12e6a4b2173d87ccd9541bb7f890f8367a224d +oid sha256:8d3de62af4f63e8faf7d11c4975ce1611a2ad187657d33aac30866e690a7a483 size 1029 From 8326b80e09d27967e901a39a8926f6e9a099588d Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 15:01:38 +1100 Subject: [PATCH 3/3] Changed animation speed of spike --- Assets/Art Assets/Tiles/Environment/Death/Spikes.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset index 594c8db..5eaabef 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d3de62af4f63e8faf7d11c4975ce1611a2ad187657d33aac30866e690a7a483 +oid sha256:7115e8cfd7fc0cb5474dba5a48e8ac07a96c34eefd9aa2fd259bc0db4b26232f size 1029