【m】增添设置3D音频功能
This commit is contained in:
@@ -43,16 +43,21 @@ namespace Stary.Evo.AudioCore
|
||||
/// 是否不打断上一段对话
|
||||
/// </summary>
|
||||
public bool isNotOverVoice;
|
||||
|
||||
/// <summary>
|
||||
/// 是否是3D音频
|
||||
/// </summary>
|
||||
public bool is3DAudio;
|
||||
|
||||
/// <summary>
|
||||
/// 是否是3D声音
|
||||
/// 3D声音位置
|
||||
/// </summary>
|
||||
public bool is3D;
|
||||
|
||||
public Vector3 audio3DPosition;
|
||||
|
||||
/// <summary>
|
||||
/// 3D声音载体
|
||||
/// 3D声音最大距离
|
||||
/// </summary>
|
||||
public GameObject soundObject;
|
||||
public float audio3DMaxDistance;
|
||||
}
|
||||
|
||||
public interface IAudio
|
||||
|
||||
@@ -19,7 +19,8 @@ namespace Stary.Evo.AudioCore
|
||||
/// <summary>
|
||||
/// 播放背景音乐
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量], [fadeDuration:自然过渡时间]}</param>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量], [fadeDuration:自然过渡时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置], [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public override void Play(AudioData audioData)
|
||||
{
|
||||
audioData = AudioDataInitialize(audioData);
|
||||
@@ -28,6 +29,31 @@ namespace Stary.Evo.AudioCore
|
||||
audioSource1 = audioSourcePool.GetAudioSource("Music");
|
||||
audioSource1.clip = audioData.clip;
|
||||
audioSource1.volume = audioData.volume;
|
||||
|
||||
// 设置2D与3D音频
|
||||
if (audioData.is3DAudio)
|
||||
{
|
||||
audioSource1.transform.position = audioData.audio3DPosition;
|
||||
audioSource1.spatialBlend = 1;
|
||||
audioSource1.minDistance = 1f;
|
||||
if (audioData.audio3DMaxDistance != 0)
|
||||
{
|
||||
audioSource1.maxDistance = audioData.audio3DMaxDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 默认3D最大距离为3米
|
||||
audioSource1.maxDistance = 3f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
audioSource1.transform.position = Vector3.zero;
|
||||
audioSource1.spatialBlend = 0;
|
||||
audioSource1.minDistance = 1f;
|
||||
audioSource1.maxDistance = 500f;
|
||||
}
|
||||
|
||||
currentAudioSource = audioSource1;
|
||||
currentAudioSource.Play();
|
||||
FadeMusic(audioSource1, audioData.fadeDuration, audioSource2);
|
||||
@@ -39,6 +65,31 @@ namespace Stary.Evo.AudioCore
|
||||
audioSource2 = audioSourcePool.GetAudioSource("Music");
|
||||
audioSource2.clip = audioData.clip;
|
||||
audioSource2.volume = audioData.volume;
|
||||
|
||||
// 设置2D与3D音频
|
||||
if (audioData.is3DAudio)
|
||||
{
|
||||
audioSource2.transform.position = audioData.audio3DPosition;
|
||||
audioSource2.spatialBlend = 1;
|
||||
audioSource2.minDistance = 1f;
|
||||
if (audioData.audio3DMaxDistance != 0)
|
||||
{
|
||||
audioSource2.maxDistance = audioData.audio3DMaxDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 默认3D最大距离为3米
|
||||
audioSource2.maxDistance = 3f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
audioSource2.transform.position = Vector3.zero;
|
||||
audioSource2.spatialBlend = 0;
|
||||
audioSource2.minDistance = 1f;
|
||||
audioSource2.maxDistance = 500f;
|
||||
}
|
||||
|
||||
currentAudioSource = audioSource2;
|
||||
currentAudioSource.Play();
|
||||
FadeMusic(audioSource2, audioData.fadeDuration, audioSource1);
|
||||
|
||||
@@ -18,7 +18,8 @@ namespace Stary.Evo.AudioCore
|
||||
/// 播放音效
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间]}</param>
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置], [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public override void Play(AudioData audioData)
|
||||
{
|
||||
audioData = AudioDataInitialize(audioData);
|
||||
@@ -33,6 +34,30 @@ namespace Stary.Evo.AudioCore
|
||||
|
||||
source.clip = audioData.clip;
|
||||
source.volume = audioData.volume;
|
||||
|
||||
// 设置2D与3D音频
|
||||
if (audioData.is3DAudio)
|
||||
{
|
||||
source.transform.position = audioData.audio3DPosition;
|
||||
source.spatialBlend = 1;
|
||||
source.minDistance = 1f;
|
||||
if (audioData.audio3DMaxDistance != 0)
|
||||
{
|
||||
source.maxDistance = audioData.audio3DMaxDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 默认3D最大距离为3米
|
||||
source.maxDistance = 3f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
source.transform.position = Vector3.zero;
|
||||
source.spatialBlend = 0;
|
||||
source.minDistance = 1f;
|
||||
source.maxDistance = 500f;
|
||||
}
|
||||
source.Play();
|
||||
|
||||
// 将 AudioSource 加入活动列表
|
||||
|
||||
@@ -21,7 +21,9 @@ namespace Stary.Evo.AudioCore
|
||||
/// 播放语音
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间]}</param>
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public override void Play(AudioData audioData)
|
||||
{
|
||||
// 停止当前正在播放的语音与旧协程,或旧异步
|
||||
@@ -39,6 +41,31 @@ namespace Stary.Evo.AudioCore
|
||||
|
||||
currentSource.clip = audioData.clip;
|
||||
currentSource.volume = audioData.volume;
|
||||
|
||||
// 设置2D与3D音频
|
||||
if (audioData.is3DAudio)
|
||||
{
|
||||
currentSource.transform.position = audioData.audio3DPosition;
|
||||
currentSource.spatialBlend = 1;
|
||||
currentSource.minDistance = 1f;
|
||||
if (audioData.audio3DMaxDistance != 0)
|
||||
{
|
||||
currentSource.maxDistance = audioData.audio3DMaxDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 默认3D最大距离为3米
|
||||
currentSource.maxDistance = 3f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
currentSource.transform.position = Vector3.zero;
|
||||
currentSource.spatialBlend = 0;
|
||||
currentSource.minDistance = 1f;
|
||||
currentSource.maxDistance = 500f;
|
||||
}
|
||||
|
||||
currentSource.Play();
|
||||
|
||||
// 使用协程处理延迟和回调
|
||||
@@ -76,9 +103,11 @@ namespace Stary.Evo.AudioCore
|
||||
/// <summary>
|
||||
/// 异步播放语音
|
||||
/// </summary>
|
||||
/// <param name="audioClip"></param>
|
||||
/// <param name="volume"></param>
|
||||
public async Task Play(AudioClip audioClip, float volume)
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public async Task PlayAsync(AudioData audioData)
|
||||
{
|
||||
// 停止当前正在播放的语音与旧协程,或旧异步
|
||||
Stop();
|
||||
@@ -86,12 +115,35 @@ namespace Stary.Evo.AudioCore
|
||||
currentSource = audioSourcePool.GetAudioSource("Voice");
|
||||
if (currentSource == null) return;
|
||||
|
||||
currentSource.clip = audioClip;
|
||||
currentSource.volume = volume;
|
||||
currentSource.clip = audioData.clip;
|
||||
currentSource.volume = audioData.volume;
|
||||
|
||||
// 设置2D与3D音频
|
||||
if (audioData.is3DAudio)
|
||||
{
|
||||
currentSource.transform.position = audioData.audio3DPosition;
|
||||
currentSource.spatialBlend = 1;
|
||||
currentSource.minDistance = 1f;
|
||||
if (audioData.audio3DMaxDistance != 0)
|
||||
{
|
||||
currentSource.maxDistance = audioData.audio3DMaxDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 默认3D最大距离为3米
|
||||
currentSource.maxDistance = 3f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
currentSource.transform.position = Vector3.zero;
|
||||
currentSource.spatialBlend = 0;
|
||||
currentSource.minDistance = 1f;
|
||||
currentSource.maxDistance = 500f;
|
||||
}
|
||||
currentSource.Play();
|
||||
|
||||
cancelTokenSource = new CancellationTokenSource();
|
||||
await Task.Delay(TimeSpan.FromSeconds(audioClip.length),cancelTokenSource.Token);
|
||||
await Task.Delay(TimeSpan.FromSeconds(audioData.clip.length),cancelTokenSource.Token);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -27,7 +27,9 @@ namespace Stary.Evo.AudioCore
|
||||
/// 播放语音
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间]}</param>
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public static void PlayVoice(AudioData audioData)
|
||||
{
|
||||
if(Voice == null) Initialize();
|
||||
@@ -37,13 +39,15 @@ namespace Stary.Evo.AudioCore
|
||||
/// <summary>
|
||||
/// 异步播放语音
|
||||
/// </summary>
|
||||
/// <param name="audioClip"></param>
|
||||
/// <param name="volume"></param>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
/// <returns></returns>
|
||||
public static Task PlayVoice(AudioClip audioClip, float volume = 1f)
|
||||
public static Task PlayAsyncVoice(AudioData audioData)
|
||||
{
|
||||
if(Voice == null) Initialize();
|
||||
return Voice.Play(audioClip, volume);
|
||||
return Voice.PlayAsync(audioData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -63,7 +67,9 @@ namespace Stary.Evo.AudioCore
|
||||
/// 播放音效
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量],
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间]}</param>
|
||||
/// [onComplete:回调行为], [delayOnCompleteTime:延迟回调执行的时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public static void PlaySFX(AudioData audioData)
|
||||
{
|
||||
if(SFX == null) Initialize();
|
||||
@@ -87,10 +93,12 @@ namespace Stary.Evo.AudioCore
|
||||
/// <summary>
|
||||
/// 播放背景音乐
|
||||
/// </summary>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量], [fadeDuration:自然过渡时间]}</param>
|
||||
/// <param name="audioData">{[clip:音频], [volume:音量], [fadeDuration:自然过渡时间],
|
||||
/// [is3DAudio:是否3D音频], [audio3DPosition:3D音频位置],
|
||||
/// [audio3DMaxDistance:3D音频最大距离]}</param>
|
||||
public static void PlayMusic(AudioData audioData)
|
||||
{
|
||||
if(CoroutineHelper.coroutineRunner == null) Initialize();
|
||||
if(Music == null) Initialize();
|
||||
Music.Play(audioData);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "com.staryevo.audiocore",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.15",
|
||||
"displayName": "04.AudioCore",
|
||||
"description": "音频播放工具",
|
||||
"unity": "2021.3",
|
||||
|
||||
Reference in New Issue
Block a user