【m】优化音频管理器
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Stary.Evo.AudioCore
|
namespace Stary.Evo.AudioCore
|
||||||
@@ -58,6 +59,11 @@ namespace Stary.Evo.AudioCore
|
|||||||
/// 3D声音最大距离
|
/// 3D声音最大距离
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public float audio3DMaxDistance;
|
public float audio3DMaxDistance;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 异步取消令牌
|
||||||
|
/// </summary>
|
||||||
|
public CancellationToken cancellationToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface IAudio
|
public interface IAudio
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
using UnityEngine;
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
namespace Stary.Evo.AudioCore
|
namespace Stary.Evo.AudioCore
|
||||||
{
|
{
|
||||||
public class AudioSourcePool
|
public class AudioSourcePool: IDisposable
|
||||||
{
|
{
|
||||||
private Dictionary<string, Queue<GameObject>> poolDict = new Dictionary<string, Queue<GameObject>>();
|
private Dictionary<string, Queue<GameObject>> poolDict = new Dictionary<string, Queue<GameObject>>();
|
||||||
private GameObject poolObject;
|
private GameObject poolObject;
|
||||||
@@ -22,9 +23,8 @@ namespace Stary.Evo.AudioCore
|
|||||||
// 如果不存在,创建一个新对象
|
// 如果不存在,创建一个新对象
|
||||||
poolObject = new GameObject("AudioSourcePool");
|
poolObject = new GameObject("AudioSourcePool");
|
||||||
}
|
}
|
||||||
CoroutineHelper.SetRunner();
|
|
||||||
|
|
||||||
// 初始化 Voice 池(初始 1 个,可动态扩展)
|
// 初始化 Voice 池(只有 1 个)
|
||||||
poolDict["Voice"] = new Queue<GameObject>();
|
poolDict["Voice"] = new Queue<GameObject>();
|
||||||
CreateAudioSource("Voice");
|
CreateAudioSource("Voice");
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
CreateAudioSource("Music");
|
CreateAudioSource("Music");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化 SFX 池(初始 4 个,可动态扩展)
|
// 初始化 SFX 池(初始 1 个,可动态扩展)
|
||||||
poolDict["SFX"] = new Queue<GameObject>();
|
poolDict["SFX"] = new Queue<GameObject>();
|
||||||
CreateAudioSource("SFX");
|
CreateAudioSource("SFX");
|
||||||
}
|
}
|
||||||
@@ -135,5 +135,14 @@ namespace Stary.Evo.AudioCore
|
|||||||
}
|
}
|
||||||
poolDict.Clear();
|
poolDict.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (poolObject != null)
|
||||||
|
{
|
||||||
|
GameObject.Destroy(poolObject);
|
||||||
|
}
|
||||||
|
poolDict.Clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,36 +5,52 @@ using UnityEngine.Internal;
|
|||||||
|
|
||||||
namespace Stary.Evo.AudioCore
|
namespace Stary.Evo.AudioCore
|
||||||
{
|
{
|
||||||
public static class CoroutineHelper
|
// 音频协程启动器
|
||||||
|
public class CoroutineHelper : IDisposable
|
||||||
{
|
{
|
||||||
public static CoroutineRunner coroutineRunner;
|
private static CoroutineHelper _instance = new CoroutineHelper();
|
||||||
|
public static CoroutineHelper Instance => _instance;
|
||||||
|
private CoroutineRunner _coroutineRunner;
|
||||||
|
|
||||||
public static void SetRunner()
|
private CoroutineHelper()
|
||||||
{
|
{
|
||||||
GameObject runnerObject = new GameObject("CoroutineRunner");
|
GameObject runnerObject = new GameObject("CoroutineRunner");
|
||||||
coroutineRunner = runnerObject.AddComponent<CoroutineRunner>();
|
_coroutineRunner= runnerObject.AddComponent<CoroutineRunner>();
|
||||||
}
|
}
|
||||||
public static Coroutine StartCoroutine(IEnumerator coroutine)
|
public Coroutine StartCoroutine(IEnumerator coroutine)
|
||||||
{
|
{
|
||||||
Coroutine myCoroutine = coroutineRunner.StartCoroutine(coroutine);
|
Coroutine myCoroutine = _coroutineRunner.StartIEnumerator(coroutine);
|
||||||
return myCoroutine;
|
return myCoroutine;
|
||||||
}
|
}
|
||||||
public static void StopCoroutine(Coroutine myCoroutine)
|
public void StopCoroutine(Coroutine myCoroutine)
|
||||||
{
|
{
|
||||||
coroutineRunner.StopCoroutine(myCoroutine);
|
_coroutineRunner.StopIEnumerator(myCoroutine);
|
||||||
|
}
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_coroutineRunner != null)
|
||||||
|
{
|
||||||
|
GameObject.Destroy(_coroutineRunner.gameObject);
|
||||||
|
_coroutineRunner = null;
|
||||||
|
}
|
||||||
|
if (CoroutineHelper.Instance != null)
|
||||||
|
{
|
||||||
|
CoroutineHelper._instance = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CoroutineRunner : MonoBehaviour
|
public class CoroutineRunner : MonoBehaviour
|
||||||
{
|
{
|
||||||
private void OnDestroy()
|
public Coroutine StartIEnumerator(IEnumerator coroutine)
|
||||||
{
|
{
|
||||||
if (coroutineRunner != null)
|
Coroutine myCoroutine = StartCoroutine(coroutine);
|
||||||
{
|
return myCoroutine;
|
||||||
coroutineRunner.StopAllCoroutines();
|
|
||||||
coroutineRunner = null;
|
|
||||||
}
|
}
|
||||||
|
public void StopIEnumerator(Coroutine myCoroutine)
|
||||||
|
{
|
||||||
|
StopCoroutine(myCoroutine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -121,10 +121,10 @@ namespace Stary.Evo.AudioCore
|
|||||||
|
|
||||||
if (myCoroutine != null)
|
if (myCoroutine != null)
|
||||||
{
|
{
|
||||||
CoroutineHelper.StopCoroutine(myCoroutine);
|
CoroutineHelper.Instance.StopCoroutine(myCoroutine);
|
||||||
myCoroutine = null;
|
myCoroutine = null;
|
||||||
}
|
}
|
||||||
myCoroutine = CoroutineHelper.StartCoroutine(SetMusicVolume(audioData.fadeDuration, audioData.volume));
|
myCoroutine = CoroutineHelper.Instance.StartCoroutine(SetMusicVolume(audioData.fadeDuration, audioData.volume));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -164,11 +164,11 @@ namespace Stary.Evo.AudioCore
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private void FadeMusic(AudioSource source1, float fadeDuration, AudioSource source2 = null)
|
private void FadeMusic(AudioSource source1, float fadeDuration, AudioSource source2 = null)
|
||||||
{
|
{
|
||||||
CoroutineHelper.StartCoroutine(FadeInMusic(source1, fadeDuration));
|
CoroutineHelper.Instance.StartCoroutine(FadeInMusic(source1, fadeDuration));
|
||||||
|
|
||||||
if (source2 != null)
|
if (source2 != null)
|
||||||
{
|
{
|
||||||
CoroutineHelper.StartCoroutine(FadeOutMusic(source2, fadeDuration));
|
CoroutineHelper.Instance.StartCoroutine(FadeOutMusic(source2, fadeDuration));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
activeSources.Add(source);
|
activeSources.Add(source);
|
||||||
|
|
||||||
// 使用协程处理延迟和回调
|
// 使用协程处理延迟和回调
|
||||||
CoroutineHelper.StartCoroutine(PlaySFXCoroutine(source, audioData.delayOnCompleteTime, audioData.onComplete));
|
CoroutineHelper.Instance.StartCoroutine(PlaySFXCoroutine(source, audioData.delayOnCompleteTime, audioData.onComplete));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
|
|
||||||
if (myCoroutine != null)
|
if (myCoroutine != null)
|
||||||
{
|
{
|
||||||
CoroutineHelper.StopCoroutine(myCoroutine);
|
CoroutineHelper.Instance.StopCoroutine(myCoroutine);
|
||||||
myCoroutine = null;
|
myCoroutine = null;
|
||||||
}
|
}
|
||||||
currentSource = audioSourcePool.GetAudioSource("Voice");
|
currentSource = audioSourcePool.GetAudioSource("Voice");
|
||||||
@@ -69,7 +69,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
currentSource.Play();
|
currentSource.Play();
|
||||||
|
|
||||||
// 使用协程处理延迟和回调
|
// 使用协程处理延迟和回调
|
||||||
myCoroutine = CoroutineHelper.StartCoroutine(PlayVoiceCoroutine(currentSource, audioData.delayOnCompleteTime, audioData.onComplete));
|
myCoroutine = CoroutineHelper.Instance.StartCoroutine(PlayVoiceCoroutine(currentSource, audioData.delayOnCompleteTime, audioData.onComplete));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -86,7 +86,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
currentSource = null;
|
currentSource = null;
|
||||||
if (myCoroutine != null)
|
if (myCoroutine != null)
|
||||||
{
|
{
|
||||||
CoroutineHelper.StopCoroutine(myCoroutine);
|
CoroutineHelper.Instance.StopCoroutine(myCoroutine);
|
||||||
myCoroutine = null;
|
myCoroutine = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -106,12 +106,13 @@ namespace Stary.Evo.AudioCore
|
|||||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
/// [audio3DMaxDistance:3D音频最大距离],
|
||||||
|
/// [cancellationToken:异步取消令牌]}</param>
|
||||||
public async Task PlayAsync(AudioData audioData)
|
public async Task PlayAsync(AudioData audioData)
|
||||||
{
|
{
|
||||||
// 停止当前正在播放的语音与旧协程,或旧异步
|
// 停止当前正在播放的语音与旧协程,或旧异步
|
||||||
Stop();
|
Stop();
|
||||||
|
audioData = AudioDataInitialize(audioData);
|
||||||
currentSource = audioSourcePool.GetAudioSource("Voice");
|
currentSource = audioSourcePool.GetAudioSource("Voice");
|
||||||
if (currentSource == null) return;
|
if (currentSource == null) return;
|
||||||
|
|
||||||
@@ -141,9 +142,9 @@ namespace Stary.Evo.AudioCore
|
|||||||
currentSource.minDistance = 1f;
|
currentSource.minDistance = 1f;
|
||||||
currentSource.maxDistance = 500f;
|
currentSource.maxDistance = 500f;
|
||||||
}
|
}
|
||||||
|
|
||||||
currentSource.Play();
|
currentSource.Play();
|
||||||
cancelTokenSource = new CancellationTokenSource();
|
await Task.Delay(TimeSpan.FromSeconds(audioData.clip.length), audioData.cancellationToken);
|
||||||
await Task.Delay(TimeSpan.FromSeconds(audioData.clip.length),cancelTokenSource.Token);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ namespace Stary.Evo.AudioCore
|
|||||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
/// [audio3DMaxDistance:3D音频最大距离],
|
||||||
|
/// [cancellationToken:异步取消令牌]}</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static Task PlayAsyncVoice(AudioData audioData)
|
public static Task PlayAsyncVoice(AudioData audioData)
|
||||||
{
|
{
|
||||||
@@ -137,7 +138,7 @@ namespace Stary.Evo.AudioCore
|
|||||||
|
|
||||||
StopVoice();
|
StopVoice();
|
||||||
StopAllSFX();
|
StopAllSFX();
|
||||||
//StopMusic();
|
StopMusic();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "com.staryevo.audiocore",
|
"name": "com.staryevo.audiocore",
|
||||||
"version": "1.0.19",
|
"version": "1.0.20",
|
||||||
"displayName": "04.AudioCore",
|
"displayName": "04.AudioCore",
|
||||||
"description": "音频播放工具",
|
"description": "音频播放工具",
|
||||||
"unity": "2021.3",
|
"unity": "2021.3",
|
||||||
|
|||||||
Reference in New Issue
Block a user