From 8a6764d8065d291387e6e85c28fe2708262b414c Mon Sep 17 00:00:00 2001
From: "v.bloch" <v.bloch@etu.unistra.fr>
Date: Tue, 30 Mar 2021 18:22:21 +0200
Subject: [PATCH] ajout du system de detection de l'usine
---
Assets/Prefabs/Parcelles/Melvyn_usine.prefab | 27 ++++++++++++++++++++
Assets/Scripts/Player/PlayerMovement.cs | 1 +
2 files changed, 28 insertions(+)
diff --git a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
index f150acf..0056287 100644
--- a/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_usine.prefab
@@ -10,6 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 4898574938548127473}
- component: {fileID: 2973155800191798711}
+ - component: {fileID: 1789962585650722535}
m_Layer: 0
m_Name: Melvyn_usine
m_TagString: factory
@@ -48,6 +49,32 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
+--- !u!61 &1789962585650722535
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1755158007606780204}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 2.4990609, y: 5.747837}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 16.851177, y: 12.495674}
+ m_EdgeRadius: 0
--- !u!1 &2615463350671863606
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index de6ad47..463f148 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -78,6 +78,7 @@ public class PlayerMovement : MonoBehaviour
{
if (collision.CompareTag("factory"))
{
+ Debug.Log("perte de vie");
this.GetComponent<PlayerNature>().LooseNature(20);
}
}
--
GitLab