myondev/MarisaMagicalStudy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this guy changed like a singular line of code

Browse source
This commit is contained in:
Sylvia 2026-03-17 00:01:56 -07:00
parent 980deb5d09
commit fc1d1dee00
6 changed files with 1250 additions and 1262 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Assets/Scripts/Abilities/AbilityUIHandler.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class AbilityUIHandler : MonoBehaviour
{
@ -20,8 +21,9 @@ public class AbilityUIHandler : MonoBehaviour
#endregion
[Header("Abilities")]
public List<AbilityUIObject> uiObjects = new();
public List<Button> uiObjects = new();
[SerializeField] private MarisaAbilityHandler playerAbilityHandler;
[SerializeField] private AbilityUIObject abilityUI;
[Header("Upgrades")]
[SerializeField] private Transform upgradeGrid;
@ -29,14 +31,7 @@ public class AbilityUIHandler : MonoBehaviour
private void Start()
{
uiObjects[0].thisAbility = playerAbilityHandler.mainAttackInstance;
uiObjects[1].thisAbility = playerAbilityHandler.secondaryAttackInstance;
uiObjects[2].thisAbility = playerAbilityHandler.spellAInstance;
uiObjects[3].thisAbility = playerAbilityHandler.spellBInstance;
foreach (AbilityUIObject uiObject in uiObjects)
{
uiObject.UpdateUI();
}
UpdateAbilitySelection();
}
public void UpdateInventory()
@ -55,4 +50,18 @@ public class AbilityUIHandler : MonoBehaviour
}
}
}
public void UpdateAbilitySelection()
{
uiObjects[0].onClick.AddListener(() => ShowAbilityUI(playerAbilityHandler.mainAttackInstance));
uiObjects[1].onClick.AddListener(() => ShowAbilityUI(playerAbilityHandler.secondaryAttackInstance));
uiObjects[2].onClick.AddListener(() => ShowAbilityUI(playerAbilityHandler.spellAInstance));
uiObjects[3].onClick.AddListener(() => ShowAbilityUI(playerAbilityHandler.spellBInstance));
}
public void ShowAbilityUI(PlayerAbility ability)
{
abilityUI.thisAbility = ability;
abilityUI.UpdateUI();
}
}

7
Assets/Scripts/Abilities/AbilityUIObject.cs
View file

@ -13,8 +13,6 @@ public class AbilityUIObject : MonoBehaviour
[Header("Ability Stats")]
[SerializeField] private TextMeshProUGUI damage;
[SerializeField] private TextMeshProUGUI fireRate;
[SerializeField] private TextMeshProUGUI piercing;
[SerializeField] private TextMeshProUGUI projectileCount;
[Header("Upgrades")]
[SerializeField] private int upgradeSlotAmount;
[SerializeField] private UpgradeBoxUI templateUpgradeBox;
@ -29,11 +27,6 @@ public class AbilityUIObject : MonoBehaviour
abilityName.text = thisAbility.abilityName;
damage.text = $"Damage: {thisAbility.power}";
fireRate.text = $"Fire rate: {thisAbility.cooldown}s";
if (thisAbility.TryGetComponent(out FireBullet isBullet))
{
piercing.text = $"Piercing: {isBullet.pierceAmount}";
projectileCount.text = $"Projectiles: {isBullet.projectileCount}";
}
foreach (AbilityUpgrade upgrade in AbilityManager.instance.allUpgrades)
{
if (thisAbility.GetUpgradeCount(upgrade) > 0)

5
Assets/Scripts/Abilities/FloatingAbilityInfo.cs
View file

@ -11,7 +11,10 @@ public class FloatingAbilityInfo : MonoBehaviour
[SerializeField] private TextMeshProUGUI projectileCountStat;
private void Update()
{
transform.position = Input.mousePosition - offset;
if (!Input.GetKey(KeyCode.LeftShift))
{
transform.position = Input.mousePosition - offset;
}
}
public void ShowInfo(PlayerAbility ability)