Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Deselect fonctionnel

Browse Source
This commit is contained in:
Ader Alisma 01 2025-06-29 17:40:51 -04:00
parent f39f019912
commit 9e20b0d463
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scenes/Game.unity
View File

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

33
Assets/Scripts/UnitTree/DeselectManager.cs
View File

@ -1,28 +1,35 @@
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class DeselectManager : SingletonBehaviour<DeselectManager> public class DeselectManager : SingletonBehaviour<DeselectManager>
{ {
private GameObject _allyUpgrade; private GameObject _allyUpgrade;
[SerializeField]
private Canvas _canvas;
private void Update() private void Update()
{ {
if (Input.GetMouseButton(0) && _allyUpgrade != null) 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 && 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))
Destroy(_allyUpgrade); {
_allyUpgrade = null; return;
}
} }
Destroy(_allyUpgrade);
_allyUpgrade = null;
} }
} }
@ -31,14 +38,12 @@ public class DeselectManager : SingletonBehaviour<DeselectManager>
if (_allyUpgrade == null) if (_allyUpgrade == null)
{ {
_allyUpgrade = allyUpgradeInstance; _allyUpgrade = allyUpgradeInstance;
} }
else if (_allyUpgrade != allyUpgradeInstance) else if (_allyUpgrade != allyUpgradeInstance)
{ {
Destroy(_allyUpgrade); Destroy(_allyUpgrade);
_allyUpgrade = allyUpgradeInstance; _allyUpgrade = allyUpgradeInstance;
} }
Debug.Log("AllyUpgrade set: " + _allyUpgrade?.name);
} }
} }