From 58c63d2044e46b6956ccd0acaee36df453a98d5e Mon Sep 17 00:00:00 2001 From: "nyvlemacul@gmail.com" <nyvlemacul@gmail.com> Date: Wed, 31 Mar 2021 09:49:47 +0200 Subject: [PATCH] correction hitbox buisson --- .../Prefabs/Parcelles/Melvyn_village 2.prefab | 242 ++++++-------- .../Prefabs/Parcelles/Melvyn_village.prefab | 310 +++++++++++------- 2 files changed, 285 insertions(+), 267 deletions(-) diff --git a/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab b/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab index e2c9f93..f42e593 100644 --- a/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab +++ b/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab @@ -173,27 +173,7 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2615463350671863606} m_Enabled: 1 - m_Tiles: - - first: {x: 3, y: 9, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 4, y: 9, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 9 - m_TileSpriteIndex: 9 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_Tiles: {} m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -214,10 +194,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 796ce058a29ef5e48a3b96cba135db81, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 6ae80f23191c00346ae7f70e26e39003, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -237,32 +217,32 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: -4830566443003231806, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -5332163973513142145, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 2 + - m_RefCount: 0 m_Data: - e00: 1 - e01: 0 - e02: 0 - e03: 0 + e00: 0 + e01: 4.812586e+20 + e02: 4.8122763e+20 + e03: 4.8122763e+20 e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 + e11: 8.5e-44 + e12: 8.5e-44 + e13: 8.5e-44 + e20: 7.4002914 + e21: 2.0683556 + e22: -0.0000000017785782 + e23: 2.0683556 + e30: 4.5905e-41 + e31: 6.61e-43 + e32: 6.59e-43 + e33: 6.61e-43 m_TileColorArray: - - m_RefCount: 2 - m_Data: {r: 1, g: 1, b: 1, a: 1} + - m_RefCount: 0 + m_Data: {r: 2.1477318, g: 2.1477318, b: 2.1477318, a: 2.1477318} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2721,6 +2701,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 3, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -2743,10 +2743,10 @@ Tilemap: 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: 1 + m_Data: {fileID: 11400000, guid: b9ae39cac0fc74c49b0fa52a89d540b8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 89ca7324c06ed154abe583a02891f968, type: 2} - m_RefCount: 1 @@ -2778,10 +2778,10 @@ Tilemap: 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: 1 + m_Data: {fileID: 6986815404043503449, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -8906023577757194684, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -2793,7 +2793,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 7493861431360142108, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_TileMatrixArray: - - m_RefCount: 5 + - m_RefCount: 7 m_Data: e00: 1 e01: 0 @@ -2812,13 +2812,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 5 + - m_RefCount: 7 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -3, y: 0, z: 0} - m_Size: {x: 12, y: 9, z: 1} + m_Size: {x: 12, y: 10, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -2948,7 +2948,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 33 - m_TileSpriteIndex: 10 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2988,7 +2988,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 31 - m_TileSpriteIndex: 9 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3048,7 +3048,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 9 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 44 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3168,7 +3168,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 5 + m_TileSpriteIndex: 39 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3178,7 +3178,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 4 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3248,7 +3248,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 3 - m_TileSpriteIndex: 12 + m_TileSpriteIndex: 32 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3368,7 +3368,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 1 - m_TileSpriteIndex: 11 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3378,7 +3378,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3734,26 +3734,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: 8, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 10 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 4, y: 8, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 31 - m_TileSpriteIndex: 9 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 5, y: 8, z: 0} second: serializedVersion: 2 @@ -3804,26 +3784,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: 9, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 3 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 4, y: 9, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 3, y: 10, z: 0} second: serializedVersion: 2 @@ -3866,8 +3826,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: 65d2a62637518ce4a8f735ff3c6d0070, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 6c58b0cc0e17e7642885659bb3ca4102, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: e48747f7cb1256343839004b7346f705, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 1 @@ -3908,14 +3868,14 @@ Tilemap: m_Data: {fileID: 11400000, guid: 198254a478ebbf04e8071a2a2bddc3a3, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 31e1876fd4471bb43885c1fbef064024, type: 2} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 11400000, guid: b9ae39cac0fc74c49b0fa52a89d540b8, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 7cba768e9b9c3324ba4842ea345b6186, type: 2} - - m_RefCount: 2 - m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 0ab90e894f9f6f148b8c4b77a65b8d39, type: 2} + m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -3995,32 +3955,32 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2eeacd78226b7a64eb1372faf62b5b63, type: 2} m_TileSpriteArray: - - m_RefCount: 1 - m_Data: {fileID: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -6878360640013506346, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -8752806148484585541, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 6118670343946064272, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, 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_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 8725674123217878092, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 2 m_Data: {fileID: 7808538442560958302, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 10 m_Data: {fileID: 2175128215781867153, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 2 + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 1 m_Data: {fileID: 6986815404043503449, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 2 - m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 1242996465418633367, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -4049,8 +4009,8 @@ Tilemap: m_Data: {fileID: -4978345626456028011, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -4921129201444693417, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 1628966389592354831, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -4059,10 +4019,10 @@ Tilemap: m_Data: {fileID: 2924928888349640390, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 5496313406412214129, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -8868867864185837432, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -4073,8 +4033,8 @@ Tilemap: m_Data: {fileID: 1337945571459511819, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -4047186976618406303, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 1829778442542560619, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -4083,8 +4043,8 @@ Tilemap: m_Data: {fileID: 6677391079157347707, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -5552291726514319404, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -6878360640013506346, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: -8072021949042689266, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -4144,7 +4104,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: -7921517988886787588, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_TileMatrixArray: - - m_RefCount: 90 + - m_RefCount: 86 m_Data: e00: 1 e01: 0 @@ -4163,7 +4123,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 90 + - m_RefCount: 86 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 diff --git a/Assets/Prefabs/Parcelles/Melvyn_village.prefab b/Assets/Prefabs/Parcelles/Melvyn_village.prefab index 7fd3dd0..d57c032 100644 --- a/Assets/Prefabs/Parcelles/Melvyn_village.prefab +++ b/Assets/Prefabs/Parcelles/Melvyn_village.prefab @@ -33,6 +33,7 @@ Transform: - {fileID: 7175028150327628597} - {fileID: 7760992791977896690} - {fileID: 3388564004559277796} + - {fileID: 8726516713972316486} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -99,6 +100,66 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 2, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 9 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 6 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -109,18 +170,18 @@ Tilemap: 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_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: 88db7256c29d7f34fb8b185c67c724af, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 9ff3c8f56af8fb04dabdd0db2e2111fd, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: b7a7c3de726376a4ab7f372e50ca01fc, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 0a984f5c6f703d24caff2ac18f813b76, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 54d2a5df1df6e2f428542273c0d2cb18, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e4da40d923ecb9b418586bd5426eb399, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 64e3b9c0791df284bb1047422dc8686a, type: 2} m_TileSpriteArray: @@ -132,22 +193,22 @@ Tilemap: 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_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: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3406689312018280875, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 33517161544612487, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_TileMatrixArray: - - m_RefCount: 1 + - m_RefCount: 7 m_Data: e00: 1 e01: 0 @@ -166,7 +227,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1 + - m_RefCount: 7 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -2731,7 +2792,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 26 - m_TileSpriteIndex: 26 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2801,7 +2862,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 20 - m_TileSpriteIndex: 20 + m_TileSpriteIndex: 32 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2821,7 +2882,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 19 - m_TileSpriteIndex: 19 + m_TileSpriteIndex: 31 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2831,27 +2892,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 27 - m_TileSpriteIndex: 27 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 2, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 3, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 32 - m_TileSpriteIndex: 32 + m_TileSpriteIndex: 30 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2911,7 +2952,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 25 - m_TileSpriteIndex: 25 + m_TileSpriteIndex: 29 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2921,27 +2962,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 17 - m_TileSpriteIndex: 18 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 2, y: 3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 31 - m_TileSpriteIndex: 31 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 3, y: 3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 30 - m_TileSpriteIndex: 30 + m_TileSpriteIndex: 28 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3007,26 +3028,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: 4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 29 - m_TileSpriteIndex: 29 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 3, y: 4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 28 - m_TileSpriteIndex: 28 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 5, y: 4, z: 0} second: serializedVersion: 2 @@ -3521,7 +3522,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 21 - m_TileSpriteIndex: 21 + m_TileSpriteIndex: 27 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -3625,18 +3626,18 @@ Tilemap: m_Data: {fileID: 11400000, guid: 109f496b5ff98fb459ab9f8733234219, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 3f8c3a1148f46b942a0792b1934e1cf3, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 88db7256c29d7f34fb8b185c67c724af, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 9ff3c8f56af8fb04dabdd0db2e2111fd, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: b7a7c3de726376a4ab7f372e50ca01fc, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 0a984f5c6f703d24caff2ac18f813b76, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 54d2a5df1df6e2f428542273c0d2cb18, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: e4da40d923ecb9b418586bd5426eb399, 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: 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: 667c665a14fb8434ca9e4e4a01c6800f, type: 2} - m_RefCount: 1 @@ -3736,38 +3737,38 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: -3371896872818193155, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 4072211229523600940, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -6061887058710475081, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -7530748250500542981, guid: bc9976c4741c33f4ba9c2692bab5979b, 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: 7 m_Data: {fileID: 8314597423796371094, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 2 m_Data: {fileID: -7142543008162911894, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 2 m_Data: {fileID: 3631006098854972704, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 - m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 8216330270177875515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 4479181887894498110, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: -7530748250500542981, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: -7614346443414394471, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: -3371896872818193155, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 1810263472398167305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 3406689312018280875, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: 4479181887894498110, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 3135611070465409670, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: 4072211229523600940, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: -6939985638536199428, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: -6061887058710475081, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 3753064910040944515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} + m_Data: {fileID: 8216330270177875515, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 m_Data: {fileID: 2519681813242796523, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} - m_RefCount: 1 @@ -3831,7 +3832,7 @@ Tilemap: - m_RefCount: 2 m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3} m_TileMatrixArray: - - m_RefCount: 84 + - m_RefCount: 78 m_Data: e00: 1 e01: 0 @@ -3850,7 +3851,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 84 + - m_RefCount: 78 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -3940,3 +3941,60 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 +--- !u!1 &8911140696345978855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8726516713972316486} + - component: {fileID: 7352476046474401848} + m_Layer: 0 + m_Name: CorrectHitbox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8726516713972316486 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8911140696345978855} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.02, y: 2.99, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4898574938548127473} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &7352476046474401848 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8911140696345978855} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.012878537, y: 0.3605951} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.8499739, y: 2.4938934} + m_EdgeRadius: 0 -- GitLab