Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (74)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6267 additions and 1920 deletions
Assets/Import/GUI/DialogueBOX.png 0 → 100644
View file @ db2bb2a1
Assets/Import/GUI/DialogueBOX.png

56.2 KiB

Assets/Import/GUI/DialogueBOX.png.meta 0 → 100644
View file @ db2bb2a1
fileFormatVersion: 2
guid: f1e9899a01d013548ac5427a5b87d4b4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Parcelles/Melvyn_usine.prefab
View file @ db2bb2a1
......@@ -2564,6 +2564,12 @@ GameObject:
- component: {fileID: 7816360445488083162}
- component: {fileID: 8376247504254189808}
- component: {fileID: 8637607911393538400}
- component: {fileID: 1933864240663410276}
- component: {fileID: 5288212702593820195}
- component: {fileID: 1940928644454368743}
- component: {fileID: 4324787868353405474}
- component: {fileID: 7288303223766463356}
- component: {fileID: 7227787236621319836}
m_Layer: 0
m_Name: hitboxed_r (1)
m_TagString: Untagged
......@@ -2594,17 +2600,17 @@ Tilemap:
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Tiles:
- first: {x: -4, y: 1, z: 0}
- first: {x: -2, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 66
m_TileSpriteIndex: 66
m_TileIndex: 72
m_TileSpriteIndex: 72
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: 1, z: 0}
- first: {x: -1, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 72
......@@ -2614,7 +2620,7 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: 1, z: 0}
- first: {x: 0, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 72
......@@ -2624,37 +2630,37 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: 1, z: 0}
- first: {x: -4, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 72
m_TileSpriteIndex: 72
m_TileIndex: 66
m_TileSpriteIndex: 66
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 7, y: 1, z: 0}
- first: {x: -2, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 70
m_TileSpriteIndex: 70
m_TileIndex: 71
m_TileSpriteIndex: 71
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 8, y: 1, z: 0}
- first: {x: -1, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileIndex: 71
m_TileSpriteIndex: 71
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: 2, z: 0}
- first: {x: 0, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 71
......@@ -2664,21 +2670,21 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: 2, z: 0}
- first: {x: 7, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 71
m_TileSpriteIndex: 71
m_TileIndex: 70
m_TileSpriteIndex: 70
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: 2, z: 0}
- first: {x: 8, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 71
m_TileSpriteIndex: 71
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
......@@ -3118,7 +3124,7 @@ TilemapRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_SortingOrder: 10000
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 5.918182, y: 3.1454546, z: 0}
m_MaxChunkCount: 16
......@@ -3134,7 +3140,7 @@ TilemapCollider2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
......@@ -3143,3 +3149,174 @@ TilemapCollider2D:
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
--- !u!60 &1933864240663410276
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
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
m_Points:
m_Paths:
- - {x: 3.6660576, y: 9.122704}
- {x: 3.5530653, y: 8.439775}
- {x: -3.8763113, y: 8.531229}
- {x: -3.9883065, y: 3.0671165}
- {x: -3.4750338, y: 3.013099}
- {x: -3.3913515, y: 2.754356}
- {x: -2.7299967, y: 2.7445886}
- {x: -2.7104638, y: 3.0866356}
- {x: 1.868619, y: 3.1552303}
- {x: 1.9019127, y: 1.849129}
- {x: 5.2754116, y: 1.9132527}
- {x: 5.2956047, y: 1.5887986}
- {x: 5.9935474, y: 1.5696659}
- {x: 6.040258, y: 3.5913074}
- {x: 8.970596, y: 3.563994}
- {x: 8.876309, y: 9.091518}
--- !u!61 &5288212702593820195
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.5043502, y: 0.5799885}
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: 2.903491, y: 1.1739099}
m_EdgeRadius: 0
--- !u!61 &1940928644454368743
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 8.000853, y: 1.6893884}
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.4741936, y: 1.576184}
m_EdgeRadius: 0
--- !u!61 &4324787868353405474
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -2.4767795, y: 10.473727}
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.97529507, y: 0.70825005}
m_EdgeRadius: 0
--- !u!61 &7288303223766463356
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -3.4994042, y: 1.4668549}
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.9298482, y: 0.7236769}
m_EdgeRadius: 0
--- !u!61 &7227787236621319836
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8049109459328566520}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 8.476679, y: 9.476976}
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.0661955, y: 0.70184326}
m_EdgeRadius: 0
Assets/Prefabs/Parcelles/Melvyn_village.prefab
View file @ db2bb2a1
......@@ -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
Assets/Prefabs/Parcelles/Raffael_boutique.prefab
View file @ db2bb2a1
......@@ -162,16 +162,6 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 5, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 35
m_TileSpriteIndex: 44
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -4, y: 3, z: 0}
second:
serializedVersion: 2
......@@ -474,8 +464,8 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 6cd544ba23fccf54eae32129ed36b657, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ff459d24777a574439d2a42c8657f4d8, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 94c4a26e1dbbc3647812dccd645f13f9, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ad1e99d19c2a03748b0335ae52bfce86, type: 2}
- m_RefCount: 1
......@@ -623,8 +613,8 @@ Tilemap:
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: -2758789277648346673, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: -6714230475074417111, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 6
......@@ -666,7 +656,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -1398866925657569088, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- m_RefCount: 36
- m_RefCount: 35
m_Data:
e00: 1
e01: 0
......@@ -685,7 +675,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 36
- m_RefCount: 35
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
......
Assets/Prefabs/Parcelles/Raffael_village.prefab
View file @ db2bb2a1
......@@ -3067,6 +3067,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 65
m_TileSpriteIndex: 65
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 3, z: 0}
second:
serializedVersion: 2
......@@ -3287,6 +3297,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -4, y: 5, z: 0}
second:
serializedVersion: 2
m_TileIndex: 68
m_TileSpriteIndex: 68
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 5, z: 0}
second:
serializedVersion: 2
......@@ -3397,6 +3417,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -4, y: 6, z: 0}
second:
serializedVersion: 2
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: 6, z: 0}
second:
serializedVersion: 2
......@@ -3627,6 +3657,36 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: 8, z: 0}
second:
serializedVersion: 2
m_TileIndex: 68
m_TileSpriteIndex: 68
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: 66
m_TileSpriteIndex: 66
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: 67
m_TileSpriteIndex: 67
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 8, z: 0}
second:
serializedVersion: 2
......@@ -3657,6 +3717,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: 9, z: 0}
second:
serializedVersion: 2
m_TileIndex: 69
m_TileSpriteIndex: 69
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 3, y: 9, z: 0}
second:
serializedVersion: 2
......@@ -3798,7 +3868,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 07175304739116a4f8e6cfd86e993414, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ef9eb3c0f6a18d7439d8035ecbeaa216, type: 2}
m_Data: {fileID: 11400000, guid: 54d7a5abe052c8241bc7c603ddaaad0a, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 11e46816b761a5748bb73f7e1119afa5, type: 2}
- m_RefCount: 1
......@@ -3819,6 +3889,16 @@ Tilemap:
m_Data: {fileID: 11400000, guid: bc06d4b443aecd048842537d4276f520, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: a655ee4846392e2419ece79d0c2f3958, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b9ae39cac0fc74c49b0fa52a89d540b8, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 99c234a39a8a33647a23934ae06c0e19, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b2eae4a922d13a1449e31d555553eced, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: fd2e1e2a462b94e49bc4f8836a6a6372, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 667c665a14fb8434ca9e4e4a01c6800f, type: 2}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: -5472138256812182249, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
......@@ -3929,7 +4009,7 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: -4035382832446957438, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 4020740420307960919, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_Data: {fileID: 162598280021495188, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1147168906562122949, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
......@@ -3950,8 +4030,18 @@ Tilemap:
m_Data: {fileID: 3995621719808928692, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 618283605872952514, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 6986815404043503449, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 7808538442560958302, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 1
m_Data: {fileID: 8725674123217878092, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: 7609906820474631096, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
- m_RefCount: 2
m_Data: {fileID: 2519681813242796523, guid: bc9976c4741c33f4ba9c2692bab5979b, type: 3}
m_TileMatrixArray:
- m_RefCount: 71
- m_RefCount: 78
m_Data:
e00: 1
e01: 0
......@@ -3970,7 +4060,7 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 71
- m_RefCount: 78
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
......
Assets/Prefabs/SignItem.prefab
View file @ db2bb2a1
......@@ -10,8 +10,9 @@ GameObject:
m_Component:
- component: {fileID: 6288745984921166911}
- component: {fileID: 6288745984921166908}
- component: {fileID: 6288745984921166910}
- component: {fileID: 6288745984921166905}
- component: {fileID: 705135520614132026}
- component: {fileID: 5994298442114251217}
m_Layer: 0
m_Name: SignItem
m_TagString: Untagged
......@@ -84,8 +85,8 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!60 &6288745984921166910
PolygonCollider2D:
--- !u!61 &6288745984921166905
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
......@@ -94,10 +95,10 @@ PolygonCollider2D:
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.012557507, y: -0.16248411}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -107,16 +108,10 @@ PolygonCollider2D:
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -0.5, y: 0.5}
- {x: -0.5105486, y: 0.20357698}
- {x: -0.18839645, y: 0.21643811}
- {x: -0.16719246, y: 0.21728462}
- {x: 0.15664482, y: 0.21728459}
- {x: 0.5, y: 0.22388381}
- {x: 0.5, y: 0.5}
--- !u!61 &6288745984921166905
serializedVersion: 2
m_Size: {x: 1.1155329, y: 1.9197317}
m_EdgeRadius: 0
--- !u!61 &705135520614132026
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -126,10 +121,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: -0.45885122}
m_Offset: {x: 0, y: -0.37267074}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -140,5 +135,20 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1.3269975}
m_Size: {x: 1, y: 0.6229455}
m_EdgeRadius: 0
--- !u!114 &5994298442114251217
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6288745984921166909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c8875f970794c24fb1d22c9a0d2bb56, type: 3}
m_Name:
m_EditorClassIdentifier:
TextToDisplay: Ceci est le texte de base du panneau
backgroundPanelDisplay: {fileID: 0}
textPanelDisplay: {fileID: 0}
Assets/Prefabs/Verdure/Arbre.prefab
View file @ db2bb2a1
......@@ -173,4 +173,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3}
m_Name:
m_EditorClassIdentifier:
nbPoints: 8
nbPoints: 5
Assets/Scenes/sceneRaffael.unity
View file @ db2bb2a1
This diff is collapsed.
Assets/Scripts/Factory.meta 0 → 100644
View file @ db2bb2a1
fileFormatVersion: 2
guid: 81e39c4f6e44e7345849a14cbef3b3ea
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/LoseNature.cs.meta → Assets/Scripts/Factory/LoseNature.cs.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: 66de21900d4274ff1a31fa90b52cefb2
guid: acdefb31f22c752ac90ddf2bf056e45c
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
Assets/Scripts/GUI/Dialog.cs
View file @ db2bb2a1
......@@ -48,7 +48,8 @@ public class Dialog : MonoBehaviour
string[] DialogsLvl1 = {
"Ach... Encore eine gute chournée dans mon fillage!",
"Ch'ai très enfie te me balader",
"Che defrai aller au Nord dans la forêt ja !"
"Che defrai aller au Nord dans la forêt ja !",
"pour me déplacer, je dois utiliser mes muscles 'flèches directionnelles'"
};
this.ListDialogs.Add("start", DialogsLvl1);
......
Assets/Scripts/GUI/PanneauDisplay.cs 0 → 100644
View file @ db2bb2a1
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class PanneauDisplay : MonoBehaviour
{
public string TextToDisplay = "Ceci est le texte de base du panneau";
public GameObject backgroundPanelDisplay;
public GameObject textPanelDisplay;
// Start is called before the first frame update
void Start()
{
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Player"))
{
textPanelDisplay.GetComponent<Text>().text = TextToDisplay;
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(1f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(1f);
}
}
private void OnTriggerExit2D(Collider2D collision)
{
if (collision.CompareTag("Player"))
{
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
}
}
Assets/Scripts/GUI/PanneauDisplay.cs.meta 0 → 100644
View file @ db2bb2a1
fileFormatVersion: 2
guid: 4c8875f970794c24fb1d22c9a0d2bb56
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Game/GenerateMap.cs
View file @ db2bb2a1
......@@ -26,6 +26,10 @@ public class GenerateMap : MonoBehaviour
public GameObject textE;
public GameObject textEObject;
public GameObject GO_Panneau;
public GameObject displayBox;
public GameObject displayText;
//Les coordonées x dans l'ordre
......@@ -121,6 +125,11 @@ public class GenerateMap : MonoBehaviour
float x = shop.transform.position.x + xOffset;
float y = shop.transform.position.y + yOffset;
Instantiate(goToSell, new Vector3(x, y, 0), Quaternion.identity);
GameObject panneau = Instantiate(GO_Panneau, new Vector3(shop.transform.position.x +5.5f, shop.transform.position.y + 2.48f, 0), Quaternion.identity);
panneau.GetComponent<PanneauDisplay>().textPanelDisplay = displayText;
panneau.GetComponent<PanneauDisplay>().backgroundPanelDisplay = displayBox;
panneau.GetComponent<PanneauDisplay>().TextToDisplay = "Boutique de "+itemToSell.nom;
}
else
Debug.LogError("Mauvais paramètre pour objetVente: "+ objetVente);
......
Assets/Scripts/Player/PlayerMovement.cs
View file @ db2bb2a1
......@@ -18,9 +18,9 @@ public class PlayerMovement : MonoBehaviour
private Vector2 moveDirection;
private Animator animator;
public PlayerState currentState;
public int stage = 0;
public GameObject player;
public bool[] ispassed;
public int stage;
// Start is called before the first frame update
void Start()
......@@ -29,11 +29,11 @@ public class PlayerMovement : MonoBehaviour
animator = GetComponent<Animator>();
myRigidbody = GetComponent<Rigidbody2D>();
animator.SetFloat("moveX", 0);
animator.SetFloat("moveY", -1);
ispassed = new bool[] { false, false, false, false };
stage = 0;
}
// Update is called once per frame
......@@ -87,12 +87,12 @@ public class PlayerMovement : MonoBehaviour
{
if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 0)
{
GenerateMap.instance.generateBoutique(0, 1, "chaussure");
GenerateMap.instance.generateBoutique(0, 0, "chaussure");
stage++;
}
else if (stage == 1 && ispassed[0] == true)
{
GenerateMap.instance.generateUsine(1, 1);
GenerateMap.instance.generateUsine(0, 1);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 2)
......@@ -102,28 +102,28 @@ public class PlayerMovement : MonoBehaviour
}
else if (stage == 3 && ispassed[1] == true)
{
GenerateMap.instance.generateUsine(1, 2);
GenerateMap.instance.generateUsine(1, 1);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 4)
{
GenerateMap.instance.generateBoutique(2, 0, "rechaud");
GenerateMap.instance.generateBoutique(1, 2, "rechaud");
stage++;
}
else if (stage == 5 && ispassed[2] == true)
{
GenerateMap.instance.generateUsine(2, 1);
GenerateMap.instance.generateUsine(2, 0);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 6)
{
GenerateMap.instance.generateBoutique(0, 0, "tente");
GenerateMap.instance.generateBoutique(2, 1, "tente");
stage++;
}
else if (stage == 7 && ispassed[3] == true)
{
GenerateMap.instance.generateUsine(1, 0);
stage++;
//stage++;
}
}
}
Assets/Scripts/Player/PlayerNature.cs
View file @ db2bb2a1
......@@ -8,8 +8,6 @@ using System;
using System.Timers;
public class PlayerNature : MonoBehaviour
{
// l'instance de PlayerNature (pour un singleton)
......@@ -41,6 +39,8 @@ public class PlayerNature : MonoBehaviour
}
void Update()
{
......
Assets/Scripts/Shop.meta 0 → 100644
View file @ db2bb2a1
fileFormatVersion: 2
guid: 1d113792a68e92533a5ae096013dedfd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: