【m】优化音频管理器
This commit is contained in:
@@ -33,7 +33,7 @@ namespace Stary.Evo.AudioCore
|
||||
|
||||
if (myCoroutine != null)
|
||||
{
|
||||
CoroutineHelper.StopCoroutine(myCoroutine);
|
||||
CoroutineHelper.Instance.StopCoroutine(myCoroutine);
|
||||
myCoroutine = null;
|
||||
}
|
||||
currentSource = audioSourcePool.GetAudioSource("Voice");
|
||||
@@ -69,7 +69,7 @@ namespace Stary.Evo.AudioCore
|
||||
currentSource.Play();
|
||||
|
||||
// 使用协程处理延迟和回调
|
||||
myCoroutine = CoroutineHelper.StartCoroutine(PlayVoiceCoroutine(currentSource, audioData.delayOnCompleteTime, audioData.onComplete));
|
||||
myCoroutine = CoroutineHelper.Instance.StartCoroutine(PlayVoiceCoroutine(currentSource, audioData.delayOnCompleteTime, audioData.onComplete));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -86,7 +86,7 @@ namespace Stary.Evo.AudioCore
|
||||
currentSource = null;
|
||||
if (myCoroutine != null)
|
||||
{
|
||||
CoroutineHelper.StopCoroutine(myCoroutine);
|
||||
CoroutineHelper.Instance.StopCoroutine(myCoroutine);
|
||||
myCoroutine = null;
|
||||
}
|
||||
}
|
||||
@@ -106,12 +106,13 @@ namespace Stary.Evo.AudioCore
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
/// [audio3DMaxDistance:3D音频最大距离],
|
||||
/// [cancellationToken:异步取消令牌]}</param>
|
||||
public async Task PlayAsync(AudioData audioData)
|
||||
{
|
||||
// 停止当前正在播放的语音与旧协程,或旧异步
|
||||
Stop();
|
||||
|
||||
audioData = AudioDataInitialize(audioData);
|
||||
currentSource = audioSourcePool.GetAudioSource("Voice");
|
||||
if (currentSource == null) return;
|
||||
|
||||
@@ -141,9 +142,9 @@ namespace Stary.Evo.AudioCore
|
||||
currentSource.minDistance = 1f;
|
||||
currentSource.maxDistance = 500f;
|
||||
}
|
||||
|
||||
currentSource.Play();
|
||||
cancelTokenSource = new CancellationTokenSource();
|
||||
await Task.Delay(TimeSpan.FromSeconds(audioData.clip.length),cancelTokenSource.Token);
|
||||
await Task.Delay(TimeSpan.FromSeconds(audioData.clip.length), audioData.cancellationToken);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user