Assets/Prefabs/tent.prefab.meta

+fileFormatVersion: 2
+guid: 7bc98558919f34933bf9602e33e1bead
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Menu.unity

@@ -181,9 +181,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_Font: {fileID: 12800000, guid: dc5cefb282dfb81449a687216d64bebb, type: 3}
     m_FontSize: 30
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -374,9 +374,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_Font: {fileID: 12800000, guid: a8169677ec9bc574faafaf47e65e2238, type: 3}
     m_FontSize: 50
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 50
@@ -474,9 +474,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_Font: {fileID: 12800000, guid: a8169677ec9bc574faafaf47e65e2238, type: 3}
     m_FontSize: 50
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 50
@@ -533,7 +533,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_BackGroundColor: {r: 0.06385724, g: 0.3301887, b: 0.08359298, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -638,9 +638,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_Font: {fileID: 12800000, guid: dc5cefb282dfb81449a687216d64bebb, type: 3}
     m_FontSize: 30
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -723,7 +723,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1459655250
 GameObject:
@@ -756,12 +756,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  nextYear: 
+  nextYear: 1875
   year: {fileID: 672131795}
   city: {fileID: 1075515021}
-  scene: Niveau1
+  scene: sceneRaffael
   animmator: {fileID: 1460786684}
-  name: GAME OVER
+  nom: DUSSELDORF
 --- !u!4 &1459655252
 Transform:
   m_ObjectHideFlags: 0
@@ -774,7 +774,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1459655253
 MonoBehaviour:
@@ -903,7 +903,7 @@ RectTransform:
   - {fileID: 601081836}
   - {fileID: 1895339867}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -929,7 +929,7 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &1560803507
+--- !u!1 &1760946798
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -937,22 +937,22 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1560803509}
-  - component: {fileID: 1560803508}
+  - component: {fileID: 1760946800}
+  - component: {fileID: 1760946799}
   m_Layer: 0
-  m_Name: fond
+  m_Name: fondnature
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!212 &1560803508
+--- !u!212 &1760946799
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1560803507}
+  m_GameObject: {fileID: 1760946798}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -986,30 +986,30 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: d9b149bf7221d6b42ab76a5513802956, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 15443c9b8cf083346bbb8596a7c93c06, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 34.412136, y: 14.4}
+  m_Size: {x: 3.93, y: 3.16}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!4 &1560803509
+--- !u!4 &1760946800
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1560803507}
+  m_GameObject: {fileID: 1760946798}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.95, y: 0.13, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0.18, y: -0.1, z: 0}
+  m_LocalScale: {x: 6.496139, y: 6.496139, z: 6.496139}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1840166393
 GameObject:
@@ -1166,7 +1166,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
       propertyPath: m_Color.r
-      value: 0.9528302
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7659010468970738341, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
       propertyPath: m_Name

Assets/Scenes/sceneTanguy.unity

@@ -341,6 +341,10 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_SortingOrder
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 9185901235847042339, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
       propertyPath: m_Pivot.x
       value: 0
@@ -759,6 +763,207 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1 &378742029
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 378742030}
+  - component: {fileID: 378742032}
+  - component: {fileID: 378742031}
+  m_Layer: 5
+  m_Name: City
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &378742030
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378742029}
+  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: 916199388}
+  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: 84, y: -42}
+  m_SizeDelta: {x: 331.2151, y: 62.1028}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &378742031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378742029}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '
+
+'
+--- !u!222 &378742032
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378742029}
+  m_CullTransparentMesh: 1
+--- !u!1 &388904383
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 388904387}
+  - component: {fileID: 388904386}
+  - component: {fileID: 388904385}
+  - component: {fileID: 388904384}
+  - component: {fileID: 388904388}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &388904384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388904383}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &388904385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388904383}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &388904386
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388904383}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &388904387
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388904383}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 916199388}
+  m_Father: {fileID: 0}
+  m_RootOrder: 44
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!95 &388904388
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388904383}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1001 &489539845
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -987,6 +1192,115 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1001 &596799311
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 388904387}
+    m_Modifications:
+    - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Color.b
+      value: 0.013616921
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Color.g
+      value: 0.013616921
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010468970738340, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Color.r
+      value: 0.9622642
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010468970738341, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Name
+      value: Image
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 2641.5908
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 2056.9824
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -2614
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
 --- !u!1001 &598739410
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1163,6 +1477,11 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
   m_PrefabInstance: {fileID: 199597654}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &916199388 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7659010469709986932, guid: 776bce114e8ffcf4484f9164d6d3be27, type: 3}
