Cleanup

Assets/Scenes/Game.unity

@@ -4675,6 +4675,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4c63e60a445cf4549999d898b25ab0ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _canvas: {fileID: 1092900231}
 --- !u!1 &1761692192
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Ally/AllyUpgrade.cs

@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
-{
-    [SerializeField]
-    private GameObject _upgradeUI;
-    [SerializeField]
-    private List<UnitUpgrade> _upgradeList = new List<UnitUpgrade>();
-    private GameObject _instance = null;
-
-    public void OnPointerClick(PointerEventData eventData)
-    {
-        if (eventData.button == 0)  //Left click
-        {
-            if (!_instance)
-            {
-                GameObject sceneCanvas = GameObject.Find("Canvas");
-                if (sceneCanvas != null)
-                {
-                    Canvas canvas = sceneCanvas.GetComponent<Canvas>();
-                    if (canvas == null)
-                    {
-                        Debug.Log("Canvas introuvable...");
-                    }
-                    else
-                    {
-                        _instance = Instantiate(_upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform);
-                        AssignUpgrades(canvas);
-                        DeselectManager.Instance.SetAllyUpgrade(_instance);
-                    }
-                }
-            }
-            else
-            {
-                Destroy(_instance);
-                _instance = null;
-            }
-        }
-    }
-
-    private void AssignUpgrades(Canvas canvas)
-    {
-        // Assign upgrade Prefabs  
-        for (int i = 0; i < _instance.transform.childCount - 1; i++)
-        {
-            if (_upgradeList.Count > i && _upgradeList[i] != null)
-            {
-                GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
-                if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
-                {
-                    button.Initialize(_upgradeList[i], gameObject, canvas);
-                    //button.GetComponent<Selectable>().Select();
-                    //button.gameObject.AddComponent<DeselectedAction>().Init(_instance);
-                }
-            }
-        }
-    }
-
-    private void OnDestroy()
-    {
-        if (_instance != null)
-        {
-            Debug.Log("Destroying upgrade UI");
-            Destroy(_instance);
-            _instance = null;
-        }
-    }
-}

Assets/Scripts/Ally/AllyUpgrade.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: edcd1782caa73a747b1f060d18ce0f18
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/UnitTree/DeselectManager.cs

@@ -1,31 +1,35 @@
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 public class DeselectManager : SingletonBehaviour<DeselectManager>
 {
     private GameObject _allyUpgrade;
+    [SerializeField]
+    private Canvas _canvas;
 
     private void Update()
     {
-        if (Input.GetMouseButton(0))
+        if (Input.GetMouseButton(0) && _allyUpgrade != null)
         {
-            // Verifie var si click est sur un enfant d'AllyUpgrade
+            // Vérifie si click est sur un enfant d'AllyUpgrade
-
+            PointerEventData pointerData = new PointerEventData(EventSystem.current)
-            GameObject selectedObject = UnityEngine.EventSystems.EventSystem.current.currentSelectedGameObject;
-            if (selectedObject != null && _allyUpgrade != null && selectedObject.transform.IsChildOf(_allyUpgrade.transform))
             {
-                return;
+                position = Input.mousePosition
-            }
+            };
-            else
+            List<RaycastResult> results = new List<RaycastResult>();
+            GraphicRaycaster raycaster = _canvas.GetComponent<GraphicRaycaster>();
+            raycaster.Raycast(pointerData, results);
+            foreach (RaycastResult result in results)
             {
-                Debug.Log("Called to deselect from Observer");
+                if (result.gameObject.transform.IsChildOf(_allyUpgrade.transform))
-                if (_allyUpgrade != null)
                 {
-                    Destroy(_allyUpgrade);
+                    return;
-                    _allyUpgrade = null;
                 }
             }
+            Destroy(_allyUpgrade);
+            _allyUpgrade = null;
         }
     }
 
@@ -34,14 +38,12 @@ public class DeselectManager : SingletonBehaviour<DeselectManager>
         if (_allyUpgrade == null)
         {
             _allyUpgrade = allyUpgradeInstance;
+
         }
         else if (_allyUpgrade != allyUpgradeInstance)
         {
             Destroy(_allyUpgrade);
             _allyUpgrade = allyUpgradeInstance;
         }
-        Debug.Log("AllyUpgrade set: " + _allyUpgrade?.name);
     }
-
-
 }