diff --git a/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab b/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab
index 5a8ba31a38a2fa789d0696c5be2b04af70c54728..e2c9f9371206b06e75cfc9eafa53f91ea6c84245 100644
--- a/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_village 2.prefab
@@ -1,5 +1,89 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &64193931878398167
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5092339343526241949}
+ - component: {fileID: 6064634581401948150}
+ - component: {fileID: 2008773704537377639}
+ m_Layer: 0
+ m_Name: BuissonHitbox
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5092339343526241949
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 64193931878398167}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -4.47, y: 10.53, 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 &6064634581401948150
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 64193931878398167}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: -0.07452822, y: -1.9675462}
+ 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: 0.85094357, y: 4.9350924}
+ m_EdgeRadius: 0
+--- !u!61 &2008773704537377639
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 64193931878398167}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 1.9377353, y: 0.0521698}
+ 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: 4.8754697, y: 0.8956604}
+ m_EdgeRadius: 0
--- !u!1 &1755158007606780204
GameObject:
m_ObjectHideFlags: 0
@@ -33,6 +117,7 @@ Transform:
- {fileID: 7175028150327628597}
- {fileID: 7760992791977896690}
- {fileID: 3388564004559277796}
+ - {fileID: 5092339343526241949}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -441,22 +526,112 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
+ - first: {x: -5, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 2
+ m_TileSpriteIndex: 2
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
+ - first: {x: -5, y: 7, 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
+ - first: {x: -5, y: 8, 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
+ - first: {x: -5, y: 9, 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
+ - first: {x: -5, y: 10, 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: -4, y: 10, 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: 10, 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: -2, y: 10, 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: -1, y: 10, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 3
+ m_TileSpriteIndex: 3
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ dummyAlignment: 0
+ m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- 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: 10b4ddad8f003c144a34331846fd4e4b, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: 41336952bf509194b9a20f320394bf2d, type: 2}
+ - m_RefCount: 3
+ m_Data: {fileID: 11400000, guid: 8e3f54c84ea263d4493d64144259ca6e, type: 2}
+ - m_RefCount: 3
+ m_Data: {fileID: 11400000, guid: ee6af69388351b04cbcb57315e86623a, type: 2}
+ - m_RefCount: 1
+ m_Data: {fileID: 11400000, guid: e828588eafdd04b499a85a136dfc57a1, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 64e3b9c0791df284bb1047422dc8686a, type: 2}
- m_RefCount: 3
@@ -470,16 +645,16 @@ 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: 1
+ m_Data: {fileID: -7587184469019722240, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 1
+ m_Data: {fileID: 3631006098854972704, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 3
+ m_Data: {fileID: -7142543008162911894, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 3
+ m_Data: {fileID: 4729288613715035985, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 1
+ m_Data: {fileID: 5022370260657363281, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 33517161544612487, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 3
@@ -489,7 +664,7 @@ Tilemap:
- m_RefCount: 6
m_Data: {fileID: 409294463304589203, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- - m_RefCount: 15
+ - m_RefCount: 24
m_Data:
e00: 1
e01: 0
@@ -508,13 +683,13 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 15
+ - m_RefCount: 24
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: -4, y: 0, z: 0}
- m_Size: {x: 14, y: 10, z: 1}
+ m_Origin: {x: -5, y: 0, z: 0}
+ m_Size: {x: 15, y: 11, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@@ -3309,16 +3484,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -5, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 28
- m_TileSpriteIndex: 44
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: -3, y: 6, z: 0}
second:
serializedVersion: 2
@@ -3449,16 +3614,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -5, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 35
- m_TileSpriteIndex: 32
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: -3, y: 7, z: 0}
second:
serializedVersion: 2
@@ -3549,16 +3704,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -5, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 35
- m_TileSpriteIndex: 32
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: -3, y: 8, z: 0}
second:
serializedVersion: 2
@@ -3659,16 +3804,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -5, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 35
- m_TileSpriteIndex: 32
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: 3, y: 9, z: 0}
second:
serializedVersion: 2
@@ -3689,76 +3824,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -5, y: 10, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 36
- m_TileSpriteIndex: 33
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -4, y: 10, z: 0}
- 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: -3, y: 10, z: 0}
- 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: 10, z: 0}
- 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: -1, y: 10, z: 0}
- 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: 0, y: 10, z: 0}
- 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: 1, y: 10, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 11
- m_TileSpriteIndex: 39
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: 3, y: 10, z: 0}
second:
serializedVersion: 2
@@ -3803,8 +3868,8 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 6c58b0cc0e17e7642885659bb3ca4102, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e48747f7cb1256343839004b7346f705, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 41336952bf509194b9a20f320394bf2d, type: 2}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 2e42db8f6a0452d45a5278e8f685c8d1, type: 2}
- m_RefCount: 1
@@ -3835,10 +3900,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 09fe0ffbf169f8c45903e915b54c48ce, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 22c340a3e1d46e74fb9a6c9f7a7ee34a, type: 2}
- - m_RefCount: 5
- m_Data: {fileID: 11400000, guid: ee6af69388351b04cbcb57315e86623a, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 10b4ddad8f003c144a34331846fd4e4b, type: 2}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 198254a478ebbf04e8071a2a2bddc3a3, type: 2}
- m_RefCount: 1
@@ -3851,10 +3916,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 0ab90e894f9f6f148b8c4b77a65b8d39, type: 2}
- - m_RefCount: 3
- m_Data: {fileID: 11400000, guid: 8e3f54c84ea263d4493d64144259ca6e, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: e828588eafdd04b499a85a136dfc57a1, type: 2}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d96b32e33a6cc534aadb9fb67452e775, type: 2}
- m_RefCount: 1
@@ -3984,8 +4049,8 @@ Tilemap:
m_Data: {fileID: -4978345626456028011, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -4921129201444693417, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 5
- m_Data: {fileID: 4729288613715035985, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 1628966389592354831, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
@@ -3994,10 +4059,10 @@ Tilemap:
m_Data: {fileID: 2924928888349640390, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 5496313406412214129, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 3
- m_Data: {fileID: -7142543008162911894, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 5022370260657363281, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -8868867864185837432, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
@@ -4008,8 +4073,8 @@ Tilemap:
m_Data: {fileID: 1337945571459511819, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -4047186976618406303, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 3631006098854972704, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 1829778442542560619, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
@@ -4018,8 +4083,8 @@ Tilemap:
m_Data: {fileID: 6677391079157347707, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -5552291726514319404, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -7587184469019722240, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ - m_RefCount: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -8072021949042689266, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
@@ -4079,7 +4144,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -7921517988886787588, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- - m_RefCount: 101
+ - m_RefCount: 90
m_Data:
e00: 1
e01: 0
@@ -4098,7 +4163,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 101
+ - m_RefCount: 90
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1