From 196740676df3a8b2b1cfa877b0b61dabdda497e0 Mon Sep 17 00:00:00 2001
From: Ader Alisma 01 <adeder22@hotmail.com>
Date: Sun, 27 Oct 2024 15:37:30 -0400
Subject: [PATCH] =?UTF-8?q?Permettre=201=20=C3=A0=203=20upgrades?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Ally/AllyUpgrade.cs            | 16 ++++-----
 Assets/Scripts/UnitTree/UnitTreeDisplay.cs    |  7 +---
 Assets/Scripts/UnitTree/UnitTreeManager.cs    | 34 -------------------
 .../Scripts/UnitTree/UnitTreeManager.cs.meta  | 11 ------
 .../UnitTree/UpgradePlacementButton.cs        |  5 ++-
 5 files changed, 11 insertions(+), 62 deletions(-)
 delete mode 100644 Assets/Scripts/UnitTree/UnitTreeManager.cs
 delete mode 100644 Assets/Scripts/UnitTree/UnitTreeManager.cs.meta

diff --git a/Assets/Scripts/Ally/AllyUpgrade.cs b/Assets/Scripts/Ally/AllyUpgrade.cs
index 90d2aa9..c204895 100644
--- a/Assets/Scripts/Ally/AllyUpgrade.cs
+++ b/Assets/Scripts/Ally/AllyUpgrade.cs
@@ -15,7 +15,6 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
     {
         if (eventData.button == 0)  //Left click
         {
-            Debug.Log("Event clicked...");
             if (!_instance)
             {
                 GameObject sceneCanvas = GameObject.Find("Canvas");
@@ -32,14 +31,11 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
                         AssignUpgrades(canvas);
                     }
                 }
-                Debug.Log(_instance.transform.position);
-                Debug.Log(Camera.main.WorldToScreenPoint(transform.position));
                 
             }
             else
             {
                 Destroy(_instance);
-                Debug.Log("Destroyed....");
             }
 
         }
@@ -47,14 +43,14 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
 
     private void AssignUpgrades(Canvas canvas)
     {
-        GameObject _firstChildren = _instance.transform.GetChild(1).gameObject;
-        Debug.Log("Upgrade count: " + _firstChildren.transform.childCount);
         // Assign upgrade Prefabs
         for (int i = 0; i < _instance.transform.childCount - 1; i++)
         {
-            Debug.Log(i);
-            GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
-            UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
-            button.Initialize(_upgradeList[i], gameObject, canvas);
+            if (_upgradeList[i] != null)
+            {
+                GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
+                UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
+                button.Initialize(_upgradeList[i], gameObject, canvas);
+            }
         }
     }}
diff --git a/Assets/Scripts/UnitTree/UnitTreeDisplay.cs b/Assets/Scripts/UnitTree/UnitTreeDisplay.cs
index 556ee0b..fa0353e 100644
--- a/Assets/Scripts/UnitTree/UnitTreeDisplay.cs
+++ b/Assets/Scripts/UnitTree/UnitTreeDisplay.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-public class UnitTreeDisplay : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler
+public class UnitTreeDisplay : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 {
     //private Vector3 _originPosition;
     private Vector2 _size;
@@ -24,11 +24,6 @@ public class UnitTreeDisplay : MonoBehaviour, IPointerEnterHandler, IPointerExit
         _rectTransform.anchoredPosition = position;
     }
 
-    public void OnPointerClick(PointerEventData eventData)
-    {
-        Debug.Log("Upgrade clicked!!!");
-    }
-
     public void OnPointerEnter(PointerEventData eventData)
     {
         _rectTransform.sizeDelta = _size * 1.05f;
diff --git a/Assets/Scripts/UnitTree/UnitTreeManager.cs b/Assets/Scripts/UnitTree/UnitTreeManager.cs
deleted file mode 100644
index fa61ce8..0000000
--- a/Assets/Scripts/UnitTree/UnitTreeManager.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class UnitTreeManager : MonoBehaviour
-{
-    private List<UnitTreeDisplay> oogaDisplay = new List<UnitTreeDisplay>();
-
-    private void Start()
-    {
-        
-    }
-    //Shows the unit's upgrades around its position
-    public void ShowUpgrades(Vector3 position)
-    {
-        Vector3 m_Position = position;
-
-        //Instantiate UnitTreeDisplay rect 3 times
-        for (int i = 0; i < 3; i++)
-        {
-            GameObject rect = new GameObject();
-            Vector3 rectPosition = m_Position;
-            rectPosition.x += 10.0f * i;
-            GameObject instance = Instantiate(rect, rectPosition, transform.rotation);
-            instance.AddComponent<RectTransform>();
-            UnitTreeDisplay ooga = instance.AddComponent<UnitTreeDisplay>();
-            ooga.SetPosition(rectPosition);
-        }
-
-        //Instantiate line (later curved line? https://forum.unity.com/threads/easy-curved-line-renderer-free-utility.391219/)
-        
-        //TODO later... Get unit's next upgrades
-    }
-}
diff --git a/Assets/Scripts/UnitTree/UnitTreeManager.cs.meta b/Assets/Scripts/UnitTree/UnitTreeManager.cs.meta
deleted file mode 100644
index 4f6865b..0000000
--- a/Assets/Scripts/UnitTree/UnitTreeManager.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 61640dcfbaf00194593b814583a26f96
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs
index 2e0916e..69ecaa2 100644
--- a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs
+++ b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs
@@ -33,7 +33,10 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
     void Start()
     {
         _button = GetComponent<Button>();
-        _button.enabled = true;
+        if (_unitCardInformation == null)
+        {
+            Destroy(gameObject);
+        }
     }
     
     void Update()