From 54a911126bbba48a9172b41ce744db58f5968959 Mon Sep 17 00:00:00 2001
From: colin <colingirault@hotmail>
Date: Fri, 17 Dec 2021 02:52:33 +0100
Subject: [PATCH] Fix_Obstacles
---
.../Assets/Scripts/Obstacle/Medium/DragDropM.cs | 11 ++++++++++-
.../Assets/Scripts/Obstacle/Strong/DragDropS.cs | 10 +++++++++-
T3-Unity/Assets/Scripts/Obstacle/weak/DragDropW.cs | 13 ++++++++++---
T3-Unity/Assets/Scripts/UI/DiffScale.cs | 5 +++++
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs b/T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs
index 1bbb395..71091fa 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs
@@ -25,7 +25,16 @@ public class DragDropM : MonoBehaviour, IDragHandler, IDropHandler
public void OnDrag(PointerEventData eventData)
{
- rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+ if (Ui.nbObst == 0)
+ {
+ Destroy(this.gameObject);
+ Ui.nbObst++;
+ }
+ else
+ {
+ rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+ }
+
}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/Strong/DragDropS.cs b/T3-Unity/Assets/Scripts/Obstacle/Strong/DragDropS.cs
index 24c4aec..5f1b973 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/Strong/DragDropS.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/Strong/DragDropS.cs
@@ -25,7 +25,15 @@ public class DragDropS : MonoBehaviour, IDragHandler, IDropHandler
public void OnDrag(PointerEventData eventData)
{
- rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+ if (Ui.nbObst == 0)
+ {
+ Destroy(this.gameObject);
+ Ui.nbObst++;
+ }
+ else
+ {
+ rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+ }
}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/weak/DragDropW.cs b/T3-Unity/Assets/Scripts/Obstacle/weak/DragDropW.cs
index 242e6f9..b5c0e78 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/weak/DragDropW.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/weak/DragDropW.cs
@@ -23,9 +23,16 @@ public class DragDropW : MonoBehaviour, IDragHandler, IDropHandler
public void OnDrag(PointerEventData eventData)
{
-
- rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
-
+
+ if (Ui.nbObst == 0)
+ {
+ Destroy(this.gameObject);
+ Ui.nbObst++;
+ }
+ else
+ {
+ rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+ }
}
public void OnDrop(PointerEventData eventData)
diff --git a/T3-Unity/Assets/Scripts/UI/DiffScale.cs b/T3-Unity/Assets/Scripts/UI/DiffScale.cs
index 8d451cf..b17b54d 100644
--- a/T3-Unity/Assets/Scripts/UI/DiffScale.cs
+++ b/T3-Unity/Assets/Scripts/UI/DiffScale.cs
@@ -27,6 +27,11 @@ public class DiffScale : MonoBehaviour
Ui.difficulty = 0;
}
+ if (Ui.nbObst < 0)
+ {
+ Ui.nbObst = 0;
+ }
+
textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
textshowed.GetComponent<TMP_Text>().text = "Obstacles restants : " + Ui.nbObst.ToString();
}
--
GitLab