Merge branch 'main' into 'main'

Placement_objects

See merge request !67

T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs

@@ -2,21 +2,21 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using TMPro;
 
-public class DragDrop : MonoBehaviour, IDragHandler
+public class DragDrop : MonoBehaviour, IDragHandler, IDropHandler
 {
 
     [SerializeField] private Canvas canvas;
 
     private RectTransform rectransform;
-    
-
+    public TMP_Text textshowed;
 
 
     private void Awake()
     {
         rectransform = GetComponent<RectTransform>();
-
+        
     }
  
 
@@ -24,7 +24,23 @@ public class DragDrop : MonoBehaviour, IDragHandler
     {
         
         rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+        
     }
 
+    public void OnDrop(PointerEventData eventData)
+    {
+
+        if (Ui.protec == false)
+        {
+            textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
+            textshowed.GetComponent<TMP_Text>().text = "dffd";
+        }
+        else
+        {
+            textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
+            textshowed.GetComponent<TMP_Text>().text = "aaaaa";
+        }
+        
+    }
 }
  

T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+public class UiProtec : MonoBehaviour
+{
+    public void protectedUi()
+    {
+        Ui.protec = true;
+    }
+
+    public void unProtectedUi()
+    {
+        Ui.protec = false;
+    }
+}

T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta

+fileFormatVersion: 2
+guid: 02e48c10dc39a4c498c2eccc20883084
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

T3-Unity/Assets/Scripts/UI/Ui.cs

@@ -6,13 +6,16 @@ using TMPro;
 public class Ui : MonoBehaviour
 {
 
+    public static bool stop = false;
+    public static bool start = false;
+    public static bool protec = false;
+
     public static float motiv;
     public static float difficulty;
+
     public static int fame;
-    public static int nbObst;
-    public static bool stop = false;
-    public static int rep;
-    public static bool start = false;
+    public static int nbObst = 5;
+
     public GameObject prefab;
     public Canvas parent;
 

T3-Unity/Assets/Scripts/UI/nbObstacle.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 
 public class nbObstacle : MonoBehaviour
 {
 
+    public TMP_Text textshowed;
+
     public static void decreaseObstacle()
     {
         Ui.nbObst = Ui.nbObst - 1;
     }
 
-     public void changeObs(string word)
-    {
-    }
 }

T3-Unity/Assets/scip.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class scip : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

T3-Unity/Assets/scip.cs.meta

+fileFormatVersion: 2
+guid: de6aaac61bc640941b6724081c5d0eb9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: