Merge branch 'master' into 'master'

Modif caméra, modif barre

See merge request chirz/cityescape!78

Assets/Physics.meta

-fileFormatVersion: 2
-guid: 5097a5d46361eda43b5a45ce166e49aa
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/GUI/BarreDenature.prefab

@@ -601,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: 262, y: -82}
+  m_AnchoredPosition: {x: 276, y: -82}
   m_SizeDelta: {x: 783.7002, y: 106.7631}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6308161532840785029
@@ -645,7 +645,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: Press space to continue...
+  m_Text: Press space to continue
 --- !u!114 &8222045683807769845
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -658,8 +658,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.8235294}
+  m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
 --- !u!1 &8044393686726401242
 GameObject:
@@ -739,7 +739,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Inventaire
+  m_Text: Infentaire
 --- !u!1 &8451290368213161651
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GUI/Dialog.cs

@@ -46,33 +46,12 @@ 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 !"
             };
-
-
         this.ListDialogs.Add("start", DialogsLvl1);
 
-        string[] Dialogsraff = {
-            "Salut",
-            "cava ?",
-            "Je te mange tes morts"
-        };
-
-        this.ListDialogs.Add("pnj", Dialogsraff);
-
-        string[] DialogsTest = {
-            "Je fais un test",
-            "ca marche ? ou pas ?",
-            "bisous"
-        };
-
-        this.ListDialogs.Add("test", DialogsTest);
-
 
         string[] boutiqueChaussure = {
             "Je fous prendrais zes chauzzures en taille Zweiundvierzig Bitte !",
@@ -127,6 +106,7 @@ 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;
@@ -138,7 +118,7 @@ public class Dialog : MonoBehaviour
             
             this.setSituation("marchand");
         }
-            
+            */
         if(this.dialogActive)
         {
             this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);