1111

Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs

@@ -1,17 +1,15 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 
 namespace Stary.Evo.AudioCore
 {
-    public class SFXPlayer : AbstractAudio
+    public class SFXPlayer : AbstractAudio, IDisposable
     {
-        private AudioSourcePool audioSourcePool;
-        private List<AudioSource> activeSources = new List<AudioSource>();  // 正在播放的 AudioSource 列表
-
-        public SFXPlayer(AudioSourcePool audioSourcePool)
+        public SFXPlayer(IResources resources) : base(resources)
         {
-            this.audioSourcePool = audioSourcePool;
         }
 
         /// <summary>
@@ -20,21 +18,60 @@ namespace Stary.Evo.AudioCore
         /// <param name="audioData">{[clip:音频], [volume:音量], 
         /// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间], 
         /// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置], [audio3DMaxDistance:3D音频最大距离]}</param>
-        public override void Play(AudioData audioData)
+        public override async void Play(AudioData audioData)
         {
-            audioData = AudioDataInitialize(audioData);
+            AudioSourceToken audioSourceToken = await PlayAudio(audioData);
+            // 使用协程处理延迟和回调
+            PlayAudioAWait(audioSourceToken, audioData.delayOnCompleteTime,
+                audioData.onComplete);
+        }
+
+        public override async UniTask PlayAsync(AudioData audioData)
+        {
+            AudioSourceToken audioSourceToken = await PlayAudio(audioData);
+            await PlayAudioAWait(audioSourceToken, audioData.delayOnCompleteTime);
+        }
+
+
+        private async UniTask<AudioSourceToken> PlayAudio(AudioData audioData)
+        {
+            if (Resources == null)
+            {
+                Debug.LogError("AudioCoreManager: Resources is null, please initialize it first.");
+                return null;
+            }
+
+            audioData = Initialize(audioData);
+            if (!string.IsNullOrEmpty(audioData.packageName) && !string.IsNullOrEmpty(audioData.packageName))
+            {
+                var clip = await Resources.LoadAssetAsync<AudioClip>(audioData.packageName, audioData.assetName);
+                if (clip == null)
+                {
+                    Debug.LogErrorFormat($"从资源包【{audioData.packageName}】加载音频片段【{audioData.assetName}】失败");
+                }
+                else
+                {
+                    audioData.clip = clip;
+                }
+            }
+
             if (audioData.clip == null)
             {
                 Debug.LogError("播放的音效音频片段为空");
-                return;
+                return null;
             }
-            
-            AudioSource source = audioSourcePool.GetAudioSource("SFX");
-            if (source == null) return;
 
+            AudioSourceToken audioSourceToken = AudioSourcePool.Spawn();
+            if (audioSourceToken == null)
+            {
+                Debug.LogError("音效池为空,无法播放音效");
+                return null;
+            }
+
+            AudioSource source = audioSourceToken.source;
             source.clip = audioData.clip;
             source.volume = audioData.volume;
-            
+
             // 设置2D与3D音频
             if (audioData.is3DAudio)
             {
@@ -58,46 +95,27 @@ namespace Stary.Evo.AudioCore
                 source.minDistance = 1f;
                 source.maxDistance = 500f;
             }
+
             source.Play();
-
-            // 将 AudioSource 加入活动列表
-            activeSources.Add(source);
-
-            // 使用协程处理延迟和回调
-            CoroutineHelper.Instance.StartCoroutine(PlaySFXCoroutine(source, audioData.delayOnCompleteTime, audioData.onComplete));
+            return audioSourceToken;
         }
 
         /// <summary>
         /// 停止所有音效
         /// </summary>
-        /// <param name="audioData">{[无可使用变量]}</param>
         public override void Stop()
         {
-            if (activeSources == null) return;
-            foreach (var source in activeSources)
-            {
-                if (source.isPlaying)
-                {
-                    source.Stop();
-                    audioSourcePool.ReturnAudioSource("SFX", source.gameObject);
-                }
-            }
-            activeSources.Clear();
+            AudioSourcePool.RecycleAll();
         }
 
-        /// <summary>
-        /// 播放音效的协程
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="delay"></param>
-        /// <param name="onComplete"></param>
-        /// <returns></returns>    
-        private IEnumerator PlaySFXCoroutine(AudioSource source, float delay, System.Action onComplete)
+        public override void StopAll()
         {
-            yield return new WaitForSeconds(source.clip.length + delay);
-            audioSourcePool.ReturnAudioSource("SFX", source.gameObject);
-            onComplete?.Invoke();
-            activeSources.Remove(source);
+            AudioSourcePool.RecycleAll();
+        }
+
+        public void Dispose()
+        {
+            AudioSourcePool.RecycleAll();
         }
     }
 }