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

Semi works. Console issues

Browse Source
This commit is contained in:
Ader Alisma 01 2025-03-01 22:00:02 -05:00
parent 637257610f
commit 25308695e2
4 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/Ally/AllyUpgrade.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI;
public class AllyUpgrade : MonoBehaviour, IPointerClickHandler public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{ {
@ -28,8 +29,9 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{ {
_instance = Instantiate(_upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform); _instance = Instantiate(_upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform);
AssignUpgrades(canvas); AssignUpgrades(canvas);
EventSystem.current.SetSelectedGameObject(_instance); //EventSystem.current.SetSelectedGameObject(_instance);
_instance.AddComponent<DeselectedAction>(); //_instance.GetComponent<Selectable>().Select();
//_instance.AddComponent<DeselectedAction>();
} }
} }
} }
@ -51,6 +53,8 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject; GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button)) if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
{ {
button.GetComponent<Selectable>().Select();
button.gameObject.AddComponent<DeselectedAction>();
button.Initialize(_upgradeList[i], gameObject, canvas); button.Initialize(_upgradeList[i], gameObject, canvas);
} }
//UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>(); //UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();

18
Assets/Scripts/Ally/UpgradeBackgroundInteraction.cs
View File

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class UpgradeBackgroundInteraction : MonoBehaviour, IPointerClickHandler
{
[SerializeField]
private GameObject _upgradeUI;
public void OnPointerClick(PointerEventData eventData)
{
if (_upgradeUI != null)
{
Destroy(_upgradeUI);
}
}
}

11
Assets/Scripts/Ally/UpgradeBackgroundInteraction.cs.meta
View File

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

9
Assets/Scripts/UnitTree/DeselectedAction.cs
View File

@ -5,9 +5,18 @@ using UnityEngine.EventSystems;
public class DeselectedAction : MonoBehaviour, IDeselectHandler public class DeselectedAction : MonoBehaviour, IDeselectHandler
{ {
public delegate void OnPointerClick(PointerEventData eventData);
private OnPointerClick _onPointerClick;
public DeselectedAction(OnPointerClick ooga)
{
_onPointerClick = ooga;
}
public void OnDeselect(BaseEventData eventData) public void OnDeselect(BaseEventData eventData)
{ {
Debug.Log("Called to deselect"); Debug.Log("Called to deselect");
//_onPointerClick.Invoke((PointerEventData)eventData);
Destroy(gameObject); Destroy(gameObject);
} }
} }