Update

Update

Assets/TEngine/Runtime/Audio/AudioAgent.cs

@@ -1,144 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine.Audio;
-
-namespace TEngine
-{
-    public class AudioAgent
-    {
-        public List<TAudio> _audioObjects;
-        AudioMixerGroup _audioMixerGroup;
-        int _maxChannel;
-        bool _bEnable = true;
-
-        public bool Enable
-        {
-            get
-            {
-                return _bEnable;
-            }
-            set
-            {
-                if (_bEnable != value)
-                {
-                    _bEnable = value;
-                    if (!_bEnable)
-                    {
-                        for (int i = 0; i < _audioObjects.Count; ++i)
-                        {
-                            if (_audioObjects[i] != null)
-                            {
-                                _audioObjects[i].Stop();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-        public AudioAgent(int maxChannel, AudioMixerGroup audioMixerGroup)
-        {
-            _maxChannel = maxChannel;
-            _audioObjects = new List<TAudio>();
-            for (int i = 0; i < _maxChannel; i++)
-            {
-                TAudio tAudio = new TAudio();
-                tAudio.Init(audioMixerGroup);
-                _audioObjects.Add(tAudio);
-            }
-            _audioMixerGroup = audioMixerGroup;
-
-        }
-
-        public void AddAudio(int Num)
-        {
-            _maxChannel += Num;
-            for (int i = 0; i < Num; i++)
-            {
-                _audioObjects.Add(null);
-            }
-        }
-
-
-
-        public TAudio Play(string path, bool bAsync, bool bInPool = false)
-        {
-            if (!_bEnable) return null;
-            int freeChannel = -1;
-            float duration = -1;
-            int num = 0;
-            for (int i = 0; i < _audioObjects.Count; ++i)
-            {
-                if (_audioObjects[i] != null && _audioObjects[i]._assetData != null && _audioObjects[i].IsFinish == false)
-                {
-                    if (path.Equals(_audioObjects[i]._assetData.Path))
-                        num++;
-                }
-            }
-
-            for (int i = 0; i < _audioObjects.Count; i++)
-            {
-                if (AudioManager.Instance._soundConfigDic != null && AudioManager.Instance._soundConfigDic.ContainsKey(path) && AudioManager.Instance._soundConfigDic[path] == num)
-                {
-                    if (_audioObjects[i] != null && _audioObjects[i]._assetData != null && path == _audioObjects[i]._assetData.Path)
-                    {
-                        if (_audioObjects[i].Duration > duration)
-                        {
-                            duration = _audioObjects[i].Duration;
-                            freeChannel = i;
-                        }
-                    }
-                }
-                else
-                {
-                    if (_audioObjects[i]._assetData == null || _audioObjects[i].IsFinish == true)
-                    {
-                        freeChannel = i;
-                        break;
-                    }
-                    else if (_audioObjects[i].Duration > duration)
-                    {
-                        duration = _audioObjects[i].Duration;
-                        freeChannel = i;
-                    }
-                }
-            }
-
-            if (freeChannel >= 0)
-            {
-                if (_audioObjects[freeChannel] == null)
-                    _audioObjects[freeChannel] = TAudio.Create(path, bAsync, _audioMixerGroup, bInPool);
-                else
-                    _audioObjects[freeChannel].Load(path, bAsync, bInPool);
-                return _audioObjects[freeChannel];
-            }
-            else
-            {
-                TLogger.LogError($"Here is no channel to play audio {path}");
-                return null;
-            }
-        }
-
-        public void Stop(bool fadeout)
-        {
-            for (int i = 0; i < _audioObjects.Count; ++i)
-            {
-                if (_audioObjects[i] != null)
-                {
-                    _audioObjects[i].Stop(fadeout);
-                }
-            }
-        }
-
-        public void Update(float delta)
-        {
-            for (int i = 0; i < _audioObjects.Count; ++i)
-            {
-                if (_audioObjects[i] != null)
-                {
-                    _audioObjects[i].Update(delta);
-                }
-            }
-        }
-    }
-}

Assets/TEngine/Runtime/Audio/AudioAgent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e3c9ae2cf3ff0954f82e1103fb47c332
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/TEngine/Runtime/Audio/AudioMgr.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
+using UnityEngine.Audio;
 
 namespace TEngine
 {
@@ -15,7 +16,7 @@ namespace TEngine
         Max
     }
 
-    public class AudioManager : UnitySingleton<AudioManager>
+    public class AudioMgr : UnitySingleton<AudioMgr>
     {
         private AudioAgent[] _audioAgents = new AudioAgent[(int)AudioType.Max];
         public Dictionary<string, int> _soundConfigDic = new Dictionary<string, int>();
@@ -211,4 +212,143 @@ namespace TEngine
         }
         #endregion
     }
+
+    public class AudioAgent
+    {
+        public List<TAudio> _audioObjects;
+        AudioMixerGroup _audioMixerGroup;
+        int _maxChannel;
+        bool _bEnable = true;
+
+        public bool Enable
+        {
+            get
+            {
+                return _bEnable;
+            }
+            set
+            {
+                if (_bEnable != value)
+                {
+                    _bEnable = value;
+                    if (!_bEnable)
+                    {
+                        for (int i = 0; i < _audioObjects.Count; ++i)
+                        {
+                            if (_audioObjects[i] != null)
+                            {
+                                _audioObjects[i].Stop();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+        public AudioAgent(int maxChannel, AudioMixerGroup audioMixerGroup)
+        {
+            _maxChannel = maxChannel;
+            _audioObjects = new List<TAudio>();
+            for (int i = 0; i < _maxChannel; i++)
+            {
+                TAudio tAudio = new TAudio();
+                tAudio.Init(audioMixerGroup);
+                _audioObjects.Add(tAudio);
+            }
+            _audioMixerGroup = audioMixerGroup;
+
+        }
+
+        public void AddAudio(int Num)
+        {
+            _maxChannel += Num;
+            for (int i = 0; i < Num; i++)
+            {
+                _audioObjects.Add(null);
+            }
+        }
+
+
+
+        public TAudio Play(string path, bool bAsync, bool bInPool = false)
+        {
+            if (!_bEnable) return null;
+            int freeChannel = -1;
+            float duration = -1;
+            int num = 0;
+            for (int i = 0; i < _audioObjects.Count; ++i)
+            {
+                if (_audioObjects[i] != null && _audioObjects[i]._assetData != null && _audioObjects[i].IsFinish == false)
+                {
+                    if (path.Equals(_audioObjects[i]._assetData.Path))
+                        num++;
+                }
+            }
+
+            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] != null && _audioObjects[i]._assetData != null && path == _audioObjects[i]._assetData.Path)
+                    {
+                        if (_audioObjects[i].Duration > duration)
+                        {
+                            duration = _audioObjects[i].Duration;
+                            freeChannel = i;
+                        }
+                    }
+                }
+                else
+                {
+                    if (_audioObjects[i]._assetData == null || _audioObjects[i].IsFinish == true)
+                    {
+                        freeChannel = i;
+                        break;
+                    }
+                    else if (_audioObjects[i].Duration > duration)
+                    {
+                        duration = _audioObjects[i].Duration;
+                        freeChannel = i;
+                    }
+                }
+            }
+
+            if (freeChannel >= 0)
+            {
+                if (_audioObjects[freeChannel] == null)
+                    _audioObjects[freeChannel] = TAudio.Create(path, bAsync, _audioMixerGroup, bInPool);
+                else
+                    _audioObjects[freeChannel].Load(path, bAsync, bInPool);
+                return _audioObjects[freeChannel];
+            }
+            else
+            {
+                TLogger.LogError($"Here is no channel to play audio {path}");
+                return null;
+            }
+        }
+
+        public void Stop(bool fadeout)
+        {
+            for (int i = 0; i < _audioObjects.Count; ++i)
+            {
+                if (_audioObjects[i] != null)
+                {
+                    _audioObjects[i].Stop(fadeout);
+                }
+            }
+        }
+
+        public void Update(float delta)
+        {
+            for (int i = 0; i < _audioObjects.Count; ++i)
+            {
+                if (_audioObjects[i] != null)
+                {
+                    _audioObjects[i].Update(delta);
+                }
+            }
+        }
+    }
 }