From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Thu, 26 Aug 2021 14:34:38 +0000 (+0200) Subject: Maus rutscht nicht mehr auf abgerundeten Kanten X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=7c919d4ded94d427560f33b6361ad0e84ca7fda7;p=SuperMouseAdventure.git Maus rutscht nicht mehr auf abgerundeten Kanten --- diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity index 8817a71..79ec0b2 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -17470,13 +17470,13 @@ Tilemap: - first: {x: 6, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 7, y: -2, z: 0} second: serializedVersion: 2 @@ -18650,13 +18650,13 @@ Tilemap: - first: {x: -7, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: -6, y: -1, z: 0} second: serializedVersion: 2 @@ -18730,13 +18730,13 @@ Tilemap: - first: {x: 1, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 15, y: -1, z: 0} second: serializedVersion: 2 @@ -19840,13 +19840,13 @@ Tilemap: - first: {x: 15, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 16, y: 0, z: 0} second: serializedVersion: 2 @@ -20290,13 +20290,13 @@ Tilemap: - first: {x: 78, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 79, y: 0, z: 0} second: serializedVersion: 2 @@ -20930,13 +20930,13 @@ Tilemap: - first: {x: 17, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 18, y: 1, z: 0} second: serializedVersion: 2 @@ -20950,23 +20950,23 @@ Tilemap: - first: {x: 19, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 23, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 24, y: 1, z: 0} second: serializedVersion: 2 @@ -22130,13 +22130,13 @@ Tilemap: - first: {x: 54, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 55, y: 2, z: 0} second: serializedVersion: 2 @@ -22210,23 +22210,23 @@ Tilemap: - first: {x: 62, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 68, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 69, y: 2, z: 0} second: serializedVersion: 2 @@ -22290,23 +22290,23 @@ Tilemap: - first: {x: 75, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 81, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 82, y: 2, z: 0} second: serializedVersion: 2 @@ -22620,23 +22620,23 @@ Tilemap: - first: {x: 125, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 134, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 135, y: 2, z: 0} second: serializedVersion: 2 @@ -23340,13 +23340,13 @@ Tilemap: - first: {x: 122, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 144, y: 3, z: 0} second: serializedVersion: 2 @@ -23660,13 +23660,13 @@ Tilemap: - first: {x: 49, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 50, y: 4, z: 0} second: serializedVersion: 2 @@ -23680,23 +23680,23 @@ Tilemap: - first: {x: 51, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 83, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 84, y: 4, z: 0} second: serializedVersion: 2 @@ -23950,13 +23950,13 @@ Tilemap: - first: {x: 144, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 145, y: 4, z: 0} second: serializedVersion: 2 @@ -24460,13 +24460,13 @@ Tilemap: - first: {x: 117, y: 5, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 118, y: 5, z: 0} second: serializedVersion: 2 @@ -24490,13 +24490,13 @@ Tilemap: - first: {x: 120, y: 5, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 148, y: 5, z: 0} second: serializedVersion: 2 @@ -24740,13 +24740,13 @@ Tilemap: - first: {x: 44, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 45, y: 6, z: 0} second: serializedVersion: 2 @@ -24760,23 +24760,23 @@ Tilemap: - first: {x: 46, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 85, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 86, y: 6, z: 0} second: serializedVersion: 2 @@ -24850,23 +24850,23 @@ Tilemap: - first: {x: 93, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 104, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 105, y: 6, z: 0} second: serializedVersion: 2 @@ -24960,23 +24960,23 @@ Tilemap: - first: {x: 114, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 148, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 149, y: 6, z: 0} second: serializedVersion: 2 @@ -25180,13 +25180,13 @@ Tilemap: - first: {x: 39, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 40, y: 7, z: 0} second: serializedVersion: 2 @@ -25200,13 +25200,13 @@ Tilemap: - first: {x: 41, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 110, y: 7, z: 0} second: serializedVersion: 2 @@ -25410,13 +25410,13 @@ Tilemap: - first: {x: 110, y: 8, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 111, y: 8, z: 0} second: serializedVersion: 2 @@ -25440,13 +25440,13 @@ Tilemap: - first: {x: 152, y: 8, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 153, y: 8, z: 0} second: serializedVersion: 2 @@ -25540,13 +25540,13 @@ Tilemap: - first: {x: 30, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 31, y: 9, z: 0} second: serializedVersion: 2 @@ -25600,33 +25600,33 @@ Tilemap: - first: {x: 36, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 111, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 112, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 156, y: 9, z: 0} second: serializedVersion: 2 @@ -25690,13 +25690,13 @@ Tilemap: - first: {x: 156, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 19 - m_TileSpriteIndex: 11 + m_TileIndex: 22 + m_TileSpriteIndex: 17 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 2147483649 - first: {x: 157, y: 10, z: 0} second: serializedVersion: 2 @@ -25740,12 +25740,22 @@ Tilemap: - first: {x: 161, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 20 + m_TileIndex: 23 m_TileSpriteIndex: 25 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 157, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 24 + m_TileSpriteIndex: 27 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: @@ -25787,17 +25797,17 @@ Tilemap: m_Data: {fileID: 11400000, guid: 5d9981c3a7aa9ab458bd7f74335fb22f, type: 2} - m_RefCount: 88 m_Data: {fileID: 11400000, guid: 98be08eb8396a1449918c456ac8885a2, type: 2} - - m_RefCount: 24 - m_Data: {fileID: 11400000, guid: 05880403fd77b3a45b246436655f220d, type: 2} - - m_RefCount: 15 - m_Data: {fileID: 11400000, guid: 3ec95f4a24f59674c99c1afc6a38b27e, type: 2} - 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_RefCount: 24 + m_Data: {fileID: 11400000, guid: c26291a8c2f123a47a3ae3080e989a5b, type: 2} + - m_RefCount: 15 + m_Data: {fileID: 11400000, guid: 3ec95f4a24f59674c99c1afc6a38b27e, type: 2} + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 91b1c5122587df240b5af8bd9b0ab0d8, type: 2} m_TileSpriteArray: - m_RefCount: 0 @@ -25822,8 +25832,6 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 24 - m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -25836,6 +25844,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 24 + m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_RefCount: 63 m_Data: {fileID: 21300000, guid: 1ae35ac76a816f04b94077ba6e24f643, type: 3} - m_RefCount: 85 @@ -25854,10 +25864,10 @@ Tilemap: m_Data: {fileID: 21300000, guid: d7b29bc35d26f514bb0d2da96ae5641b, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: 1bc886c1b8090fd4ca62d245daf49cfc, type: 3} m_TileMatrixArray: - - m_RefCount: 1122 + - m_RefCount: 1123 m_Data: e00: 1 e01: 0 @@ -25876,7 +25886,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1122 + - m_RefCount: 1123 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 2.3626e-41, g: 2.3626e-41, b: 2.3626e-41, a: 2.3626e-41} @@ -25917,7 +25927,7 @@ Tilemap: - m_RefCount: 0 m_Data: {r: -7.18093e-40, g: -7.18093e-40, b: -7.18093e-40, a: -7.18093e-40} - m_RefCount: 0 - m_Data: {r: -1.080009e-39, g: -1.080009e-39, b: -1.080009e-39, a: -1.080009e-39} + m_Data: {r: 2.7045e-41, g: 2.7045e-41, b: 2.7045e-41, a: 2.7045e-41} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/2DGame/Assets/TilePalettes/ground_Palette.prefab b/2DGame/Assets/TilePalettes/ground_Palette.prefab index 0543358..c0e7a12 100644 --- a/2DGame/Assets/TilePalettes/ground_Palette.prefab +++ b/2DGame/Assets/TilePalettes/ground_Palette.prefab @@ -45,7 +45,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -55,7 +55,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 4 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -65,7 +65,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 5 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75,7 +75,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 6 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -85,7 +85,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 7 - m_TileSpriteIndex: 7 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -101,40 +101,40 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: -1, z: 0} + - first: {x: -1, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -1, y: 0, z: 0} + - first: {x: 0, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: 0, z: 0} + - first: {x: 1, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 13 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 1, y: 0, z: 0} + - first: {x: 0, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 9 + m_TileIndex: 12 m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 @@ -143,10 +143,10 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 05880403fd77b3a45b246436655f220d, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 3ec95f4a24f59674c99c1afc6a38b27e, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 98be08eb8396a1449918c456ac8885a2, type: 2} - m_RefCount: 1 @@ -161,8 +161,19 @@ Tilemap: m_Data: {fileID: 11400000, guid: 7201c7491cb7ead499f4b6a7610085cc, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 8fe54e2d05d80be45a0b9598f42f6a21, type: 2} + - 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: 11400000, guid: 91b1c5122587df240b5af8bd9b0ab0d8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 3ec95f4a24f59674c99c1afc6a38b27e, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c26291a8c2f123a47a3ae3080e989a5b, type: 2} + m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -173,37 +184,26 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - m_TileSpriteArray: - - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: d7b29bc35d26f514bb0d2da96ae5641b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: af326c0d8233f204f8d69acea50eca64, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 4fe3c54ee0ed656479fc9211d82c3d1b, type: 3} + m_Data: {fileID: 21300000, guid: 1ae35ac76a816f04b94077ba6e24f643, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 7cb5fd0de9fa05e4198e38e5c37b4c28, type: 3} + m_Data: {fileID: 21300000, guid: 1bc886c1b8090fd4ca62d245daf49cfc, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 1f3641f182896aa418b38ae1f461f06c, type: 3} + m_Data: {fileID: 21300000, guid: 1b34df7ecd962404584d4d97052a63f6, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300000, guid: ae35ce289d569994f87494fb21798d51, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 1b34df7ecd962404584d4d97052a63f6, type: 3} + m_Data: {fileID: 21300000, guid: 1f3641f182896aa418b38ae1f461f06c, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 1ae35ac76a816f04b94077ba6e24f643, type: 3} + m_Data: {fileID: 21300000, guid: 7cb5fd0de9fa05e4198e38e5c37b4c28, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300000, guid: 1bc886c1b8090fd4ca62d245daf49cfc, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + m_Data: {fileID: 21300000, guid: 4fe3c54ee0ed656479fc9211d82c3d1b, type: 3} m_TileMatrixArray: - m_RefCount: 10 m_Data: @@ -239,8 +239,8 @@ Tilemap: m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -1, y: -2, z: 0} - m_Size: {x: 6, y: 4, z: 1} + m_Origin: {x: -2, y: -2, z: 0} + m_Size: {x: 7, y: 4, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -352,7 +352,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &1043480376470183283 +--- !u!114 &4906410204629441377 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset b/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset new file mode 100644 index 0000000..35ef872 --- /dev/null +++ b/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ground_left_corner + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 2 diff --git a/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset.meta b/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset.meta new file mode 100644 index 0000000..a6c0b72 --- /dev/null +++ b/2DGame/Assets/Tiles/Ground Tilles/ground_left_corner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c26291a8c2f123a47a3ae3080e989a5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Tiles/Ground Tilles/ground_right_corner.asset b/2DGame/Assets/Tiles/Ground Tilles/ground_right_corner.asset index 1d99e81..ae33395 100644 --- a/2DGame/Assets/Tiles/Ground Tilles/ground_right_corner.asset +++ b/2DGame/Assets/Tiles/Ground Tilles/ground_right_corner.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 2 diff --git a/2DGame/Assets/Tiles/Ground Tilles/testTile.asset b/2DGame/Assets/Tiles/Ground Tilles/testTile.asset deleted file mode 100644 index 4ac4f66..0000000 --- a/2DGame/Assets/Tiles/Ground Tilles/testTile.asset +++ /dev/null @@ -1,36 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} - m_Name: testTile - m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Transform: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_InstancedGameObject: {fileID: 0} - m_Flags: 1 - m_ColliderType: 1 diff --git a/2DGame/Assets/Tiles/Ground Tilles/testTile.asset.meta b/2DGame/Assets/Tiles/Ground Tilles/testTile.asset.meta deleted file mode 100644 index b0949b4..0000000 --- a/2DGame/Assets/Tiles/Ground Tilles/testTile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05880403fd77b3a45b246436655f220d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: