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

Revert UI

Browse Source
This commit is contained in:
Ader Alisma 01 2024-10-27 11:49:12 -04:00
parent aa4224e7b9
commit 20a6393888
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Sticks/farmersAssociation.prefab
View File

@ -1240,7 +1240,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: edcd1782caa73a747b1f060d18ce0f18, type: 3} m_Script: {fileID: 11500000, guid: edcd1782caa73a747b1f060d18ce0f18, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_upgradeUI: {fileID: 2118220733331082121, guid: 3dea9da5643f37b43ac6145f65859558, type: 3} _upgradeUI: {fileID: 4817988606444742093, guid: 1d481c7093a8d2443a04261fd7c72be2, type: 3}
_upgradeList: _upgradeList:
- {fileID: 11400000, guid: 0c3268393deaed84d87f041b2a4f970c, type: 2} - {fileID: 11400000, guid: 0c3268393deaed84d87f041b2a4f970c, type: 2}
- {fileID: 11400000, guid: 1639cd6a5b9ac1f4c96319ebfcac741a, type: 2} - {fileID: 11400000, guid: 1639cd6a5b9ac1f4c96319ebfcac741a, type: 2}

7
Assets/Prefabs/UI/BuyableUnitsView/UpgradePlacementButton.prefab
View File

@ -198,15 +198,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 26a731ab13b65cc4eabb568482ef1832, type: 3} m_Script: {fileID: 11500000, guid: 26a731ab13b65cc4eabb568482ef1832, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_outlineMaterial: {fileID: 2100000, guid: 7f87c7d6b4237a34ea92984757e5c269, type: 2}
_unitCardInformation: {fileID: 0}
_foodLabel: {fileID: 907652129260736055} _foodLabel: {fileID: 907652129260736055}
_woodLabel: {fileID: 2551561112895533431} _woodLabel: {fileID: 2551561112895533431}
_rockLabel: {fileID: 3195941792010457804} _rockLabel: {fileID: 3195941792010457804}
_prefab: {fileID: 0} _backgroundImage: {fileID: 1078481983243672785}
_image: {fileID: 1078481983243672785}
_unitArt: {fileID: 907652128235033332} _unitArt: {fileID: 907652128235033332}
_buttonContainer: {fileID: 0} _buttonContainer: {fileID: 0}
_prefab: {fileID: 0}
_unitCardInformation: {fileID: 0}
--- !u!225 &6913755812382793111 --- !u!225 &6913755812382793111
CanvasGroup: CanvasGroup:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -50,10 +50,10 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
GameObject _firstChildren = _instance.transform.GetChild(1).gameObject; GameObject _firstChildren = _instance.transform.GetChild(1).gameObject;
Debug.Log("Upgrade count: " + _firstChildren.transform.childCount); Debug.Log("Upgrade count: " + _firstChildren.transform.childCount);
// Assign upgrade Prefabs // Assign upgrade Prefabs
for (int i = 0; i < _firstChildren.transform.childCount - 1; i++) for (int i = 0; i < _instance.transform.childCount - 1; i++)
{ {
Debug.Log(i); Debug.Log(i);
GameObject upgradeEnfant = _firstChildren.transform.GetChild(i).gameObject; GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>(); UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
button.Initialize(_upgradeList[i], gameObject, canvas); button.Initialize(_upgradeList[i], gameObject, canvas);
} }

28
Assets/Scripts/UnitTree/UpgradePlacementButton.cs
View File

@ -17,16 +17,6 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
[SerializeField] [SerializeField]
private Image _backgroundImage; private Image _backgroundImage;
[SerializeField] [SerializeField]
protected Sprite _availableBackgroundImage;
[SerializeField]
private Sprite _unavailableBackgroundImage;
[SerializeField]
private Button _backgroundImageHover;
[SerializeField]
protected Sprite _availableBackgroundImageHover;
[SerializeField]
private Sprite _unavailableBackgroundImageHover;
[SerializeField]
private Image _unitArt; private Image _unitArt;
[SerializeField] [SerializeField]
private GameObject _buttonContainer; private GameObject _buttonContainer;
@ -53,20 +43,11 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
_button.interactable = CanUse(); _button.interactable = CanUse();
if (CanUse()) if (CanUse())
{ {
_backgroundImage.sprite = _availableBackgroundImage; _backgroundImage.color = Color.green;
SpriteState spriteState = new SpriteState }
else
{ {
highlightedSprite = _availableBackgroundImageHover _backgroundImage.color = Color.red;
};
_backgroundImageHover.spriteState = spriteState;
} else
{
_backgroundImage.sprite = _unavailableBackgroundImage;
SpriteState spriteState = new SpriteState
{
highlightedSprite = _unavailableBackgroundImageHover
};
_backgroundImageHover.spriteState = spriteState;
} }
} }
} }
@ -102,6 +83,7 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
public void Initialize(UnitUpgrade unitUpgrade, GameObject parentGameObject, Canvas canvas) public void Initialize(UnitUpgrade unitUpgrade, GameObject parentGameObject, Canvas canvas)
{ {
Debug.Log(unitUpgrade.name);
_unitCardInformation = unitUpgrade.UpgradeUnitCard; _unitCardInformation = unitUpgrade.UpgradeUnitCard;
SetTextFor(_foodLabel, _unitCardInformation.Food); SetTextFor(_foodLabel, _unitCardInformation.Food);
SetTextFor(_woodLabel, _unitCardInformation.Wood); SetTextFor(_woodLabel, _unitCardInformation.Wood);