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

45
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View file

File diff suppressed because one or more lines are too long

32
Assets/Prefabs/MainAttackUI.prefab
View file

@ -410,10 +410,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1055042188058581191} m_Father: {fileID: 1055042188058581191}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 65, y: -45}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5246258934985849583 --- !u!222 &5246258934985849583
CanvasRenderer: CanvasRenderer:
@ -606,10 +606,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1055042188058581191} m_Father: {fileID: 1055042188058581191}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 65, y: -15}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5076518916156975202 --- !u!222 &5076518916156975202
CanvasRenderer: CanvasRenderer:
@ -742,10 +742,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1055042188058581191} m_Father: {fileID: 1055042188058581191}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 205, y: -15}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5483779142153750640 --- !u!222 &5483779142153750640
CanvasRenderer: CanvasRenderer:
@ -878,10 +878,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 1055042188058581191} m_Father: {fileID: 1055042188058581191}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 205, y: -45}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &898996157947601074 --- !u!222 &898996157947601074
CanvasRenderer: CanvasRenderer:

2396
Assets/Scenes/Game.unity
View file

File diff suppressed because it is too large Load diff

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

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
public class AbilityUIHandler : MonoBehaviour public class AbilityUIHandler : MonoBehaviour
{ {
@ -20,8 +21,9 @@ public class AbilityUIHandler : MonoBehaviour
#endregion #endregion
[Header("Abilities")] [Header("Abilities")]
public List<AbilityUIObject> uiObjects = new(); public List<Button> uiObjects = new();
[SerializeField] private MarisaAbilityHandler playerAbilityHandler; [SerializeField] private MarisaAbilityHandler playerAbilityHandler;
[SerializeField] private AbilityUIObject abilityUI;
[Header("Upgrades")] [Header("Upgrades")]
[SerializeField] private Transform upgradeGrid; [SerializeField] private Transform upgradeGrid;
@ -29,14 +31,7 @@ public class AbilityUIHandler : MonoBehaviour
private void Start() private void Start()
{ {
uiObjects[0].thisAbility = playerAbilityHandler.mainAttackInstance; UpdateAbilitySelection();
uiObjects[1].thisAbility = playerAbilityHandler.secondaryAttackInstance;
uiObjects[2].thisAbility = playerAbilityHandler.spellAInstance;
uiObjects[3].thisAbility = playerAbilityHandler.spellBInstance;
foreach (AbilityUIObject uiObject in uiObjects)
{
uiObject.UpdateUI();
}
} }
public void UpdateInventory() 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")] [Header("Ability Stats")]
[SerializeField] private TextMeshProUGUI damage; [SerializeField] private TextMeshProUGUI damage;
[SerializeField] private TextMeshProUGUI fireRate; [SerializeField] private TextMeshProUGUI fireRate;
[SerializeField] private TextMeshProUGUI piercing;
[SerializeField] private TextMeshProUGUI projectileCount;
[Header("Upgrades")] [Header("Upgrades")]
[SerializeField] private int upgradeSlotAmount; [SerializeField] private int upgradeSlotAmount;
[SerializeField] private UpgradeBoxUI templateUpgradeBox; [SerializeField] private UpgradeBoxUI templateUpgradeBox;
@ -29,11 +27,6 @@ public class AbilityUIObject : MonoBehaviour
abilityName.text = thisAbility.abilityName; abilityName.text = thisAbility.abilityName;
damage.text = $"Damage: {thisAbility.power}"; damage.text = $"Damage: {thisAbility.power}";
fireRate.text = $"Fire rate: {thisAbility.cooldown}s"; 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) foreach (AbilityUpgrade upgrade in AbilityManager.instance.allUpgrades)
{ {
if (thisAbility.GetUpgradeCount(upgrade) > 0) if (thisAbility.GetUpgradeCount(upgrade) > 0)

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

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