Merge branch 'main' into 'main'

Fix Obstacles

See merge request !87

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;
+        }
+        
 
     }
 

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;
+        }
 
     }
 

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)

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();
     }