diff --git a/Assets/Prefabs/Parcelles/Raffael_boutique.prefab b/Assets/Prefabs/Parcelles/Raffael_boutique.prefab
index 2cc40867fdb3e6793db8bb53b0ca55c5c84a2532..1b2b16060adcbe79a1bcf103fdc78cf7b7962ddf 100644
--- a/Assets/Prefabs/Parcelles/Raffael_boutique.prefab
+++ b/Assets/Prefabs/Parcelles/Raffael_boutique.prefab
@@ -46,7 +46,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 34
- m_TileSpriteIndex: 34
+ m_TileSpriteIndex: 64
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -56,7 +56,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 33
- m_TileSpriteIndex: 33
+ m_TileSpriteIndex: 63
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -66,7 +66,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 32
- m_TileSpriteIndex: 32
+ m_TileSpriteIndex: 62
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -76,7 +76,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 45
- m_TileSpriteIndex: 45
+ m_TileSpriteIndex: 61
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -86,7 +86,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 44
- m_TileSpriteIndex: 44
+ m_TileSpriteIndex: 60
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -96,7 +96,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 43
- m_TileSpriteIndex: 43
+ m_TileSpriteIndex: 59
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -106,7 +106,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 31
- m_TileSpriteIndex: 31
+ m_TileSpriteIndex: 58
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -116,7 +116,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 30
- m_TileSpriteIndex: 30
+ m_TileSpriteIndex: 57
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -126,7 +126,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 29
- m_TileSpriteIndex: 29
+ m_TileSpriteIndex: 56
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -136,7 +136,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 42
- m_TileSpriteIndex: 42
+ m_TileSpriteIndex: 55
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -146,7 +146,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 41
- m_TileSpriteIndex: 41
+ m_TileSpriteIndex: 54
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -156,7 +156,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 40
- m_TileSpriteIndex: 40
+ m_TileSpriteIndex: 45
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -166,7 +166,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 35
- m_TileSpriteIndex: 35
+ m_TileSpriteIndex: 44
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -176,7 +176,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 28
- m_TileSpriteIndex: 28
+ m_TileSpriteIndex: 43
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -186,7 +186,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 27
- m_TileSpriteIndex: 27
+ m_TileSpriteIndex: 42
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -196,57 +196,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 26
- m_TileSpriteIndex: 26
- 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: 64
- m_TileSpriteIndex: 64
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 4, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 63
- m_TileSpriteIndex: 63
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 4, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 62
- m_TileSpriteIndex: 62
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 4, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 61
- m_TileSpriteIndex: 61
- 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: 60
- m_TileSpriteIndex: 60
+ m_TileSpriteIndex: 41
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -262,56 +212,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -2, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 59
- m_TileSpriteIndex: 59
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 58
- m_TileSpriteIndex: 58
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 57
- m_TileSpriteIndex: 57
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 56
- m_TileSpriteIndex: 56
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 2, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 55
- m_TileSpriteIndex: 55
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: 3, y: 5, z: 0}
second:
serializedVersion: 2
@@ -362,16 +262,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: 2, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 54
- m_TileSpriteIndex: 54
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- first: {x: 5, y: 6, z: 0}
second:
serializedVersion: 2
@@ -396,7 +286,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 39
- m_TileSpriteIndex: 39
+ m_TileSpriteIndex: 40
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -426,7 +316,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 38
- m_TileSpriteIndex: 38
+ m_TileSpriteIndex: 39
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -456,7 +346,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 37
- m_TileSpriteIndex: 37
+ m_TileSpriteIndex: 38
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -506,7 +396,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 36
- m_TileSpriteIndex: 36
+ m_TileSpriteIndex: 37
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@@ -622,28 +512,28 @@ Tilemap:
m_Data: {fileID: 11400000, guid: a6e3a94bb3aadbf40b8959a34021b5b0, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b176acae0bc3109418add589a16fd129, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 2feeade9ed9976e48b822085d5d827b8, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 68349d22883488c4581226a3fa1214cf, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 8a52b442b84535d4bb2db35e06d9156e, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: ad2d45d5a5b510a4da6d8fc54936a340, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: ec569854d56c59b40a8c5074714917f1, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 2d91f2cad1fe7454798f6e7920a548f2, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 292da41a7403a7f47b396c628ecd78cd, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 3cd944384e1d46945a26fb5cb571348f, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 1b7610c45e8667e45978a4c377a8f206, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: bd3053137d5911e46ad942444a9d4256, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: e3710c08d508cfc4798bf7301f58dff4, 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: 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_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
@@ -697,26 +587,28 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- - m_RefCount: 1
- m_Data: {fileID: 3401983206835477626, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -3613557855869523054, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -6470847053032588149, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 4838231503384043685, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -4583860686536256425, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -7360851500141600946, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 4070598577067388783, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -2341648984833589494, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -1398866925657569088, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -2758789277648346673, 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: 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: -3371896872818193155, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
@@ -726,17 +618,15 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -6061887058710475081, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -6714230475074417111, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 1102175699243514126, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 3401983206835477626, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -7282625592518153636, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -3613557855869523054, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 3821649870435707686, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -6470847053032588149, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 5852312559442838046, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -2758789277648346673, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 747059703267576056, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -6714230475074417111, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 6
m_Data: {fileID: 6354402864646581191, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 4
@@ -754,29 +644,29 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 4360432098798582241, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -6550959498412151734, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 1102175699243514126, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 7606674064434611518, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -7282625592518153636, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 2789283966239145305, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 4838231503384043685, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -7404526040674645312, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -4583860686536256425, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -318872977437660010, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -7360851500141600946, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -1205318767481340137, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 3821649870435707686, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -6571400603264071152, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 5852312559442838046, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -7652852909243116191, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 747059703267576056, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 1779067805982881805, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: 4070598577067388783, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: -7473974625388153113, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -2341648984833589494, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
- m_Data: {fileID: 5419597292096604959, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
+ m_Data: {fileID: -1398866925657569088, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- - m_RefCount: 47
+ - m_RefCount: 36
m_Data:
e00: 1
e01: 0
@@ -795,7 +685,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 47
+ - m_RefCount: 36
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
@@ -2399,77 +2289,47 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -1, y: 8, z: 0}
+ - first: {x: 2, y: 8, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 3
- m_TileSpriteIndex: 3
+ m_TileIndex: 0
+ m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: 0, y: 8, z: 0}
+ - first: {x: 3, y: 8, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 3
- m_TileSpriteIndex: 3
+ m_TileIndex: 16
+ m_TileSpriteIndex: 17
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: 1, y: 8, z: 0}
+ - first: {x: 4, y: 8, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 3
- m_TileSpriteIndex: 3
+ m_TileIndex: 2
+ m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: 2, y: 8, z: 0}
+ - first: {x: 5, y: 8, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 0
- m_TileSpriteIndex: 0
+ m_TileIndex: 8
+ m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: 3, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 16
- m_TileSpriteIndex: 17
- 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: 2
- m_TileSpriteIndex: 2
- 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: 8
- m_TileSpriteIndex: 8
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 6, y: 8, z: 0}
+ - first: {x: 6, y: 8, z: 0}
second:
serializedVersion: 2
m_TileIndex: 8
@@ -2817,7 +2677,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 2d40c5a446238d943a8b7d8c280738b0, type: 2}
- m_RefCount: 11
m_Data: {fileID: 11400000, guid: 09c22dc0aeb47aa489cd93a58825582d, type: 2}
- - m_RefCount: 21
+ - m_RefCount: 18
m_Data: {fileID: 11400000, guid: 074f120da0d06ec4582fe5cb469d95ec, type: 2}
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 0f9590955a9b7124b9da1d05efe6935b, type: 2}
@@ -2856,7 +2716,7 @@ Tilemap:
m_Data: {fileID: 8899647166731993134, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 11
m_Data: {fileID: -1775735504993857005, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 21
+ - m_RefCount: 18
m_Data: {fileID: 8144699696999271006, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
@@ -2889,7 +2749,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 3255367198055861555, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- - m_RefCount: 165
+ - m_RefCount: 162
m_Data:
e00: 1
e01: 0
@@ -2908,7 +2768,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 165
+ - m_RefCount: 162
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
@@ -3517,264 +3377,54 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- - first: {x: -1, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 19
- m_TileSpriteIndex: 22
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 5, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 20
- m_TileSpriteIndex: 21
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -2, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 10
- m_TileSpriteIndex: 20
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 9
- m_TileSpriteIndex: 19
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 8
- m_TileSpriteIndex: 10
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 6, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 7
- m_TileSpriteIndex: 9
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -2, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 22
- m_TileSpriteIndex: 8
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 21
- m_TileSpriteIndex: 7
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 4
- m_TileSpriteIndex: 6
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 3
- m_TileSpriteIndex: 5
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 2, y: 7, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 16
- m_TileSpriteIndex: 16
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -2, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 6
- m_TileSpriteIndex: 4
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 5
- m_TileSpriteIndex: 3
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 0
- m_TileSpriteIndex: 2
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 8, 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: 2, y: 8, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 17
- m_TileSpriteIndex: 17
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -2, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 12
- m_TileSpriteIndex: 12
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: -1, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 13
- m_TileSpriteIndex: 13
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 0, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 14
- m_TileSpriteIndex: 14
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 1, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 15
- m_TileSpriteIndex: 15
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
- - first: {x: 2, y: 9, z: 0}
- second:
- serializedVersion: 2
- m_TileIndex: 18
- m_TileSpriteIndex: 18
- m_TileMatrixIndex: 0
- m_TileColorIndex: 0
- m_TileObjectToInstantiateIndex: 65535
- dummyAlignment: 0
- m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 4edb85127d0c0d84894cd5eb75ccfd86, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 80b57bc7f1879b747a4a6c6a3dea34b5, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 672704509aeb60d498ed7ffd62d35744, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: faa829771b4c804488bb4841a128d575, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: b5f40bc147a7a044b95761e5022f2dc6, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 27e9d4653db1d15449c13a214f02059a, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: f546dd66cbd85da408219f5c92cfffeb, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: afa2be86b53242241a6b097e99243162, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: e599b133bfa380d48af0ab12bef4e845, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 293d27b3842a84e40baa261dfbee53af, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: ab4652fad54a50b4eaab3a68adfb3aba, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 657a1cb984037a541b7e7e065b0196e0, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 28b0a70b3f712e74092a87a48a56b820, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: b297103119ec9a24182b7acaaf34498d, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 57f68f22cba93914ea80cfa7efb1f11a, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: dcf19ebba638a2e4ba13211685bb206d, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 75286aacbdac0864bbb90a78e34010fa, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: d95a91c4370b0ce43a56ce68bc8fa4a3, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 5ea893e194181fc44b484025c0223143, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 625d087f949b36e43a4ae1e4d472cae1, type: 2}
- - m_RefCount: 1
- m_Data: {fileID: 11400000, guid: 145ad46a760b4ce49bad5696b72f5079, 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: 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: 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: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ca0c36de6391bc74caa7e6ee35bdf99e, type: 2}
m_TileSpriteArray:
@@ -3782,52 +3432,52 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- - m_RefCount: 1
- m_Data: {fileID: 629325371354903932, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 1141472184757475570, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -6558865070948955125, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -5634990515570739732, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -2085028118497592885, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 354054504467944110, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 5753218368160464045, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 7495883842154460746, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 2024445995149103190, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 4512834315536321620, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -5665453922479426850, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -2590025028910578065, guid: 5af5b1d45e9216046abb1e81842d9751, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -5345866606702214757, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -5755477333991734293, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 3275396102076339676, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -9150883278488253075, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -8482321996619687844, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 9182632162553372943, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -402968265167798129, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: 9014208036599442058, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- - m_RefCount: 1
- m_Data: {fileID: -6561020996012602876, 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: 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: 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: 0
+ m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -4880669222957850763, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- - m_RefCount: 22
+ - m_RefCount: 1
m_Data:
e00: 1
e01: 0
@@ -3846,7 +3496,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 22
+ - m_RefCount: 1
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
@@ -3976,10 +3626,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4496162406258023235}
m_Modifications:
+ - target: {fileID: -421924145509232575, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_SortingOrder
+ value: 250
+ objectReference: {fileID: 0}
- target: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_Name
value: Shop
objectReference: {fileID: 0}
+ - target: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: m_TagString
value: Shop
diff --git a/Assets/Prefabs/Shop.prefab b/Assets/Prefabs/Shop.prefab
index 4385bb0422d22b2994695793d107264ab795d17e..7d76b072976ca49475da241cb589c67b0b73c5fe 100644
--- a/Assets/Prefabs/Shop.prefab
+++ b/Assets/Prefabs/Shop.prefab
@@ -10,9 +10,10 @@ GameObject:
m_Component:
- component: {fileID: 6996933207471714739}
- component: {fileID: -421924145509232575}
- - component: {fileID: 6595684778732623722}
- component: {fileID: 968398465587571092}
- component: {fileID: 7898263680220245293}
+ - component: {fileID: 7608791072345640635}
+ - component: {fileID: 5198556420486054290}
m_Layer: 0
m_Name: Shop
m_TagString: Untagged
@@ -41,7 +42,7 @@ SpriteRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
- m_Enabled: 0
+ m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -85,20 +86,20 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!60 &6595684778732623722
-PolygonCollider2D:
+--- !u!61 &968398465587571092
+BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
- m_Enabled: 0
+ m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
+ m_Offset: {x: 0.28835773, y: -0.94067025}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
@@ -108,21 +109,24 @@ PolygonCollider2D:
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
- m_Points:
- m_Paths:
- - - {x: -0.875, y: 2.6875}
- - {x: -2.125, y: 2.625}
- - {x: -2.5, y: 2.5}
- - {x: -2.5, y: -2.6875}
- - {x: 2.5, y: -2.6875}
- - {x: 2.5, y: 2.5}
- - {x: 2.375, y: 2.6875}
- - - {x: -1.75, y: -0.125}
- - {x: -1.6875, y: -0.1875}
- - {x: 1.3125, y: -0.1875}
- - {x: 1.3125, y: -0.8125}
- - {x: -1.75, y: -0.8125}
---- !u!61 &968398465587571092
+ serializedVersion: 2
+ m_Size: {x: 6.1458454, y: 5.318905}
+ m_EdgeRadius: 0
+--- !u!114 &7898263680220245293
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 830773922753710147}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ sellItem: {fileID: 0}
+ itemForSale: []
+--- !u!61 &7608791072345640635
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -132,10 +136,10 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
- m_IsTrigger: 1
+ m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0, y: -2.7520308}
+ m_Offset: {x: -0.00000047683716, y: -1.9262341}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
@@ -146,20 +150,31 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 5, y: 2.1973512}
+ m_Size: {x: 4.7651043, y: 1.8437607}
m_EdgeRadius: 0
---- !u!114 &7898263680220245293
-MonoBehaviour:
+--- !u!61 &5198556420486054290
+BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 830773922753710147}
m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- inventory: {fileID: 0}
- sellItem: {fileID: 0}
- itemForSale: []
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 1.9183074, y: -0.325713}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 5, y: 6}
+ newSize: {x: 5, y: 6}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.9284899, y: 1.4400179}
+ m_EdgeRadius: 0
diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity
index 82014d3c464d276080e443c4d5a02cfb3ee048c0..4a05a87ba56f5635c571f32030aa3182de079a77 100644
--- a/Assets/Scenes/Valentin.unity
+++ b/Assets/Scenes/Valentin.unity
@@ -329,6 +329,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &302119348 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ m_PrefabInstance: {fileID: 919370876}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &461386753
GameObject:
m_ObjectHideFlags: 0
@@ -2356,6 +2361,11 @@ PrefabInstance:
objectReference: {fileID: 1829571093}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+--- !u!1 &1449272960 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ m_PrefabInstance: {fileID: 1692888187}
+ m_PrefabAsset: {fileID: 0}
--- !u!114 &1624355757 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9185901236199156311, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
@@ -18001,10 +18011,18 @@ PrefabInstance:
- target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: itemForSale.Array.data[0]
value:
+<<<<<<< HEAD
+ objectReference: {fileID: 1449272960}
+ - target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
+ propertyPath: itemForSale.Array.data[1]
+ value:
+ objectReference: {fileID: 302119348}
+=======
objectReference: {fileID: 1206561506436264884, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
- target: {fileID: 7898263680220245293, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
propertyPath: itemForSale.Array.data[1]
value:
objectReference: {fileID: 1206561506436264884, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+>>>>>>> 7912e26e9e8957cbbf687d8080e8bd1bae0cfc26
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf02b84eee26240d383747dfba5353dc, type: 3}
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index 3effd3c2211cc1f73c6f4b59b32083282bb4a1ac..7e0a29e0aa0be32733eaec93bf8f977a9b8c9e7d 100644
--- a/Assets/Scenes/sceneRaffael.unity
+++ b/Assets/Scenes/sceneRaffael.unity
@@ -157,6 +157,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 65fa0e7bd850f944ba64a58e5ceaf4e5, type: 3}
m_Name:
m_EditorClassIdentifier:
+ chaussures: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2}
+ baton: {fileID: 11400000, guid: efcf49924f9a75d4ca34174b60873d06, type: 2}
+ rechaud: {fileID: 11400000, guid: e217cd1973709d844bb97beb373c5447, type: 2}
+ tente: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2}
+ GO_chaussures: {fileID: 2774278137072603174, guid: cf11893c496404d8292ea5623a2a0f32, type: 3}
+ GO_baton: {fileID: 0}
+ GO_rechaud: {fileID: 0}
+ GO_tente: {fileID: 5026905876964516861, guid: 7bc98558919f34933bf9602e33e1bead, type: 3}
pVillage:
- {fileID: 1755158007606780204, guid: 97a340a9fc5ba2740b666b8014d03955, type: 3}
- {fileID: 1755158007606780204, guid: 162cd58adf4f4d047a4702715064d160, type: 3}
@@ -166,7 +174,6 @@ MonoBehaviour:
pUsine:
- {fileID: 1755158007606780204, guid: b9f8617378865674c91edd2902e37e9a, type: 3}
nb_of_plot: 8
- where: 0
--- !u!4 &237152199
Transform:
m_ObjectHideFlags: 0
@@ -7156,6 +7163,36 @@ Tilemap:
e31: 0
e32: 0
e33: 1
+--- !u!1 &1466266818
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1466266819}
+ m_Layer: 0
+ m_Name: Chaussures_border
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1466266819
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1466266818}
+ 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_Children: []
+ m_Father: {fileID: 1562290020}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1556478809
GameObject:
m_ObjectHideFlags: 0
@@ -7200,6 +7237,37 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1562290019
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1562290020}
+ m_Layer: 0
+ m_Name: Borders
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1562290020
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1562290019}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 13.907721, y: 53.40872, z: 24.306696}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1466266819}
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1636778422
GameObject:
m_ObjectHideFlags: 0
@@ -41855,7 +41923,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2041949052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -14.23, y: 38.66, z: -10}
+ m_LocalPosition: {x: -11.13, y: 39.12, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
diff --git a/Assets/Scripts/Game/GenerateMap.cs b/Assets/Scripts/Game/GenerateMap.cs
index 019dcc67e5270ca9a24ff3ddd1d1fdc9c80772c5..feb9f5e767ec0f274e30773055368a2df28fdee9 100644
--- a/Assets/Scripts/Game/GenerateMap.cs
+++ b/Assets/Scripts/Game/GenerateMap.cs
@@ -4,14 +4,23 @@ using UnityEngine;
public class GenerateMap : MonoBehaviour
{
+ public Item chaussures;
+ public Item baton;
+ public Item rechaud;
+ public Item tente;
+
+ public GameObject GO_chaussures;
+ public GameObject GO_baton;
+ public GameObject GO_rechaud;
+ public GameObject GO_tente;
public List<GameObject> pVillage = new List<GameObject>();
public List<GameObject> pBoutique = new List<GameObject>();
public List<GameObject> pUsine = new List<GameObject>();
public int nb_of_plot = 8;
-
public Object[,] plot=new Object[3,3];
- public int where;
+
+
//Les coordonées x dans l'ordre
private int[] xs=new int[]{-17,0,17}; //colonne
@@ -36,29 +45,63 @@ public class GenerateMap : MonoBehaviour
{
for(int y = 0; y<ys.Length; y++)
{
- plot[x,y] = Instantiate(pVillage[Random.Range(0, pVillage.Count)], new Vector3(xs[x], ys[y], 0), Quaternion.identity);
+ if(!(x==2 && y==2))
+ plot[x,y] = Instantiate(pVillage[Random.Range(0, pVillage.Count)], new Vector3(xs[x], ys[y], 0), Quaternion.identity);
}
}
}
- public void generateBoutique(int column, int line)
+ public void generateBoutique(int column, int line, string objetVente)
{
Destroy(plot[column, line]);
- plot[column, line] = Instantiate(pBoutique[Random.Range(0, pBoutique.Count)], new Vector3(xs[column], ys[line], 0), Quaternion.identity);
+
+ Item itemToSell = null;
+ GameObject goToSell = null;
+ switch (objetVente)
+ {
+ case "chaussure":
+ itemToSell = chaussures;
+ goToSell = GO_chaussures;
+ break;
+ case "baton":
+ itemToSell = baton;
+ goToSell = GO_baton;
+ break;
+ case "réchaud":
+ itemToSell = rechaud;
+ goToSell = GO_rechaud;
+ break;
+ case "tente":
+ itemToSell = tente;
+ goToSell = GO_tente;
+ break;
+ }
+ if (itemToSell && goToSell)
+ {
+ GameObject shop = Instantiate(pBoutique[Random.Range(0, pBoutique.Count)], new Vector3(xs[column], ys[line], 0), Quaternion.identity);
+
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().sellItem = itemToSell;
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().itemForSale.Add(goToSell);
+ plot[column, line] = shop;
+ }
+ else
+ Debug.LogError("Mauvais paramètre pour objetVente");
}
public void generateUsine(int column, int line)
{
Destroy(plot[column, line]);
plot[column, line] = Instantiate(pUsine[Random.Range(0, pUsine.Count)], new Vector3(xs[column], ys[line], 0), Quaternion.identity);
+
}
public void generateBoutiqueTest()
{
// COLONNE, LIGNE
- generateBoutique(0, 0);
+ generateBoutique(0, 0, "chaussure");
generateUsine(1, 0);
+ generateBoutique(0, 1, "tente");
}
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index 02688f57e16e72b3b437debae7baf7a355a2a25a..a978ea9afac0f921154767917576bd6a94b925b1 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -5,9 +5,9 @@ using UnityEngine;
public class Shopping : MonoBehaviour
{
private bool playerInRange;
- public Inventory inventory;
- public Item sellItem;
- public GameObject[] itemForSale;
+ public Item sellItem = null;
+ //public GameObject[] itemForSale = new GameObject[2];
+ public List<GameObject> itemForSale = new List<GameObject>();
// Start is called before the first frame update
void Start()
@@ -18,10 +18,10 @@ public class Shopping : MonoBehaviour
// Update is called once per frame
void Update()
{
- if (Input.GetKeyDown(KeyCode.E) && playerInRange)
+ if (Input.GetKeyDown(KeyCode.E) && playerInRange && sellItem && itemForSale.Count>0)
{
Dialog.instance.setSituation("Marchand");
- inventory.addItem(sellItem);
+ Inventory.instance.addItem(sellItem);
Destroy(itemForSale[0]);
Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire");
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index e3d9edbb39f9585c259ba05b6f79335e6a18076b..daa2006940f365b744a480bc1c7645298b5de275 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -3,7 +3,8 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
- tags: []
+ tags:
+ - Shop
layers:
- Default
- TransparentFX