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 +157 -8
6 changed files with 157 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 637257610f - Show all commits

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

@ -30,6 +30,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3501783116545349986}
- {fileID: 6716417799655040460}
- {fileID: 7628964284593499177}
- {fileID: 1691244495608687713}
@ -94,7 +95,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4817988606444742094}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -127,6 +128,96 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &7208680640146097829
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3501783116545349986}
- component: {fileID: 4692438377285158079}
- component: {fileID: 5060206313964554553}
- component: {fileID: 4386748212301473067}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3501783116545349986
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7208680640146097829}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 46.65209, y: 30.223253, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4817988606444742094}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4692438377285158079
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7208680640146097829}
m_CullTransparentMesh: 1
--- !u!114 &5060206313964554553
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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
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
@ -152,7 +243,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x
@ -322,7 +413,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x
@ -488,7 +579,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x

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

@ -28,9 +28,10 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{
_instance = Instantiate(_upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform);
AssignUpgrades(canvas);
EventSystem.current.SetSelectedGameObject(_instance);
_instance.AddComponent<DeselectedAction>();
}
}
}
else
{
@ -47,9 +48,13 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{
if (_upgradeList.Count > i && _upgradeList[i] != null)
{
GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
button.Initialize(_upgradeList[i], gameObject, canvas);
GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
{
button.Initialize(_upgradeList[i], gameObject, canvas);
}
//UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
//button.Initialize(_upgradeList[i], gameObject, canvas);
}
}
}

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

@ -0,0 +1,18 @@
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 Normal file
View File

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

13
Assets/Scripts/UnitTree/DeselectedAction.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class DeselectedAction : MonoBehaviour, IDeselectHandler
{
public void OnDeselect(BaseEventData eventData)
{
Debug.Log("Called to deselect");
Destroy(gameObject);
}
}

11
Assets/Scripts/UnitTree/DeselectedAction.cs.meta Normal file
View File

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