diff --git a/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab b/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab index e2a1f33..7d81f5e 100644 --- a/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab @@ -56,7 +56,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 8 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -91,7 +91,7 @@ Tilemap: - {fileID: 1879289358, guid: b1f2324bbcfb9c94e9a069e5ae17b372, type: 3} - {fileID: -1279302219, guid: b1f2324bbcfb9c94e9a069e5ae17b372, type: 3} - {fileID: -1220085075, guid: b1f2324bbcfb9c94e9a069e5ae17b372, type: 3} - m_AnimationSpeed: 5.0000005 + m_AnimationSpeed: 5 m_AnimationTimeOffset: 0 m_IsLooping: 1 - first: {x: 8, y: 9, z: 0} @@ -158,8 +158,6 @@ Tilemap: - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 1 - m_Data: {fileID: 1031434983, guid: 25bfb92bb3ba27445a4e799e687f13e8, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -170,6 +168,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1031434983, guid: 25bfb92bb3ba27445a4e799e687f13e8, type: 3} - m_RefCount: 3 m_Data: {fileID: -1220085075, guid: b1f2324bbcfb9c94e9a069e5ae17b372, type: 3} m_TileMatrixArray: @@ -785,7 +785,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -795,7 +795,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -992,6 +992,16 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 2 - first: {x: 8, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2 + - first: {x: 9, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1000,17 +1010,27 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 + - first: {x: 10, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2 - first: {x: 11, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 12, y: 1, z: 0} second: serializedVersion: 2 @@ -1025,7 +1045,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1065,7 +1085,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1075,7 +1095,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1085,7 +1105,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1095,7 +1115,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1105,7 +1125,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1145,7 +1165,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1195,7 +1215,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1205,27 +1225,27 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 10, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 11, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1285,7 +1305,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1325,7 +1345,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1335,7 +1355,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 18 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1365,7 +1385,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1385,7 +1405,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1395,7 +1415,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 22 + m_TileSpriteIndex: 20 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1405,7 +1425,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1415,7 +1435,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1425,7 +1445,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1435,7 +1455,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 22 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1445,7 +1465,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1455,7 +1475,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1465,7 +1485,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1485,7 +1505,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 26 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1495,7 +1515,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1505,7 +1525,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1525,7 +1545,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1545,7 +1565,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 26 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1585,7 +1605,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1595,7 +1615,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 22 + m_TileSpriteIndex: 20 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1605,7 +1625,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1615,7 +1635,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 28 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1625,7 +1645,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 18 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1645,7 +1665,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1665,7 +1685,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 26 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1715,7 +1735,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1735,7 +1755,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 29 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1765,7 +1785,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 30 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1785,7 +1805,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 29 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1795,7 +1815,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1805,7 +1825,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1825,7 +1845,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 32 + m_TileSpriteIndex: 30 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1845,7 +1865,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1855,7 +1875,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1885,7 +1905,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1905,7 +1925,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1925,7 +1945,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 26 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1935,7 +1955,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 28 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2025,7 +2045,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2065,7 +2085,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2075,7 +2095,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 33 + m_TileSpriteIndex: 32 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2085,7 +2105,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 34 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2095,7 +2115,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2105,7 +2125,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2125,7 +2145,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2135,7 +2155,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2155,7 +2175,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 29 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2175,7 +2195,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2205,7 +2225,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2245,7 +2265,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2265,7 +2285,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2285,7 +2305,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2305,7 +2325,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2315,7 +2335,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2335,7 +2355,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 32 + m_TileSpriteIndex: 30 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2355,7 +2375,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 29 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2365,7 +2385,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2375,7 +2395,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2395,7 +2415,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2435,7 +2455,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2475,7 +2495,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 26 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2495,7 +2515,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 23 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2535,7 +2555,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2545,7 +2565,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 18 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2555,7 +2575,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2565,7 +2585,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2585,7 +2605,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2595,7 +2615,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2605,7 +2625,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 30 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2625,17 +2645,17 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 2, y: 10, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 36 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2645,7 +2665,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2685,7 +2705,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 26 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2695,7 +2715,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 28 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2745,7 +2765,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2765,7 +2785,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2775,27 +2795,37 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 32 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741826 + - first: {x: 1, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2 - first: {x: 2, y: 11, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 3, y: 11, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 30 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2805,17 +2835,17 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 38 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 7, y: 11, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2825,7 +2855,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2835,12 +2865,12 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 42 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 12, y: 11, z: 0} second: serializedVersion: 2 @@ -2915,7 +2945,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2935,17 +2965,17 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 2, y: 12, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2955,27 +2985,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 30 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741826 - - first: {x: 6, y: 12, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741826 - - first: {x: 9, y: 12, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3015,7 +3025,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3055,7 +3065,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3095,7 +3105,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3155,7 +3165,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3165,7 +3175,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3175,7 +3185,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3185,7 +3195,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3195,7 +3205,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3235,7 +3245,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3285,7 +3295,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3325,7 +3335,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3365,7 +3375,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3385,7 +3395,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3395,7 +3405,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3405,7 +3415,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3415,7 +3425,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3425,7 +3435,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3465,7 +3475,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3475,7 +3485,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 34 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3485,7 +3495,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3495,7 +3505,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3555,7 +3565,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 26 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3615,7 +3625,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3635,7 +3645,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3685,7 +3695,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3765,7 +3775,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3825,7 +3835,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 29 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3845,7 +3855,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3865,7 +3875,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 18 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3885,7 +3895,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3905,7 +3915,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 29 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3915,7 +3925,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3925,7 +3935,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 34 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3935,7 +3945,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3945,7 +3955,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3965,7 +3975,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 30 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4045,7 +4055,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4055,7 +4065,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 17 + m_TileSpriteIndex: 34 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4085,7 +4095,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 18 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4105,7 +4115,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4145,7 +4155,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4185,7 +4195,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4245,7 +4255,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4255,7 +4265,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4265,7 +4275,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 19 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4285,7 +4295,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 26 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4295,27 +4305,27 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 11, y: 19, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 41 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 12, y: 19, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 36 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4325,7 +4335,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 13 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4385,7 +4395,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 29 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4405,7 +4415,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4502,6 +4512,26 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 2 - first: {x: 9, y: 20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2 + - first: {x: 10, y: 20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2 + - first: {x: 11, y: 20, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -4510,17 +4540,17 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 12, y: 20, z: 0} second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741826 + m_AllTileFlags: 2 - first: {x: 13, y: 20, z: 0} second: serializedVersion: 2 @@ -4545,7 +4575,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 14 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4585,7 +4615,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 16 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4605,7 +4635,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 15 + m_TileSpriteIndex: 16 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4615,7 +4645,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 29 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4625,7 +4655,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4635,7 +4665,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4645,7 +4675,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4655,7 +4685,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4665,7 +4695,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4675,7 +4705,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4685,7 +4715,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4695,7 +4725,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 22 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4705,7 +4735,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4715,7 +4745,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4725,7 +4755,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 4294967295 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4735,7 +4765,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 22 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4745,7 +4775,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 22 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4755,7 +4785,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 24 + m_TileSpriteIndex: 22 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4765,7 +4795,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4785,7 +4815,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4795,7 +4825,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 27 + m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4805,7 +4835,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4815,7 +4845,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 23 + m_TileSpriteIndex: 21 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4825,7 +4855,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 28 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -4833,7 +4863,7 @@ Tilemap: m_AllTileFlags: 2 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 414 + - m_RefCount: 417 m_Data: {fileID: 11400000, guid: 3bf889fffcdc4544090e3fb8e02fd00c, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -4846,84 +4876,86 @@ Tilemap: m_Data: {fileID: -1212925317, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: 2086526219, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 3 + - m_RefCount: 2 m_Data: {fileID: -1617382959, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 m_Data: {fileID: 1947968232, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 24 + - m_RefCount: 21 m_Data: {fileID: 1223661844, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 29 + - m_RefCount: 31 m_Data: {fileID: 1895070881, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 106 + - m_RefCount: 117 m_Data: {fileID: 1038634210, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 8 m_Data: {fileID: 1143411841, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 16 + - m_RefCount: 17 m_Data: {fileID: -1633097409, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 5 - m_Data: {fileID: -1306229042, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 1367345643, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 25 + m_Data: {fileID: -758189375, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: 870921787, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 9 + - m_RefCount: 10 m_Data: {fileID: -425432116, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 18 + - m_RefCount: 21 m_Data: {fileID: -1247928558, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 18 + - m_RefCount: 17 m_Data: {fileID: 1201761793, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 23 - m_Data: {fileID: -758189375, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 6 - m_Data: {fileID: -1297897280, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 7 - m_Data: {fileID: -1379067211, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 6 - m_Data: {fileID: -778114124, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 + m_Data: {fileID: -778114124, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 4 m_Data: {fileID: 784309187, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 m_Data: {fileID: 868016625, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: -1745480320, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 15 + - m_RefCount: 16 m_Data: {fileID: -1111762046, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 m_Data: {fileID: 799554338, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 m_Data: {fileID: 353936658, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 4 + - m_RefCount: 3 m_Data: {fileID: -9699576, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 8 + - m_RefCount: 7 m_Data: {fileID: 1703128312, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 4 - m_Data: {fileID: -1397830764, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + m_Data: {fileID: -1306229042, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 4 - m_Data: {fileID: 1367345643, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + m_Data: {fileID: -1397830764, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 5 m_Data: {fileID: 710447926, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 4 m_Data: {fileID: 688078644, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: -105402510, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 1 + - m_RefCount: 5 + m_Data: {fileID: -1379067211, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 2 m_Data: {fileID: -1928749496, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 3 m_Data: {fileID: -587368257, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 5 + m_Data: {fileID: -1297897280, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: -1634732281, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 4 + - m_RefCount: 2 m_Data: {fileID: -126415766, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: 1597490741, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: -648507356, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 2 m_Data: {fileID: -511262960, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - m_RefCount: 1 m_Data: {fileID: 1443672434, guid: 54d3af22d726aa240b750d754c66f647, type: 3} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 1266619107, guid: 54d3af22d726aa240b750d754c66f647, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1204845086, guid: 54d3af22d726aa240b750d754c66f647, type: 3} m_TileMatrixArray: - - m_RefCount: 414 + - m_RefCount: 417 m_Data: e00: 1 e01: 0 @@ -4942,13 +4974,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 414 + - m_RefCount: 417 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: -13, y: -18, z: 0} - m_Size: {x: 35, y: 40, z: 1} + m_Size: {x: 35, y: 41, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: diff --git a/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab b/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab index 6673a17..7ba4d23 100644 --- a/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab +++ b/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab @@ -17,24 +17,20 @@ PrefabInstance: objectReference: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} propertyPath: serializationData.PrefabModifications.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[0] value: '"path":"PowerUpAsset","value":$eref:0' objectReference: {fileID: 0} - - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[0] - value: - objectReference: {fileID: 11400000, guid: d3ed7aaaedc3c98478ad10d2db099e8f, type: 2} - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] value: - objectReference: {fileID: 11400000, guid: d3ed7aaaedc3c98478ad10d2db099e8f, type: 2} + objectReference: {fileID: 11400000, guid: c158dc5e8149ab741b5bf4f89ce25271, type: 2} - target: {fileID: 2639209785973192634, guid: b72762d7ea434154d8aab014f955da1d, type: 3} propertyPath: m_Name value: powerup_max_health diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab index d9b289d..83b7dfc 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab @@ -179,6 +179,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab index 111c250..db6f9b0 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab @@ -1180,7 +1180,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1904067099 m_SortingLayer: 13 - m_SortingOrder: 1 + m_SortingOrder: 0 m_Sprite: {fileID: -1837112578, guid: 493fa09564f0f994aafb3d5bf7c7e8d2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab index 0366663..1a0cbdf 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab @@ -171,6 +171,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab index 1e37363..0ee56fd 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab @@ -179,6 +179,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab index 7a36af8..f5cecf3 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab @@ -175,6 +175,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -1037328344, guid: 4bb96e39a9daa4843afd7d748df107c1, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab index 6856dcc..b4e2f18 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab @@ -195,6 +195,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab index 699f130..d7201e3 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab @@ -179,6 +179,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab index 43131a1..f161c5f 100644 --- a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab +++ b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab @@ -175,6 +175,26 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: -773796276, guid: 93863b3a51967164c88f0ce201344566, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"ExplosionPrefab","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3} - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3} propertyPath: serializationData.Prefab value: diff --git a/TanksOnAPlain/Assets/Prefabs/game.prefab b/TanksOnAPlain/Assets/Prefabs/game.prefab index 4715ec3..b817f5d 100644 --- a/TanksOnAPlain/Assets/Prefabs/game.prefab +++ b/TanksOnAPlain/Assets/Prefabs/game.prefab @@ -2510,7 +2510,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6461293533356927379} m_Father: {fileID: 4833224386585719560} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2530,15 +2531,196 @@ MonoBehaviour: SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: - - {fileID: 11400000, guid: 6fdc40c01f95d174da90c346f1638f87, type: 2} + - {fileID: 4472856794074153120, guid: 97753afdfd0e1954bb7a5ebf0d15c9e1, type: 3} + - {fileID: 4136862187117868514, guid: 186c16aee48d2934591f2da0206b70f7, type: 3} + - {fileID: 7005487724714998332, guid: 38825d59e19870c4d9c35b74eecdb038, type: 3} + - {fileID: 5135982904818416073, guid: 170963ac58467e94d869fdb6fc976169, type: 3} + - {fileID: 7005487724714998332, guid: 5609afde2dda8804784d3e2d9f7a9591, type: 3} + - {fileID: 6062020859922841093, guid: 116e5a31640d14e49b277652a1dc19b4, type: 3} + - {fileID: 429489426995876441, guid: 057356ae0c28aac4e8a15b8254fa0157, type: 3} + - {fileID: 5328066834422354929, guid: a3f1f51768881f44898dcb9c8acc9293, type: 3} + - {fileID: 5736488315374214953, guid: 67a0ecf837e736941ada33169a5c28f1, type: 3} + - {fileID: 2173118636728541576} SerializedBytesString: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: - - Name: PoolAsset + - Name: Pools + Entry: 7 + Data: 0|System.Collections.Generic.List`1[[TanksOnAPlain.Unity.Components.Pooling.Pool, + TanksOnAPlain.Unity]], mscorlib + - Name: + Entry: 12 + Data: 9 + - Name: + Entry: 7 + Data: 1|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 0 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 10 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 2|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 1 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 10 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 3|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 2 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 3 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 4|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 3 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 5 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 5|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 4 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 5 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 6|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 5 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 5 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 7|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 6 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 5 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 8|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab Entry: 10 + Data: 7 + - Name: PoolObject + Entry: 6 + Data: + - Name: ActiveObjectLimit + Entry: 3 + Data: 3 + - Name: HasLimit + Entry: 5 + Data: true + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 9|TanksOnAPlain.Unity.Components.Pooling.Pool, TanksOnAPlain.Unity + - Name: Prefab + Entry: 10 + Data: 8 + - Name: PoolObject + Entry: 10 + Data: 9 + - Name: ActiveObjectLimit + Entry: 3 Data: 0 + - Name: HasLimit + Entry: 5 + Data: false + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: --- !u!1 &1050167120074286016 GameObject: m_ObjectHideFlags: 0 @@ -3291,6 +3473,64 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2173118636728541576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6461293533356927379} + - component: {fileID: 8637475956646230716} + m_Layer: 0 + m_Name: pool_floating_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6461293533356927379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173118636728541576} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 639860841367389525} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8637475956646230716 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173118636728541576} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 1904067099 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &2293026434942343257 GameObject: m_ObjectHideFlags: 0 @@ -4638,7 +4878,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 1904067099 + m_SortingLayerID: -765853741 m_SortingOrder: 2 m_TargetDisplay: 0 --- !u!114 &1234383458 diff --git a/TanksOnAPlain/Assets/Scenes/game.unity b/TanksOnAPlain/Assets/Scenes/game.unity index b0c8d41..20865f1 100644 --- a/TanksOnAPlain/Assets/Scenes/game.unity +++ b/TanksOnAPlain/Assets/Scenes/game.unity @@ -123,61 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &160838860 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3249398734619787500, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &854051830 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4852156189161831289, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1073933951 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5557064452863125659, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1262410286 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5438152035367814, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!225 &1776847266 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 1776847266, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} ---- !u!225 &1894456639 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 8961135151394003333, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1897863734 +--- !u!1001 &471870162 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -192,50 +138,26 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 135566853, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - - target: {fileID: 135566853, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 135566853, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[0] - value: '"path":"Text","value":$eref:0' - objectReference: {fileID: 0} - - target: {fileID: 135566853, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 135566853, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] - value: - objectReference: {fileID: 1262410286} - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[0] - value: '"path":"CanvasGroupsToHide.[0]","value":$eref:0' - objectReference: {fileID: 0} - - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[1] - value: '"path":"CanvasGroupsToShow.[0]","value":$eref:1' + value: '"path":"CanvasGroupStartScreen","value":$eref:0' objectReference: {fileID: 0} - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] value: - objectReference: {fileID: 1894456639} - - target: {fileID: 1234383458, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[1] - value: - objectReference: {fileID: 1776847266} + objectReference: {fileID: 1559359407} - target: {fileID: 1352092982, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.Prefab value: @@ -364,6 +286,22 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 2057472595619769373, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + - target: {fileID: 2057472595619769373, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + propertyPath: serializationData.PrefabModifications.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2057472595619769373, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + propertyPath: serializationData.PrefabModifications.Array.data[0] + value: '"path":"Pools.[8].PoolObject","value":$eref:0' + objectReference: {fileID: 0} + - target: {fileID: 2057472595619769373, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2057472595619769373, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] + value: + objectReference: {fileID: 518769261} - target: {fileID: 2237127148476234993, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -638,146 +576,44 @@ PrefabInstance: objectReference: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.size - value: 13 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[0] - value: '"path":"SkillToPanel","add_keys":{"$id":0,"$type":"System.Object[], - mscorlib","$rlength":6,"$rcontent":[{"$id":1,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",2},{"$id":2,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",3},{"$id":3,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",4},{"$id":4,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",5},{"$id":5,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",6},{"$id":6,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",7}]},"remove_keys":{"$id":7,"$type":"System.Object[], - mscorlib","$rlength":2,"$rcontent":[{"$id":8,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",10},{"$id":9,"$type":"WorkingTitle.Unity.Components.SkillType, - WorkingTitle.Unity",11}]}' + value: '"path":"TextDamageDone","value":$eref:0' objectReference: {fileID: 0} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[1] - value: '"path":"SkillToPanel.{0es}","value":$eref:0' + value: '"path":"TextDamageHealed","value":$eref:1' objectReference: {fileID: 0} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[2] - value: '"path":"SkillToPanel.{1es}","value":$eref:1' + value: '"path":"TextDamageTaken","value":$eref:2' objectReference: {fileID: 0} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[3] - value: '"path":"SkillToPanel.{2es}","value":$eref:2' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[4] - value: '"path":"SkillToPanel.{3es}","value":$eref:3' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[5] - value: '"path":"SkillToPanel.{4es}","value":$eref:4' + value: '"path":"TextKills","value":$eref:3' objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[6] - value: '"path":"SkillToPanel.{5es}","value":$eref:5' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[7] - value: '"path":"SkillToPanel.{6es}","value":$eref:6' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[8] - value: '"path":"SkillToPanel.{7es}","value":$eref:7' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[9] - value: '"path":"TextDamageDone","value":$eref:8' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[10] - value: '"path":"TextDamageHealed","value":$eref:9' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[11] - value: '"path":"TextDamageTaken","value":$eref:10' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModifications.Array.data[12] - value: '"path":"TextKills","value":$eref:11' - objectReference: {fileID: 0} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[2] - value: - objectReference: {fileID: 1897863741} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[3] - value: - objectReference: {fileID: 1897863739} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[4] - value: - objectReference: {fileID: 1897863740} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[5] - value: - objectReference: {fileID: 1897863738} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[6] - value: - objectReference: {fileID: 1897863735} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[7] - value: - objectReference: {fileID: 1897863736} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size - value: 12 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] value: - objectReference: {fileID: 1897863737} + objectReference: {fileID: 1018962234} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[1] value: - objectReference: {fileID: 1897863742} + objectReference: {fileID: 1823801075} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[2] value: - objectReference: {fileID: 1897863741} + objectReference: {fileID: 1120197707} - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[3] value: - objectReference: {fileID: 1897863739} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[4] - value: - objectReference: {fileID: 1897863740} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[5] - value: - objectReference: {fileID: 1897863738} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[6] - value: - objectReference: {fileID: 1897863735} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[7] - value: - objectReference: {fileID: 1897863736} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[8] - value: - objectReference: {fileID: 2110785181} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[9] - value: - objectReference: {fileID: 1073933951} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[10] - value: - objectReference: {fileID: 854051830} - - target: {fileID: 4612312275213744080, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[11] - value: - objectReference: {fileID: 160838860} + objectReference: {fileID: 1487445858} - target: {fileID: 4833224386585719560, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} propertyPath: m_RootOrder value: 0 @@ -1128,50 +964,53 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} ---- !u!1 &1897863735 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 510452037312818905, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863736 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6746556057501599491, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863737 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6023914285512654226, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863738 stripped +--- !u!1 &518769261 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3756861807095846105, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} + m_CorrespondingSourceObject: {fileID: 2173118636728541576, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863739 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717738257640024703, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} +--- !u!114 &1018962234 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1475372451604810855, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863740 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6144645852046120505, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1120197707 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4852156189161831289, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863741 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7939424687666522643, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1487445858 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3249398734619787500, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} ---- !u!1 &1897863742 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2762100521096348602, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!225 &1559359407 stripped +CanvasGroup: + m_CorrespondingSourceObject: {fileID: 7789097820034847483, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} ---- !u!114 &2110785181 stripped +--- !u!114 &1823801075 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1475372451604810855, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} - m_PrefabInstance: {fileID: 1897863734} + m_CorrespondingSourceObject: {fileID: 5557064452863125659, guid: 9beed9b7014701149a6ceb0d613092df, type: 3} + m_PrefabInstance: {fileID: 471870162} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/TanksOnAPlain/Assets/TanksOnAPlain.Unity/Components/Pooling/PoolComponent.cs b/TanksOnAPlain/Assets/TanksOnAPlain.Unity/Components/Pooling/PoolComponent.cs index f147569..4b3de6d 100644 --- a/TanksOnAPlain/Assets/TanksOnAPlain.Unity/Components/Pooling/PoolComponent.cs +++ b/TanksOnAPlain/Assets/TanksOnAPlain.Unity/Components/Pooling/PoolComponent.cs @@ -13,7 +13,7 @@ namespace TanksOnAPlain.Unity.Components.Pooling public class PoolComponent : SerializedMonoBehaviour { [OdinSerialize] - List Pools { get; set; } = new(); + List Pools { get; set; } void Awake() { @@ -104,6 +104,11 @@ void OnObjectDestroyed(object sender, EventArgs e, GameObject prefab) void CreatePoolObject(Pool pool) { + if (!pool.Prefab) + { + Debug.Log("Penis"); + } + var poolObject = new GameObject($"pool_{pool.Prefab.name}"); poolObject.transform.SetParent(transform); diff --git a/TanksOnAPlain/ProjectSettings/TagManager.asset b/TanksOnAPlain/ProjectSettings/TagManager.asset index 72e1940..362bb13 100644 --- a/TanksOnAPlain/ProjectSettings/TagManager.asset +++ b/TanksOnAPlain/ProjectSettings/TagManager.asset @@ -81,3 +81,6 @@ TagManager: - name: UI uniqueID: 1904067099 locked: 0 + - name: SuperUI + uniqueID: 3529113555 + locked: 0