diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity index 514f2d0bc9bb6adf323f7afa49c1cef1d5a4d686..e1546616d395f287a6e02a0b0cac2219929f5624 100644 --- a/Assets/Scenes/sceneRaffael.unity +++ b/Assets/Scenes/sceneRaffael.unity @@ -2554,6 +2554,10 @@ PrefabInstance: propertyPath: m_Offset.y value: -0.17818928 objectReference: {fileID: 0} + - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3} + propertyPath: speed + value: 30 + objectReference: {fileID: 0} - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3} propertyPath: player value: @@ -3346,7 +3350,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemNeeded: {fileID: 11400000, guid: efcf49924f9a75d4ca34174b60873d06, type: 2} - forestCollider: {fileID: 0} + forestCollider: {fileID: 785585435} --- !u!4 &787488641 stripped Transform: m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3} @@ -5249,7 +5253,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemNeeded: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2} - forestCollider: {fileID: 0} + forestCollider: {fileID: 1348729465} --- !u!1001 &1362736781 PrefabInstance: m_ObjectHideFlags: 0 @@ -5585,7 +5589,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemNeeded: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2} - forestCollider: {fileID: 0} + forestCollider: {fileID: 1466266821} --- !u!61 &1466266821 BoxCollider2D: m_ObjectHideFlags: 0 @@ -15294,7 +15298,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemNeeded: {fileID: 11400000, guid: e217cd1973709d844bb97beb373c5447, type: 2} - forestCollider: {fileID: 0} + forestCollider: {fileID: 1735684084} --- !u!4 &1752424813 stripped Transform: m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3} diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs index 5df5a44c8d4c613b3f78472e494a957faa86afd6..8bc7d68ead38fb5387234bb45b0592d7c96c62b7 100644 --- a/Assets/Scripts/Inventory/Border.cs +++ b/Assets/Scripts/Inventory/Border.cs @@ -6,7 +6,7 @@ public class Border : MonoBehaviour { public Item itemNeeded; public BoxCollider2D forestCollider; - private GameObject player = GameObject.FindGameObjectWithTag("Player"); + private void OnCollisionEnter2D(Collision2D collision) { @@ -16,9 +16,11 @@ public class Border : MonoBehaviour Debug.Log("JE TOUCHE LA BORDEER"); if (Inventory.instance.hasItem(itemNeeded)) { - Debug.Log("Je poss?de l'item n?cessaire"); + 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 { @@ -28,19 +30,15 @@ public class Border : MonoBehaviour { case 1: Dialog.instance.setSituation("borderChaussure"); - player.GetComponent<PlayerMovement>().ispassed[0] = true; break; case 2: Dialog.instance.setSituation("borderBaton"); - player.GetComponent<PlayerMovement>().ispassed[1] = true; break; case 3: Dialog.instance.setSituation("borderRechaud"); - player.GetComponent<PlayerMovement>().ispassed[2] = true; break; case 4: - Dialog.instance.setSituation("borderTente"); - player.GetComponent<PlayerMovement>().ispassed[3] = true; + Dialog.instance.setSituation("borderTente"); break; } } diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 1083a51822f0a5995c929f54f21092e572838f79..fa80ec3abac00e6c01decbe87497376dca930406 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -33,6 +33,7 @@ public class PlayerMovement : MonoBehaviour animator.SetFloat("moveX", 0); animator.SetFloat("moveY", -1); + ispassed = new bool[] { false, false, false, false }; } // Update is called once per frame