Merge branch 'master' into 'master'

Ajout système de border qu'on peut dépasser seulement avec le bon objet

See merge request chirz/cityescape!30

Assets/Items.meta

+fileFormatVersion: 2
+guid: 40174f7680c75804d8a5fdebf59e4172
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Items/1.Chaussures.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad6747a7004c29843a13b7d9d940ff1a, type: 3}
+  m_Name: 1.Chaussures
+  m_EditorClassIdentifier: 
+  id: 1
+  name: Chaussures de marche
+  description: Ces chaussures permettent de ne pas avoir mal aux pieds
+  image: {fileID: 0}

Assets/Items/1.Chaussures.asset.meta

+fileFormatVersion: 2
+guid: 951b6ca289a8358458e441a19c5cc460
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Items/2.Baton.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad6747a7004c29843a13b7d9d940ff1a, type: 3}
+  m_Name: 2.Baton
+  m_EditorClassIdentifier: 
+  id: 2
+  name: Baton de marche
+  description: Permet de moin ce fatiguer
+  image: {fileID: 0}

Assets/Items/2.Baton.asset.meta

+fileFormatVersion: 2
+guid: efcf49924f9a75d4ca34174b60873d06
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Items/3.Réchaud.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad6747a7004c29843a13b7d9d940ff1a, type: 3}
+  m_Name: "3.R\xE9chaud"
+  m_EditorClassIdentifier: 
+  id: 3
+  name: "R\xE9chaud"
+  description: Permet de faire des sorties plus longues en mangeant de super repas
+    chaud.
+  image: {fileID: 0}

Assets/Items/3.Réchaud.asset.meta

+fileFormatVersion: 2
+guid: e217cd1973709d844bb97beb373c5447
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Items/4.Tente.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad6747a7004c29843a13b7d9d940ff1a, type: 3}
+  m_Name: 4.Tente
+  m_EditorClassIdentifier: 
+  id: 4
+  name: Tente
+  description: "Permet de randonner tr\xE8s longtemps en dormant dans la for\xEAt."
+  image: {fileID: 0}

Assets/Items/4.Tente.asset.meta

+fileFormatVersion: 2
+guid: d72fe29080571f44ca0c6bd0d22ece7b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GUI/Dialog.cs

@@ -54,6 +54,7 @@ public class Dialog : MonoBehaviour
             "Raff est pas bo"
             };
 
+
         this.ListDialogs.Add("start", DialogsLvl1);
 
         string[] Dialogsraff = {
@@ -79,7 +80,6 @@ public class Dialog : MonoBehaviour
 
         this.ListDialogs.Add("marchand", DialogMarchand);
 
-
         if (this.dialogActive)
             this.Situation("start");
     }

Assets/Scripts/Inventory.meta

+fileFormatVersion: 2
+guid: ab3ec109ff5290d4fbf2a5df25b54135
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Inventory/Border.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Border : MonoBehaviour
+{
+    public Item itemNeeded;
+    public Inventory inventory;
+    public BoxCollider2D collider;
+
+    private void OnCollisionEnter2D(Collision2D collision)
+    {
+        if (collision.transform.CompareTag("Player"))
+        {
+
+            Debug.Log("JE TOUCHE LA BORDEER");
+            if (inventory.hasItem(itemNeeded))
+            {
+                Debug.Log("Je possde l'item ncessaire");
+                collider.enabled = false;
+
+            }
+            else
+                Debug.Log("Je ne possde pas l'item ncessaire");
+
+        }
+    }
+
+
+}

Assets/Scripts/Inventory/Border.cs.meta

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

Assets/Scripts/Inventory/Inventory.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class Inventory : MonoBehaviour
+{
+    public static Inventory instance;
+
+    public List<Item> content = new List<Item>();
+    
+    private void Awake(){
+        if(instance != null)
+            return;
+        instance = this;
+    }
+
+    public void addItem(Item item){
+        if (content.Contains(item))
+        {
+            Debug.LogWarning("Vous possdez dj un " + item.name + " dans votre inventaire.");
+        }
+        else
+        {
+            content.Add(item);
+        }
+    }
+
+    public bool hasItem(Item item)
+    {
+        if (content.Contains(item))
+            return true;
+        else
+            return false;
+    }
+
+    public List<Item> getItemList()
+    {
+        return this.content;
+    }
+
+}

Assets/Scripts/Inventory/Inventory.cs.meta

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

Assets/Scripts/Inventory/Item.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "Item", menuName = "Inventory/Item", order = 0)]
+public class Item : ScriptableObject {
+    
+    public int id;
+    public string name;
+    public string description;
+    public Sprite image;
+
+}

Assets/Scripts/Inventory/Item.cs.meta

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

ProjectSettings/EditorBuildSettings.asset

@@ -12,7 +12,7 @@ EditorBuildSettings:
     path: Assets/Scenes/Menu.unity
     guid: 458707c07ba6b4b4297fc1de6ac38622
   - enabled: 1
-    path: Assets/Scenes/testScene1 1.unity
+    path: Assets/Scenes/sceneRaffael.unity
     guid: bdf7662389bf8487c9a7909d08af8c3e
   - enabled: 1
     path: Assets/Scenes/Valentin.unity