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

my HEAD hurts and the SFX is TOO LOUD

Browse source
This commit is contained in:
Sylvia 2026-04-26 21:49:57 -07:00
parent a3321d361c
commit d4ebf0ca61
41 changed files with 1465 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Assets/Scripts/Abilities/AbilityHotbarIcon.cs
View file

@ -7,27 +7,14 @@ public class AbilityHotbarIcon : MonoBehaviour, IPointerEnterHandler, IPointerEx
{
public Transform cooldownBar;
[SerializeField] private TextMeshProUGUI text;
private bool onCooldown;
private PlayerAbility thisAbility;
[SerializeField] private FloatingAbilityInfo infoUI;
private void Update()
{
if (onCooldown)
if (thisAbility.currentCooldown > 0f || cooldownBar.localScale.x < 1f)
{
cooldownBar.localScale = new Vector3(Math.Clamp(1 - thisAbility.currentCooldown/thisAbility.cooldown, 0, 1), 1, 1);
if (thisAbility.currentCooldown <= 0)
{
onCooldown = false;
}
}
}
public void UpdateCooldown()
{
if (thisAbility.currentCooldown > 0)
{
onCooldown = true;
cooldownBar.localScale = new Vector3(Math.Clamp(1f - thisAbility.currentCooldown/thisAbility.cooldown, 0f, 1f), 1f, 1f);
}
}

30
Assets/Scripts/Abilities/PlayerAbilities/Laser.cs
View file

@ -15,10 +15,19 @@ public class Laser : PlayerAbility
private BeamCollider beamObjectInstance;
public float turnSpeed;
public float offset;
[SerializeField] private AudioClip beamSFX;
[SerializeField] private float beamVolume = 1;
[Header("Weapon Properties")]
[HideInInspector] public List<Entity> enemyList = new();
public float damageDebounceTime;
protected float currentDebounce;
[Header("Charge")]
public float chargeTime;
protected float currentCharge;
[Header("Effects")]
[SerializeField] private CameraShake camShakeScript; //optional
private void Start()
{
CreateBeam();
@ -30,13 +39,30 @@ public class Laser : PlayerAbility
currentDuration = duration;
currentCooldown = cooldown;
currentDebounce = damageDebounceTime;
beamObjectInstance.gameObject.SetActive(true);
transform.Lookat2D(thisPlayer.mouseWorldPos);
currentCharge = chargeTime;
}
protected override void Update()
{
base.Update();
if (currentCharge >= 0 && currentDuration > 0)
{
currentCharge -= Time.deltaTime;
if (currentCharge < 0)
{
AbilityManager.instance.player.thisPlayer.entityAS.PlayOneShot(beamSFX, beamVolume);
beamObjectInstance.gameObject.SetActive(true);
transform.Lookat2D(thisPlayer.mouseWorldPos);
if (camShakeScript)
{
camShakeScript.ShakeCamera(currentDuration);
}
}
else
{
return;
}
}
if (currentDuration > 0)
{
Vector3 direction = (thisPlayer.mouseWorldPos - (Vector2)transform.position).normalized;

4
Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs
View file

@ -21,6 +21,9 @@ public class PlayerAbility : MonoBehaviour
public int baseProjectileCount;
public int projectileCount;
public Dictionary<AbilityUpgrade, int> attachedUpgrades = new();
[Header("SFX")]
[SerializeField] private AudioClip useAbilitySFX;
[SerializeField] private float volume = 1;
private void Start()
{
@ -34,6 +37,7 @@ public class PlayerAbility : MonoBehaviour
if (currentCooldown <= 0 && canCooldown)
{
currentCooldown = cooldown;
AbilityManager.instance.player.thisPlayer.entityAS.PlayOneShot(useAbilitySFX, volume);
AbilityEffects();
}
}