+  m_PrefabInstance: {fileID: 596799311}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &964600126
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1337,6 +1656,87 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f33cf3cdc7d9b2043bb8287db4107514, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1097822113
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1097822114}
+  - component: {fileID: 1097822116}
+  - component: {fileID: 1097822115}
+  m_Layer: 0
+  m_Name: Year
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1097822114
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1097822113}
+  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: 916199388}
+  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: 84, y: 31.051}
+  m_SizeDelta: {x: 331.2151, y: 62.1028}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1097822115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1097822113}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 28e573bcec8f28f4b9933b862cb2997e, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '
+
+'
+--- !u!222 &1097822116
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1097822113}
+  m_CullTransparentMesh: 1
 --- !u!1 &1104949079
 GameObject:
   m_ObjectHideFlags: 0
@@ -9681,6 +10081,72 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1383502640
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1383502643}
+  - component: {fileID: 1383502642}
+  - component: {fileID: 1383502641}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1383502641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1383502640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1383502642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1383502640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1383502643
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1383502640}
+  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: 0}
+  m_RootOrder: 43
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1408464781
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10158,6 +10624,7 @@ MonoBehaviour:
   dialogText: {fileID: 1364180986}
   dialog: 0
   dialogActive: 1
+  situation: 
 --- !u!1001 &1935144662
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10443,6 +10910,88 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
+--- !u!1 &2061597248
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2061597252}
+  - component: {fileID: 2061597251}
+  - component: {fileID: 2061597250}
+  - component: {fileID: 2061597249}
+  m_Layer: 0
+  m_Name: SceneController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!95 &2061597249
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061597248}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 9b389855dca6c1a409f7f8c6b5762d70, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &2061597250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061597248}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5d888d62879d8e841bb450bce623de31, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2061597251
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061597248}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5dcebe77ef51f6b409b7e10aa9028a43, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nextYear: 
+  year: {fileID: 1097822115}
+  city: {fileID: 378742031}
+  scene: Menu
+  animmator: {fileID: 388904388}
+  name: GAME OVER
+--- !u!4 &2061597252
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2061597248}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 431.38956, y: 435.6071, z: -68.97981}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 45
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2081225286
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/Niveau2.unity.meta → Assets/Scripts/Factory.meta

 fileFormatVersion: 2
-guid: 4ae30febc4f91474fa9164b85521aaf5
+guid: 81e39c4f6e44e7345849a14cbef3b3ea
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/Factory/LoseNature.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LoseNature : MonoBehaviour
+{
+    private bool lostLife = false;
+    private int nbFactory = 0;
+    public int damageByFactory = 20;
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.CompareTag("Player"))
+        {
+            if (!lostLife)
+            {
+                nbFactory = GameObject.FindGameObjectsWithTag("factory").Length;
+                Debug.Log("il pert de la vie: " + nbFactory * damageByFactory);
+                collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
+                this.lostLife = true;
+            }
+        }
+    }
+}

Assets/Scripts/Factory/LoseNature.cs.meta

+fileFormatVersion: 2
+guid: acdefb31f22c752ac90ddf2bf056e45c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GUI/Dialog.cs

@@ -14,7 +14,7 @@ public class Dialog : MonoBehaviour
     // singleton
     public static Dialog instance;
 
