Merge branch 'master' into 'debug'

Déplacement joueur

See merge request chirz/cityescape!86

Assets/Scenes/sceneRaffael.unity

@@ -5255,6 +5255,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -97
       objectReference: {fileID: 0}
+    - target: {fileID: 9185901235225783792, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_Color.b
+      value: 0.16771957
+      objectReference: {fileID: 0}
+    - target: {fileID: 9185901235225783792, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_Color.g
+      value: 0.509434
+      objectReference: {fileID: 0}
+    - target: {fileID: 9185901235225783792, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_Color.r
+      value: 0.06968674
+      objectReference: {fileID: 0}
     - target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -5263,6 +5275,14 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -7
+      objectReference: {fileID: 0}
+    - target: {fileID: 9185901235225783795, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 9185901235847042338, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
       propertyPath: m_Camera
       value: 
@@ -16589,6 +16609,26 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
+--- !u!1 &1921598971 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9185901235225783794, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
+  m_PrefabInstance: {fileID: 1365796445}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1921598973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1921598971}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.00071199884, g: 0.1509434, b: 0.029861368, a: 0.5}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
 --- !u!4 &1921602108 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}

Assets/Scripts/GUI/Dialog.cs

@@ -48,7 +48,8 @@ public class Dialog : MonoBehaviour
         string[] DialogsLvl1 = {
              "Ach... Encore eine gute chournée dans mon fillage!",
                 "Ch'ai très enfie te me balader",
-                "Che defrai aller au Nord dans la forêt ja !"
+                "Che defrai aller au Nord dans la forêt ja !",
+                "pour me déplacer, je dois utiliser mes  muscles 'flèches directionnelles'"
             };
         this.ListDialogs.Add("start", DialogsLvl1);