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

bugfix/HideUpgradesOnDeselect #9

Merged
Ader_Alisma merged 16 commits from bugfix/HideUpgradesOnDeselect into main 2025-09-07 22:48:30 +00:00
Conversation 3 Commits 16 Files Changed 5 +46 -52
3 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 679876ee21 - Show all commits

68
Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab
View File

@ -139,7 +139,6 @@ GameObject:
- component: {fileID: 3501783116545349986}
- component: {fileID: 4692438377285158079}
- component: {fileID: 5060206313964554553}
- component: {fileID: 4386748212301473067}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
@ -205,19 +204,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4386748212301473067
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7208680640146097829}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a21c0b3dd4bba9043b861395aef68445, type: 3}
m_Name:
m_EditorClassIdentifier:
_upgradeUI: {fileID: 4817988606444742093}
--- !u!1001 &2008641878076503636
PrefabInstance:
m_ObjectHideFlags: 0
@ -335,11 +321,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -347,15 +333,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -363,15 +349,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -379,7 +365,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
@ -501,11 +487,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -513,15 +499,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -529,15 +515,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -545,7 +531,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
@ -671,11 +657,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -683,15 +669,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -699,15 +685,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
@ -715,7 +701,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}

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

@ -38,6 +38,7 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
else
{
Destroy(_instance);
_instance = null;
}
}
@ -53,12 +54,10 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
{
button.GetComponent<Selectable>().Select();
button.gameObject.AddComponent<DeselectedAction>();
button.Initialize(_upgradeList[i], gameObject, canvas);
button.GetComponent<Selectable>().Select();
button.gameObject.AddComponent<DeselectedAction>().Init(_instance);
}
//UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
//button.Initialize(_upgradeList[i], gameObject, canvas);
}
}
}
@ -67,7 +66,19 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{
if (_instance != null)
{
Debug.Log("Destroying upgrade UI");
Destroy(_instance);
_instance = null;
}
}
//public void OnDeselect(BaseEventData eventData)
//{
// if (_instance != null)
// {
// Debug.Log("Destroying upgrade UI");
// Destroy(_instance);
// _instance = null;
// }
//}
}

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

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