-    private void Awake() 
+    private void Awake()
     {
         if (instance != null)
         {
@@ -29,6 +29,7 @@ public class Dialog : MonoBehaviour
 
     public GameObject dialogBox;
     public Text dialogText;
+    public Text instructionText;
     public int dialog;
     public bool dialogActive;
     public string situation;
@@ -45,44 +46,55 @@ public class Dialog : MonoBehaviour
         this.dialog = 0;
 
         string[] DialogsLvl1 = {
-            "Coucou",
-            "Je fais un test pour le niveau 1",
-            "Ca marche bien nan ?",
-            "Melvyn t moch",
-            "Valentin aussi",
-            "Raff est pas bo"
+             "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 !",
+                "pour me déplacer, je dois utiliser mes  muscles 'flèches directionnelles'"
             };
+        this.ListDialogs.Add("start", DialogsLvl1);
 
 
-        this.ListDialogs.Add("start", DialogsLvl1);
+        string[] boutiqueChaussure = {
+            "Je fous prendrais zes chauzzures en taille Zweiundvierzig Bitte !",
+        };
+        this.ListDialogs.Add("boutiqueChaussure", boutiqueChaussure);
 
-        string[] Dialogsraff = {
-            "Salut",
-            "cava ?",
-            "Je te mange tes morts"
+        string[] boutiqueBaton = {
+            "Ze bâton me semble assez long et solide pour moi ! J'achète !",
         };
+        this.ListDialogs.Add("boutiqueBaton", boutiqueBaton);
 
-        this.ListDialogs.Add("pnj", Dialogsraff);
+        string[] boutiqueRechaud = {
+            " Ze réchaud fa être SEHR PRAKTISCH !", "j'achète tout de zuite !"
+        };
+        this.ListDialogs.Add("boutiqueRechaud", boutiqueRechaud);
 
-        string[] DialogsTest = {
-            "Je fais un test",
-            "ca marche ? ou pas ?",
-            "bisous"
+        string[] boutiqueTente = {
+            "J'adore ta tente, mais elle est un peu grosse non ?", "Ach, tant pis, CH'ACHETE !"
         };
+        this.ListDialogs.Add("boutiqueTente", boutiqueTente);
 
-        this.ListDialogs.Add("test", DialogsTest);
 
-        string[] DialogMarchand = {
-            "Ouvrir le menu c'est avec",
-            "la touche E chacal"
+
+        string[] borderChaussure = {
+            "NEIN NEIN NEIN ! Il fa me falloir des chaussures pour marcher plus loin !"
         };
-        this.ListDialogs.Add("Marchand", DialogMarchand);
+        this.ListDialogs.Add("borderChaussure", borderChaussure);
 
-        string[] DialogChaussure = {
-            "J'ai mal au pied",
-            "Faux an acheté des mieu"
+        string[] borderBaton = {
+            "ACH SCHEISSE !", "Ch'ai ouplié mes patons te marches ! Che suis trop fatigué !"
         };
-        this.ListDialogs.Add("Chaussures", DialogChaussure);
+        this.ListDialogs.Add("borderBaton", borderBaton);
+
+        string[] borderRechaud = {
+            "Kopfertami, je commence à afoir faim !", "il me faudrait eine réchaud pour mancher !"
+        };
+        this.ListDialogs.Add("borderRechaud", borderRechaud);
+
+        string[] borderTente = {
+            "Hopla, c'est bientôt l'heure de la sièste !", "Si che n'ai pas de tente che ne pourrait pas continuer !"
+        };
+        this.ListDialogs.Add("borderTente", borderTente);
 
 
         if (this.dialogActive)
@@ -95,27 +107,17 @@ public class Dialog : MonoBehaviour
         if ((Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown("joystick button 0")) && dialogActive)
             this.Next();
 
-        // DEBUG
-        if ((Input.GetKeyDown(KeyCode.H) || Input.GetKeyDown("joystick button 1")))
-            this.dialogActive = !this.dialogActive;
-
-        // DEBUG
-        if (Input.GetKeyDown(KeyCode.F))
-        {
-            Debug.Log("tut");
-            
-            this.setSituation("marchand");
-        }
-            
-        if(this.dialogActive)
+        if (this.dialogActive)
         {
             this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
             this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(1f);
+            this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(1f);
         }
         else
         {
             this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(0f);
             this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(0f);
+            this.instructionText.GetComponent<CanvasRenderer>().SetAlpha(0f);
         }
     }
 
@@ -130,12 +132,9 @@ public class Dialog : MonoBehaviour
         }
     }
 
-    // Ouvre une bulle de dialogue dans une situation donnée
     public void setSituation(string sit)
     {
-        Debug.Log("actionvation: " + sit);
         this.situation = sit;
-        Debug.Log("situation" + this.situation);
         this.dialog = 0;
 
         this.dialogActive = true;

Assets/Scripts/GUI/InventoryDisplay.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class InventoryDisplay : MonoBehaviour
+{
+    // Start is called before the first frame update
+    public Text inventoryText;
+    void Start()
+    {
+        inventoryText.text = "";
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        inventoryText.text = "";
+        foreach(Item item in Inventory.instance.getItemList()){
+            inventoryText.text += "\n1x " + item.nom;
+        }
+    }
+}

Assets/Scripts/GUI/InventoryDisplay.cs.meta

+fileFormatVersion: 2
+guid: 04f25fae5a5c969428bddd86f71fa44f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GUI/PanneauDisplay.cs

+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

+fileFormatVersion: 2
+guid: 4c8875f970794c24fb1d22c9a0d2bb56
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Game/GenerateMap.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class GenerateMap : MonoBehaviour
 {
+    public Item chaussures;
+    public Item baton;
+    public Item rechaud;
+    public Item tente;
+
+    public GameObject GO_chaussures;
+    public GameObject GO_baton;
+    public GameObject GO_rechaud;
+    public GameObject GO_tente;
+
+    public List<GameObject> pVillage = new List<GameObject>();
+    public List<GameObject> pBoutique = new List<GameObject>();
+    public List<GameObject> pUsine = new List<GameObject>();
+    public int nb_of_plot = 8;
+    public Object[,] plot=new Object[3,3];
+    
+    public GameObject panelE;
+    public GameObject Ebutt;
+    public GameObject textE;
+    public GameObject textEObject;
+
+    public GameObject GO_Panneau;
+    public GameObject displayBox;
+    public GameObject displayText;
+
+
+
+    //Les coordonées x dans l'ordre
+    private int[] xs=new int[]{-17,0,17}; //colonne
+
+    //Les coordonées y dans l'ordre
+    private int[] ys=new int[]{26,13,0}; //ligne
+
+
+    public static GenerateMap instance;
+
+    private void Awake()
+    {
+        if (instance != null)
+            return;
+        instance = this;
+    }
 
-    public GameObject[] maps = new GameObject[9];
-    // Start is called before the first frame update
     void Start()
     {
-        
+        panelE.GetComponent<CanvasRenderer>().SetAlpha(0f);
+        Ebutt.GetComponent<CanvasRenderer>().SetAlpha(0f);
+        textE.GetComponent<CanvasRenderer>().SetAlpha(0f);
+        textEObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
+        generateVillage();
     }
 
+    //Place les 8 prefabs aux bons endroits 
+    public void generateVillage()
+    {/*
+        for (int i=0;i< nb_of_plot; i++)
+        {
+            plot[i] = Instantiate(pVillage[Random.Range(0, pVillage.Count)], new Vector3(xs[i], ys[i], 0), Quaternion.identity);
+        }*/
 
-    public void generateMap()
+        for(int x = 0; x < xs.Length; x++)
+        {
+            for(int y = 0; y<ys.Length; y++)
+            {
+                if(!(x==2 && y==2))
+                    plot[x,y] = Instantiate(pVillage[Random.Range(0, pVillage.Count)], new Vector3(xs[x], ys[y], 0), Quaternion.identity);
+            }
+        }
+
+    }
+
+    public void generateBoutique(int column, int line, string objetVente)
     {
-        for(int i=0;i<maps.Length;i++)
+        float xOffset = 0;
+        float yOffset = 0;
+        Destroy(plot[column, line]);
+        
+        Item itemToSell = null;
+        GameObject goToSell = null;
+        switch (objetVente)
         {
-            Instantiate(maps[i], new Vector3(0, 0, 0), Quaternion.identity);
+            case "chaussure":
+                itemToSell = chaussures;
+                goToSell = GO_chaussures;
+                xOffset = 0;
+                yOffset = 6.1F;
+                break;
+            case "baton":
+                itemToSell = baton;
+                goToSell = GO_baton;
+                xOffset = 0;
+                yOffset = 6.11F;
+                break;
+            case "rechaud":
+                itemToSell = rechaud;
+                goToSell = GO_rechaud;
+                xOffset = 0;
+                yOffset = 6.10F;
+                break;
+            case "tente":
+                itemToSell = tente;
+                goToSell = GO_tente;
+                xOffset = 2.7F;
+                yOffset = 2.27F;
+                break;
         }
+        if (itemToSell && goToSell)
+        {
+            GameObject shop = Instantiate(pBoutique[Random.Range(0, pBoutique.Count)], new Vector3(xs[column], ys[line], 0), Quaternion.identity);
+
+            shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().sellItem = itemToSell;
+            shop.transform.Find("Shop").gameObject.GetComponent<Shopping>().itemForSale.Add(goToSell);
+            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;
+            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);
+    }
 
+    public void generateUsine(int column, int line)
+    {
+        Destroy(plot[column, line]);
+        plot[column, line] = Instantiate(pUsine[Random.Range(0, pUsine.Count)], new Vector3(xs[column], ys[line], 0), Quaternion.identity);
+        
     }
 
+    public void generateBoutiqueTest()
+    {
+        // COLONNE, LIGNE
+        generateBoutique(0, 0, "rechaud");
+        generateUsine(1, 0);
+        generateBoutique(0, 1, "tente");
+        generateBoutique(1, 2, "baton");
+        generateBoutique(1, 1, "chaussure");
+    }
+
+
 
-    // Update is called once per frame
     void Update()
     {
         

Assets/Scripts/Inventory/Border.cs

@@ -5,7 +5,8 @@ using UnityEngine;
 public class Border : MonoBehaviour
 {
     public Item itemNeeded;
-    public BoxCollider2D collider;
+    public BoxCollider2D forestCollider;
+
 
     private void OnCollisionEnter2D(Collision2D collision)
     {
@@ -15,14 +16,31 @@ public class Border : MonoBehaviour
             Debug.Log("JE TOUCHE LA BORDEER");
             if (Inventory.instance.hasItem(itemNeeded))
             {
-                Debug.Log("Je possde l'item ncessaire");
-                collider.enabled = false;
-
+                Debug.Log("Je poss?de l'item n?cessaire");  
+                GameObject player = GameObject.FindGameObjectWithTag("Player");
+                //Debug.Log(player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1]);
+                player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1] = true;
+                forestCollider.enabled = false;
             }
             else
             {
-                Debug.Log("Je n'ai pas l'item ncessaire");
-                Dialog.instance.setSituation("Chaussures");
+                Debug.Log("Je n'ai pas l'item n?cessaire");
+
+                switch (itemNeeded.id)
+                {
+                    case 1:
+                        Dialog.instance.setSituation("borderChaussure");
+                        break;
+                    case 2:
+                        Dialog.instance.setSituation("borderBaton");
+                        break;
+                    case 3:
+                        Dialog.instance.setSituation("borderRechaud");
+                        break;
+                    case 4:
+                        Dialog.instance.setSituation("borderTente");                
+                        break;
+                }
             }
         }
     }

Assets/Scripts/Inventory/Item.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class Item : ScriptableObject {
     
     public int id;
-    public string name;
+    public string nom;
     public string description;
     public Sprite image;
 

Assets/Scripts/Player/PlayerMovement.cs

@@ -15,9 +15,12 @@ public class PlayerMovement : MonoBehaviour
 {
     public float speed;
     private Rigidbody2D myRigidbody;
-    private Vector3 change;
+    private Vector2 moveDirection;
     private Animator animator;
     public PlayerState currentState;
+    public GameObject player;
+    public bool[] ispassed;
+    public int stage;
 
     // Start is called before the first frame update
     void Start()
@@ -26,45 +29,51 @@ 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
     void Update()
     {
-
-        change = Vector3.zero;
-        change.x = Input.GetAxisRaw("Horizontal");
-        change.y = Input.GetAxisRaw("Vertical");
+        ProcessInputs();
 
         if(currentState == PlayerState.walk)
         {
             UpdateAnimationAndMove();
         }
 
-
         Vector3 pos = Camera.main.WorldToViewportPoint(transform.position);
         pos.x = Mathf.Clamp01(pos.x);
         pos.y = Mathf.Clamp01(pos.y);
         transform.position = Camera.main.ViewportToWorldPoint(pos);
+
+        gameIntelligence();
+    }
+
+    private void FixedUpdate()
+    {
+        moveDirection.Normalize();
+        myRigidbody.velocity = new Vector2(moveDirection.x * speed, moveDirection.y * speed);
     }
 
-    void MoveCharacter()
+    private void ProcessInputs()
     {
-        change.Normalize();
-        myRigidbody.MovePosition(transform.position + change * speed * Time.deltaTime);
+        float moveX = Input.GetAxisRaw("Horizontal");
+        float moveY = Input.GetAxisRaw("Vertical");
+        moveDirection = new Vector2(moveX, moveY);
     }
 
     void UpdateAnimationAndMove()
     {
-        if (change != Vector3.zero)
+        if (moveDirection != Vector2.zero)
         {
-            MoveCharacter();
-            animator.SetFloat("moveX", change.x);
-            animator.SetFloat("moveY", change.y);
+
+            animator.SetFloat("moveX", moveDirection.x);
+            animator.SetFloat("moveY", moveDirection.y);
 
             animator.SetBool("moving", true);
         }
@@ -72,6 +81,49 @@ public class PlayerMovement : MonoBehaviour
         {
             animator.SetBool("moving", false);
         }
+    }
 
+    void gameIntelligence()
+    {
+        if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 0)
+        {
+            GenerateMap.instance.generateBoutique(0, 0, "chaussure");
+            stage++;
+        }
+        else if (stage == 1 && ispassed[0] == true)
+        {
+            GenerateMap.instance.generateUsine(0, 1);
+            stage++;
+        }
+        else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 2)
+        {
+            GenerateMap.instance.generateBoutique(0, 2, "baton");
+            stage++;
+        }
+        else if (stage == 3 && ispassed[1] == true)
+        {
+            GenerateMap.instance.generateUsine(1, 1);
+            stage++;
+        }
+        else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 4)
+        {
+            GenerateMap.instance.generateBoutique(1, 2, "rechaud");
+            stage++;
+        }
+        else if (stage == 5 && ispassed[2] == true)
+        {
+            GenerateMap.instance.generateUsine(2, 0);
+            stage++;
+        }
+        else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 6)
+        {
+            GenerateMap.instance.generateBoutique(2, 1, "tente");
+            stage++;
+        }
+        else if (stage == 7 && ispassed[3] == true)
+        {
+            GenerateMap.instance.generateUsine(1, 0);
+            //stage++;
+        }
     }
 }