diff --git a/Assets/Scenes/Valentin.unity b/Assets/Scenes/Valentin.unity index 5652559a97afa32f82d6a58457ae063a3a5867a8..6f54548f68740ec0154665b8c175645498273927 100644 --- a/Assets/Scenes/Valentin.unity +++ b/Assets/Scenes/Valentin.unity @@ -123,6 +123,69 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &56556506 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 830773922753710147, guid: bf02b84eee26240d383747dfba5353dc, type: 3} + m_PrefabInstance: {fileID: 8964184068704032841} + m_PrefabAsset: {fileID: 0} +--- !u!114 &56556509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56556506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0d67e78638d146bd8a6878c5027f9c5, type: 3} + m_Name: + m_EditorClassIdentifier: + inventory: {fileID: 145845055} + sellItem: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2} +--- !u!1 &145845054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 145845056} + - component: {fileID: 145845055} + m_Layer: 0 + m_Name: Inventory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &145845055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145845054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 083309443233a4e4281e87f98a00ca15, type: 3} + m_Name: + m_EditorClassIdentifier: + content: [] +--- !u!4 &145845056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145845054} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.709485, y: 1.8904314, z: 0.00023269653} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &461386753 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs index e7bdcdf5c080653ccfce3c1470bdba271fe01889..b231183c15417beeae016d578dde2466712bbaa0 100644 --- a/Assets/Shopping.cs +++ b/Assets/Shopping.cs @@ -5,11 +5,13 @@ using UnityEngine; public class Shopping : MonoBehaviour { private bool playerInRange; - private Component player; + public Inventory inventory; + public Item sellItem; + // Start is called before the first frame update void Start() { - + } // Update is called once per frame @@ -17,8 +19,9 @@ public class Shopping : MonoBehaviour { if (Input.GetKeyDown(KeyCode.E) && playerInRange) { - Dialog.instance.Situation("marchand"); - + Dialog.instance.setSituation("Marchand"); + inventory.addItem(sellItem); + Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire"); } } @@ -33,6 +36,5 @@ public class Shopping : MonoBehaviour private void OnTriggerExit2D(Collider2D collision) { playerInRange = false; - player = collision; } }