yeahweregames/UnityTowerDefense
4
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'unified-audio-manager' into main

Browse source 
# Conflicts:
#	Assets/_Project/Definitions/Towers/TeslaCoilTower.asset
This commit is contained in:
Ian Woods 2026-06-30 21:39:09 -07:00
commit a7b2d1854d
11 changed files with 197 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Assets/_Project/Scripts/Combat/TeslaTowerFireSound.cs
View file

@ -1,4 +1,5 @@
// Assets/_Project/Scripts/Combat/TeslaTowerFireSound.cs
using TD.Audio;
using UnityEngine;
namespace TD.Combat
@ -14,7 +15,6 @@ namespace TD.Combat
/// as the Tesla Coil gains more audio (idle hum, charge-up, etc.).
/// </remarks>
[RequireComponent(typeof(TowerCombat))]
[RequireComponent(typeof(AudioSource))]
public class TeslaTowerFireSound : MonoBehaviour
{
[Tooltip("Sound played each time the coil discharges.")]
@ -25,12 +25,10 @@ namespace TD.Combat
[SerializeField] private float maxPitch = 1.07f;
private TowerCombat combat;
private AudioSource audioSource;
private void Awake()
{
combat = GetComponent<TowerCombat>();
audioSource = GetComponent<AudioSource>();
combat = GetComponent<TowerCombat>();
}
private void OnEnable()
@ -45,12 +43,7 @@ namespace TD.Combat
private void HandleAreaFired(Vector3[] positions)
{
if (fireClip != null)
{
audioSource.pitch = Random.Range(minPitch, maxPitch);
audioSource.clip = fireClip;
audioSource.Play();
}
AudioManager.Instance?.Play(fireClip, AudioCategory.TowerFire, Random.Range(minPitch, maxPitch));
}
}
}