diff --git a/Assets/TEngine/Runtime/Audio/AudioMgr.cs b/Assets/TEngine/Runtime/Audio/AudioMgr.cs index 6d6ab3e3..40dade4a 100644 --- a/Assets/TEngine/Runtime/Audio/AudioMgr.cs +++ b/Assets/TEngine/Runtime/Audio/AudioMgr.cs @@ -25,7 +25,6 @@ namespace TEngine public AudioMixer audioMixer { get; set; } float[] _agentVolume = new float[(int)AudioType.Max]; private AudioAgent[] _audioAgents = new AudioAgent[(int)AudioType.Max]; - public Dictionary _soundConfigDic = new Dictionary(); public Dictionary AudioClipPool = new Dictionary(); #endregion @@ -473,32 +472,17 @@ namespace TEngine for (int i = 0; i < _audioObjects.Count; i++) { - if (AudioMgr.Instance._soundConfigDic != null && AudioMgr.Instance._soundConfigDic.ContainsKey(path) && AudioMgr.Instance._soundConfigDic[path] == num) + if (_audioObjects[i]._assetData == null || _audioObjects[i].IsFinish == true) { - if (_audioObjects[i] != null && _audioObjects[i]._assetData != null && path == _audioObjects[i]._assetData.Path) - { - if (_audioObjects[i].Duration > duration) - { - duration = _audioObjects[i].Duration; + freeChannel = i; - freeChannel = i; - } - } + break; } - else + else if (_audioObjects[i].Duration > duration) { - if (_audioObjects[i]._assetData == null || _audioObjects[i].IsFinish == true) - { - freeChannel = i; + duration = _audioObjects[i].Duration; - break; - } - else if (_audioObjects[i].Duration > duration) - { - duration = _audioObjects[i].Duration; - - freeChannel = i; - } + freeChannel = i; } } diff --git a/Assets/TEngine/Runtime/Audio/TAudio.cs b/Assets/TEngine/Runtime/Audio/TAudio.cs index c1ce0722..e32a94a2 100644 --- a/Assets/TEngine/Runtime/Audio/TAudio.cs +++ b/Assets/TEngine/Runtime/Audio/TAudio.cs @@ -161,11 +161,11 @@ namespace TEngine public void Init(AudioMixerGroup audioMixerGroup = null) { - GameObject host = new GameObject("Audio"); - host.transform.SetParent(AudioMgr.Instance.transform); - host.transform.localPosition = Vector3.zero; - _transform = host.transform; - _source = host.AddComponent(); + GameObject root = new GameObject("Audio"); + root.transform.SetParent(AudioMgr.Instance.transform); + root.transform.localPosition = Vector3.zero; + _transform = root.transform; + _source = root.AddComponent(); _source.playOnAwake = false; if (audioMixerGroup != null) {