From a9f2ae8b4ffdf24dfbbcde66e0e90c7fd225124e Mon Sep 17 00:00:00 2001
From: "v.bloch" <v.bloch@etu.unistra.fr>
Date: Tue, 30 Mar 2021 19:32:58 +0200
Subject: [PATCH] merge
---
Assets/LoseNature.cs | 32 ++++++++++++++++++++
Assets/LoseNature.cs.meta | 11 +++++++
Assets/Prefabs/Parcelles/Melvyn_usine.prefab | 21 ++++++++++---
Assets/Scenes/sceneRaffael.unity | 8 ++---
Assets/Scripts/Player/PlayerMovement.cs | 10 +-----
5 files changed, 65 insertions(+), 17 deletions(-)
create mode 100644 Assets/LoseNature.cs
create mode 100644 Assets/LoseNature.cs.meta
diff --git a/Assets/LoseNature.cs b/Assets/LoseNature.cs
new file mode 100644
index 0000000..0acd612
--- /dev/null
+++ b/Assets/LoseNature.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LoseNature : MonoBehaviour
+{
+ private bool lostLife = false;
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+
+ private void OnTriggerEnter2D(Collider2D collision)
+ {
+ if (collision.CompareTag("Player"))
+ {
+ if (!lostLife)
+ {
+ Debug.Log("il pert de la vie");
+ collision.GetComponent<PlayerNature>().LooseNature(20);
+ this.lostLife = true;
+ }
+ }
+ }
+}
diff --git a/Assets/LoseNature.cs.meta b/Assets/LoseNature.cs.meta
new file mode 100644
index 0000000..f990fc0
--- /dev/null
+++ b/Assets/LoseNature.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66de21900d4274ff1a31fa90b52cefb2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
index 0056287..a6a4682 100644
--- a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
@@ -11,9 +11,10 @@ GameObject:
- component: {fileID: 4898574938548127473}
- component: {fileID: 2973155800191798711}
- component: {fileID: 1789962585650722535}
+ - component: {fileID: 852303139824774481}
m_Layer: 0
m_Name: Melvyn_usine
- m_TagString: factory
+ m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -59,10 +60,10 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 2.4990609, y: 5.747837}
+ m_Offset: {x: 0.7675805, y: 5.084715}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@@ -73,8 +74,20 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 16.851177, y: 12.495674}
+ m_Size: {x: 28.56631, y: 26.200176}
m_EdgeRadius: 0
+--- !u!114 &852303139824774481
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1755158007606780204}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 66de21900d4274ff1a31fa90b52cefb2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &2615463350671863606
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index 16524f6..6352a45 100644
--- a/Assets/Scenes/sceneRaffael.unity
+++ b/Assets/Scenes/sceneRaffael.unity
@@ -3338,7 +3338,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemNeeded: {fileID: 11400000, guid: efcf49924f9a75d4ca34174b60873d06, type: 2}
- collider: {fileID: 785585435}
+ forestCollider: {fileID: 0}
--- !u!4 &787488641 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
@@ -5241,7 +5241,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemNeeded: {fileID: 11400000, guid: d72fe29080571f44ca0c6bd0d22ece7b, type: 2}
- collider: {fileID: 1348729465}
+ forestCollider: {fileID: 0}
--- !u!1001 &1362736781
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5573,7 +5573,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemNeeded: {fileID: 11400000, guid: 951b6ca289a8358458e441a19c5cc460, type: 2}
- collider: {fileID: 1466266821}
+ forestCollider: {fileID: 0}
--- !u!61 &1466266821
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -15282,7 +15282,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
itemNeeded: {fileID: 11400000, guid: e217cd1973709d844bb97beb373c5447, type: 2}
- collider: {fileID: 1735684084}
+ forestCollider: {fileID: 0}
--- !u!4 &1752424813 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1136283715985276380, guid: 898c167cc2238f346bdccf7faa612453, type: 3}
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index 463f148..f16f217 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -19,6 +19,7 @@ public class PlayerMovement : MonoBehaviour
private Animator animator;
public PlayerState currentState;
+
// Start is called before the first frame update
void Start()
{
@@ -73,13 +74,4 @@ public class PlayerMovement : MonoBehaviour
animator.SetBool("moving", false);
}
}
-
- private void OnTriggerEnter2D(Collider2D collision)
- {
- if (collision.CompareTag("factory"))
- {
- Debug.Log("perte de vie");
- this.GetComponent<PlayerNature>().LooseNature(20);
- }
- }
}
--
GitLab