diff --git a/Assets/Import/Image/DialogueBOX.png b/Assets/Import/Image/DialogueBOX.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f906cce3570328f686ffcefb79f84553bd68d7f
Binary files /dev/null and b/Assets/Import/Image/DialogueBOX.png differ
diff --git a/Assets/Import/Image/DialogueBOX.png.meta b/Assets/Import/Image/DialogueBOX.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e62c7bf599d7d69ed8cfeab6c1b555b9df4f9c38
--- /dev/null
+++ b/Assets/Import/Image/DialogueBOX.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 4875a33cbfd973648b61736ed66fdb45
+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: -1
+ 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: 1
+ 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:
diff --git a/Assets/Import/Image/keys.png b/Assets/Import/Image/keys.png
new file mode 100644
index 0000000000000000000000000000000000000000..a01682eea7281010a530d03a212276dc6e7a8ea1
Binary files /dev/null and b/Assets/Import/Image/keys.png differ
diff --git a/Assets/Import/Image/keys.png.meta b/Assets/Import/Image/keys.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..36d2fc8346680d39dd4fe6e8d4ddb299b0365bec
--- /dev/null
+++ b/Assets/Import/Image/keys.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 596bd0598ea4cc248a5e6c1379db25c8
+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: -1
+ 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: 1
+ 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:
diff --git a/Assets/Items/2.Baton.asset b/Assets/Items/2.Baton.asset
index 53bfc67728708fe0d967e99c91ee195a637a77fa..14777cd069c98d0107ec9cb5ca663cd2b6322a94 100644
--- a/Assets/Items/2.Baton.asset
+++ b/Assets/Items/2.Baton.asset
@@ -13,6 +13,6 @@ MonoBehaviour:
m_Name: 2.Baton
m_EditorClassIdentifier:
id: 2
- nom: "B\xE2ton de marche"
+ nom: Baton de marche
description: Permet de moin ce fatiguer
image: {fileID: 0}
diff --git a/Assets/Prefabs/GUI/BarreDenature.prefab b/Assets/Prefabs/GUI/BarreDenature.prefab
index 8eb563478084a0e3e105e8229807c1af376d3ef5..f5f616da65bf35ec986cd84ad31c0cdb56f5d525 100644
--- a/Assets/Prefabs/GUI/BarreDenature.prefab
+++ b/Assets/Prefabs/GUI/BarreDenature.prefab
@@ -79,6 +79,163 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\n1x Chaussure de marche\n1x B\xE2ton de marche\n1x R\xE9chaud\n1x Tente"
+--- !u!1 &154331173858853074
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2147933392024235413}
+ - component: {fileID: 1194245230081981349}
+ - component: {fileID: 8316239992243868299}
+ m_Layer: 5
+ m_Name: EbuttonText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2147933392024235413
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 154331173858853074}
+ 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: 8599628515917749640}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 79.376, y: -19.6}
+ m_SizeDelta: {x: 379.5522, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1194245230081981349
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 154331173858853074}
+ m_CullTransparentMesh: 1
+--- !u!114 &8316239992243868299
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 154331173858853074}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: a8169677ec9bc574faafaf47e65e2238, type: 3}
+ m_FontSize: 40
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: PRESS E TO BUY
+--- !u!1 &312569452527018886
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8599628515917749640}
+ - component: {fileID: 4376145141336078867}
+ - component: {fileID: 5559849084662148601}
+ m_Layer: 5
+ m_Name: EbuttonPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8599628515917749640
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 312569452527018886}
+ 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:
+ - {fileID: 3779595607467538876}
+ - {fileID: 2147933392024235413}
+ - {fileID: 7977247320747760606}
+ m_Father: {fileID: 9185901235847042339}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 226.54}
+ m_SizeDelta: {x: -820.2151, y: -482.9767}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4376145141336078867
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 312569452527018886}
+ m_CullTransparentMesh: 1
+--- !u!114 &5559849084662148601
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 312569452527018886}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.5882353}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &512403696824737883
GameObject:
m_ObjectHideFlags: 0
@@ -114,7 +271,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 3.1984, y: 1}
+ m_AnchoredPosition: {x: -0.000025272, y: 0}
m_SizeDelta: {x: 783.7002, y: 106.7631}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7952431289706890423
@@ -178,6 +335,81 @@ MonoBehaviour:
dialog: 0
dialogActive: 1
situation:
+--- !u!1 &1615378153774137883
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3779595607467538876}
+ - component: {fileID: 5250947943916514511}
+ - component: {fileID: 4142887408462288879}
+ m_Layer: 5
+ m_Name: Ebutton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3779595607467538876
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1615378153774137883}
+ 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: 8599628515917749640}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -167.6, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5250947943916514511
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1615378153774137883}
+ m_CullTransparentMesh: 1
+--- !u!114 &4142887408462288879
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1615378153774137883}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 596bd0598ea4cc248a5e6c1379db25c8, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &1705879581494847332
GameObject:
m_ObjectHideFlags: 0
@@ -214,8 +446,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -156.8777}
- m_SizeDelta: {x: 1116, y: 228.2446}
+ m_AnchoredPosition: {x: 0, y: -181.18906}
+ m_SizeDelta: {x: 896.7056, y: 199.0162}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4793196200597776703
CanvasRenderer:
@@ -245,7 +477,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 5333964560794651080, guid: 72610aa9f9e599b4ead7a901ffd6bccf, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4875a33cbfd973648b61736ed66fdb45, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -255,6 +487,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2242177697835627957
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7977247320747760606}
+ - component: {fileID: 3995532355075540679}
+ - component: {fileID: 3578018028916196401}
+ m_Layer: 5
+ m_Name: EbuttonTextObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7977247320747760606
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2242177697835627957}
+ 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: 8599628515917749640}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 50.5, y: -60.9}
+ m_SizeDelta: {x: 379.5522, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3995532355075540679
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2242177697835627957}
+ m_CullTransparentMesh: 1
+--- !u!114 &3578018028916196401
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2242177697835627957}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.092196584, g: 1, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: a8169677ec9bc574faafaf47e65e2238, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: BATON DE MARCHE
--- !u!1 &4828849328277852504
GameObject:
m_ObjectHideFlags: 0
@@ -290,7 +601,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 385, y: -103}
+ m_AnchoredPosition: {x: 262, y: -82}
m_SizeDelta: {x: 783.7002, y: 106.7631}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6308161532840785029
@@ -719,6 +1030,7 @@ RectTransform:
- {fileID: 9185901236199156305}
- {fileID: 1360714821386396631}
- {fileID: 2695144739806175214}
+ - {fileID: 8599628515917749640}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index e1546616d395f287a6e02a0b0cac2219929f5624..414e5b4dbe5c49dc78ccf67a018c0b6eb00c367e 100644
--- a/Assets/Scenes/sceneRaffael.unity
+++ b/Assets/Scenes/sceneRaffael.unity
@@ -142,7 +142,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 109
+ value: 101
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -203,7 +203,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 99
+ value: 91
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -317,7 +317,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 63
+ value: 61
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -374,7 +374,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 73
+ value: 71
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -431,7 +431,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 85
+ value: 80
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -489,7 +489,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 111
+ value: 103
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -550,7 +550,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 48
+ value: 46
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -607,7 +607,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 84
+ value: 79
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -664,7 +664,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 96
+ value: 89
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -761,7 +761,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 87
+ value: 82
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -819,7 +819,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 105
+ value: 97
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -980,6 +980,10 @@ MonoBehaviour:
pUsine:
- {fileID: 1755158007606780204, guid: b9f8617378865674c91edd2902e37e9a, type: 3}
nb_of_plot: 8
+ panelE: {fileID: 921777840}
+ Ebutt: {fileID: 668839687}
+ textE: {fileID: 865918959}
+ textEObject: {fileID: 1175622656}
--- !u!4 &237152199
Transform:
m_ObjectHideFlags: 0
@@ -1012,7 +1016,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 64
+ value: 62
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -1219,11 +1223,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
m_PrefabInstance: {fileID: 1786099831}
m_PrefabAsset: {fileID: 0}
---- !u!4 &322323868 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- m_PrefabInstance: {fileID: 968972310}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &331658833
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1237,7 +1236,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 103
+ value: 95
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -1299,7 +1298,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 77
+ value: 74
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -1356,7 +1355,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 61
+ value: 59
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -1471,8 +1470,6 @@ Transform:
- {fileID: 671054639}
- {fileID: 1518072058}
- {fileID: 1533946731}
- - {fileID: 1040394247}
- - {fileID: 322323868}
- {fileID: 1857106}
- {fileID: 1229105457}
- {fileID: 1085350019}
@@ -1690,7 +1687,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 106
+ value: 98
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -1991,7 +1988,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 37
+ value: 35
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2105,7 +2102,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 38
+ value: 36
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2162,7 +2159,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 43
+ value: 41
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2625,7 +2622,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 36
+ value: 34
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2687,7 +2684,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 98
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2745,7 +2742,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 112
+ value: 104
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -2798,6 +2795,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
m_PrefabInstance: {fileID: 364025034}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &668839687 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1615378153774137883, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1365796445}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &671054639 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
@@ -2883,7 +2885,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 70
+ value: 68
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -2940,7 +2942,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 40
+ value: 38
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3002,7 +3004,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 51
+ value: 49
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3178,7 +3180,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 104
+ value: 96
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3235,7 +3237,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 89
+ value: 84
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3369,7 +3371,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 86
+ value: 81
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3431,7 +3433,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 57
+ value: 55
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3554,7 +3556,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 50
+ value: 48
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3598,6 +3600,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
+--- !u!1 &865918959 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 154331173858853074, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1365796445}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &872770660 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -3631,7 +3638,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 82
+ value: 77
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3680,6 +3687,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 1468048523}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &921777840 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 312569452527018886, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1365796445}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &924183884 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -3703,7 +3715,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 100
+ value: 92
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -3752,63 +3764,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 67466771}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &968972310
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 403023646}
- m_Modifications:
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_RootOrder
- value: 35
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.x
- value: -18.10931
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.y
- value: 66.080124
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1807436475010789105, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_Name
- value: Hautes_herbes (31)
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
--- !u!1001 &986851110
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3822,7 +3777,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 72
+ value: 70
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4009,11 +3964,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9cdcd3ac7314fd649bf366c8fd2a4460, type: 3}
---- !u!4 &1040394247 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- m_PrefabInstance: {fileID: 1206745862}
- m_PrefabAsset: {fileID: 0}
--- !u!4 &1061110352 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -4032,7 +3982,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 94
+ value: 88
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4208,7 +4158,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 54
+ value: 52
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4384,7 +4334,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 58
+ value: 56
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4428,6 +4378,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
+--- !u!1 &1175622656 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 2242177697835627957, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ m_PrefabInstance: {fileID: 1365796445}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &1201597112 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -4507,7 +4462,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 80
+ value: 76
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4551,63 +4506,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
---- !u!1001 &1206745862
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 403023646}
- m_Modifications:
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_RootOrder
- value: 34
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.x
- value: -16.664576
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.y
- value: 68.714645
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1807436475010789105, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
- propertyPath: m_Name
- value: Hautes_herbes (30)
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
--- !u!1001 &1213690593
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4617,7 +4515,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 110
+ value: 102
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -4678,7 +4576,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 102
+ value: 94
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4807,7 +4705,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 42
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -4869,7 +4767,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 68
+ value: 66
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -5003,7 +4901,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 52
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -5085,7 +4983,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 101
+ value: 93
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -5318,9 +5216,37 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 2147933392024235413, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 324.8188
+ objectReference: {fileID: 0}
+ - target: {fileID: 2147933392024235413, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 44.809
+ objectReference: {fileID: 0}
+ - target: {fileID: 2147933392024235413, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -16.411724
+ objectReference: {fileID: 0}
- target: {fileID: 2695144739806175214, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 3578018028916196401, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Color.b
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3578018028916196401, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Color.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3578018028916196401, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_Color.r
+ value: 0.42397022
+ objectReference: {fileID: 0}
+ - target: {fileID: 7977247320747760606, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 44.80896
objectReference: {fileID: 0}
- target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
propertyPath: m_AnchorMax.x
@@ -5443,7 +5369,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 47
+ value: 45
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -10402,7 +10328,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 60
+ value: 58
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -10469,7 +10395,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 90
+ value: 85
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -10733,7 +10659,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 83
+ value: 78
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -10795,7 +10721,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 71
+ value: 69
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -10852,7 +10778,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 39
+ value: 37
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -14950,7 +14876,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 91
+ value: 86
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15007,7 +14933,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 53
+ value: 51
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15064,7 +14990,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 41
+ value: 39
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15121,7 +15047,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 66
+ value: 64
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15178,7 +15104,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 69
+ value: 67
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15313,7 +15239,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 113
+ value: 105
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -15437,7 +15363,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 108
+ value: 100
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -15498,7 +15424,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 56
+ value: 54
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -15555,7 +15481,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 44
+ value: 42
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16294,7 +16220,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 74
+ value: 72
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16433,7 +16359,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 59
+ value: 57
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16490,7 +16416,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 46
+ value: 44
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16552,7 +16478,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 78
+ value: 75
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16614,7 +16540,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 93
+ value: 87
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16676,7 +16602,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 67
+ value: 65
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -16733,7 +16659,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 65
+ value: 63
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -55750,7 +55676,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_RootOrder
- value: 107
+ value: 99
objectReference: {fileID: 0}
- target: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
propertyPath: m_LocalPosition.x
@@ -55873,7 +55799,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 49
+ value: 47
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -55930,7 +55856,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 55
+ value: 53
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -56092,7 +56018,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 75
+ value: 73
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -56149,7 +56075,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 62
+ value: 60
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -56211,7 +56137,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 45
+ value: 43
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
@@ -56409,7 +56335,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_RootOrder
- value: 88
+ value: 83
objectReference: {fileID: 0}
- target: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scripts/Game/GenerateMap.cs b/Assets/Scripts/Game/GenerateMap.cs
index d0716d7b8a11c4b2f3ccda005ffe597552c26523..020c8efc6c27e524201925d439c00e63dac4c233 100644
--- a/Assets/Scripts/Game/GenerateMap.cs
+++ b/Assets/Scripts/Game/GenerateMap.cs
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.UI;
public class GenerateMap : MonoBehaviour
{
@@ -19,7 +20,13 @@ public class GenerateMap : MonoBehaviour
public List<GameObject> pUsine = new List<GameObject>();
public int nb_of_plot = 8;
public Object[,] plot=new Object[3,3];
-
+
+ public GameObject panelE;
+ public GameObject Ebutt;
+ public GameObject textE;
+ public GameObject textEObject;
+
+
//Les coordonées x dans l'ordre
private int[] xs=new int[]{-17,0,17}; //colonne
@@ -39,7 +46,10 @@ public class GenerateMap : MonoBehaviour
void Start()
{
-
+ panelE.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ Ebutt.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textE.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
generateVillage();
}
@@ -103,6 +113,10 @@ public class GenerateMap : MonoBehaviour
shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().sellItem = itemToSell;
shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().itemForSale.Add(goToSell);
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().panelEbutton = panelE;
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().Ebutton = Ebutt;
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().textEbutton = textE;
+ shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().textEbuttonObject = textEObject;
plot[column, line] = shop;
float x = shop.transform.position.x + xOffset;
float y = shop.transform.position.y + yOffset;
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index 1fc1c33ee40ce0c615094e3aa38c97474df86a3c..40238021c8728b6be5cd18862d6a1e5f5d130acf 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -1,40 +1,83 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.UI;
public class Shopping : MonoBehaviour
{
private bool playerInRange;
+
+ private bool isBuy=false;
public Item sellItem = null;
//public GameObject[] itemForSale = new GameObject[2];
public List<GameObject> itemForSale = new List<GameObject>();
+ public GameObject panelEbutton;
+ public GameObject Ebutton;
+ public GameObject textEbutton;
+
+ public GameObject textEbuttonObject;
+
+
+
// Start is called before the first frame update
void Start()
{
-
+ panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ Ebutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
+
}
// Update is called once per frame
void Update()
{
+
+ if(playerInRange)
+ {
+ switch (sellItem.id)
+ {
+ case 1:
+ textEbuttonObject.GetComponent<Text>().text="Chaussures de marche";
+ break;
+ case 2:
+ textEbuttonObject.GetComponent<Text>().text="Bâton de marche";
+ break;
+ case 3:
+ textEbuttonObject.GetComponent<Text>().text="Réchaud";
+ break;
+ case 4:
+ textEbuttonObject.GetComponent<Text>().text="Tente";
+ break;
+ }
+ }
+
if (Input.GetKeyDown(KeyCode.E) && playerInRange && sellItem && itemForSale.Count>0)
{
switch (sellItem.id)
{
case 1:
Dialog.instance.setSituation("boutiqueChaussure");
+ isBuy=true;
break;
case 2:
Dialog.instance.setSituation("boutiqueBaton");
+ isBuy=true;
break;
case 3:
Dialog.instance.setSituation("boutiqueRechaud");
+ isBuy=true;
break;
case 4:
Dialog.instance.setSituation("boutiqueTente");
+ isBuy=true;
break;
}
+ panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ Ebutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
Inventory.instance.addItem(sellItem);
Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire");
}
@@ -45,11 +88,23 @@ public class Shopping : MonoBehaviour
if (collision.CompareTag("Player"))
{
playerInRange = true;
+ if(isBuy==false)
+ {
+ panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ Ebutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ textEbutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(1f);
+ }
+
}
}
private void OnTriggerExit2D(Collider2D collision)
{
playerInRange = false;
+ panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ Ebutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
+ textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
}