v1.0.187

Author: liangxiegame

QFramework.Unity2018+/Assets/QFramework/Framework/PackageVersion.json

@@ -1,6 +1,6 @@
 {
     "Id": "",
-    "Version": "v1.0.180",
+    "Version": "v1.0.187",
     "Type": 0,
     "AccessRight": 0,
     "DownloadUrl": "",
@@ -11,10 +11,10 @@
     ],
     "DocUrl": "https://liangxiegame.com",
     "Readme": {
-        "version": "v1.0.180",
-        "content": "修复文档的错别字&修复文档显示问题",
+        "version": "v1.0.187",
+        "content": "LocaleKit Add AbstractLocaleText\nConsoleKit Add AsDefault API",
         "author": "liangxie",
-        "date": "2025 年 02 月 11 日 13:10",
+        "date": "2025 年 04 月 08 日 10:05",
         "PackageId": ""
     }
 }

QFramework.Unity2018+/Assets/QFramework/Framework/Scripts/QFramework.cs

@@ -22,7 +22,7 @@
  * Community
  *  QQ Group: 623597263
  * 
- * Latest Update: 2025.2.24 13:39 add RegisterWithACall to EasyEvent 
+ * Latest Update: 2025.3.18 10:21 add InitArchitecture api
  ****************************************************************************/
 
 using System;
@@ -77,13 +77,13 @@ public static IArchitecture Interface
         {
             get
             {
-                if (mArchitecture == null) MakeSureArchitecture();
+                if (mArchitecture == null) InitArchitecture();
                 return mArchitecture;
             }
         }
 
 
-        static void MakeSureArchitecture()
+        public static void InitArchitecture()
         {
             if (mArchitecture == null)
             {

QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Scripts/AudioKit.cs

@@ -118,8 +118,7 @@ public static void PlayVoice(string voiceName, bool loop = false, Action onBegan
             {
                 return;
             }
-
-
+            
             VoicePlayer.OnStart(onBeganCallback);
             VoicePlayer.SetAudio(AudioManager.Instance.gameObject, voiceName, loop);
             VoicePlayer.OnFinish(onEndedCallback);
@@ -245,22 +244,30 @@ static void SoundFinish(string soundName)
 ")]
 #endif
         public static AudioPlayer PlaySound(string soundName, bool loop = false, Action<AudioPlayer> callBack = null,
-            float volume = 1.0f)
+            float volume = 1.0f,float pitch = 1)
         {
             AudioManager.Instance.CheckAudioListener();
             if (!Settings.IsSoundOn.Value) return null;
             if (!CanPlaySound(soundName)) return null;
             var soundPlayer = AudioPlayer.Allocate(Settings.SoundVolume);
+            
             soundPlayer.VolumeScale(volume)
                 .SetAudio(AudioManager.Instance.gameObject, soundName, loop);
+            
+            soundPlayer.Pitch(pitch);
+            
             soundPlayer.OnFinish(() =>
             {
                 callBack?.Invoke(soundPlayer);
-                AudioManager.Instance.RemoveSoundPlayerFromPool(soundPlayer);
                 SoundFinish(soundName);
             });
+            
+            soundPlayer.OnRelease(() =>
+            {
+                AudioKitArchitecture.RemoveSoundPlayerFromPool(soundPlayer);
+            });
 
-            AudioManager.Instance.AddSoundPlayer2Pool(soundPlayer);
+            AudioKitArchitecture.AddSoundPlayer2Pool(soundPlayer);
             return soundPlayer;
         }
 
@@ -274,9 +281,8 @@ public static AudioPlayer PlaySound(string soundName, bool loop = false, Action<
 #endif
         public static void StopAllSound()
         {
-            AudioManager.Instance.ForEachAllSound(player => player.Stop());
-
-            AudioManager.Instance.ClearAllPlayingSound();
+            AudioKitArchitecture.ForEachAllSound(player => player.Stop());
+            AudioKitArchitecture.ClearAllPlayingSound();
         }
 
 
@@ -317,7 +323,7 @@ public static void PlayVoice(AudioClip clip, bool loop = false, Action onBeganCa
         }
 
         public static AudioPlayer PlaySound(AudioClip clip, bool loop = false, Action<AudioPlayer> callBack = null,
-            float volume = 1.0f)
+            float volume = 1.0f,float pitch = 1)
         {
             AudioManager.Instance.CheckAudioListener();
             if (!Settings.IsSoundOn.Value) return null;
@@ -326,13 +332,20 @@ public static AudioPlayer PlaySound(AudioClip clip, bool loop = false, Action<Au
             var soundPlayer = AudioPlayer.Allocate(Settings.SoundVolume);
             soundPlayer.VolumeScale(volume)
                 .SetAudioExt(AudioManager.Instance.gameObject, clip, "sound" + clip.GetHashCode(), loop);
+
+            soundPlayer.Pitch(pitch);
+            
             soundPlayer.OnFinish(() =>
             {
                 callBack?.Invoke(soundPlayer);
-                AudioManager.Instance.RemoveSoundPlayerFromPool(soundPlayer);
+            });
+            
+            soundPlayer.OnRelease(() =>
+            {
+                AudioKitArchitecture.RemoveSoundPlayerFromPool(soundPlayer);
             });
 
-            AudioManager.Instance.AddSoundPlayer2Pool(soundPlayer);
+            AudioKitArchitecture.AddSoundPlayer2Pool(soundPlayer);
             return soundPlayer;
         }
 

QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Scripts/AudioKitArchitecture.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace QFramework
+{
+    internal class AudioKitArchitecture : Architecture<AudioKitArchitecture>
+    {
+        internal static AudioPlayerModel AudioPlayerModel => mAudioPlayerModel ?? (mAudioPlayerModel = Interface.GetModel<AudioPlayerModel>());
+        private static AudioPlayerModel mAudioPlayerModel = null;
+        
+        protected override void Init()
+        {
+            this.RegisterModel(new AudioPlayerModel());
+        }
+        
+        internal static void ClearAllPlayingSound()
+        {
+            AudioPlayerModel.SoundPlayerInPlaying.Clear();
+        }
+        
+        internal static void RemoveSoundPlayerFromPool(AudioPlayer audioPlayer)
+        {
+            AudioPlayerModel.SoundPlayerInPlaying[audioPlayer.GetName].Remove(audioPlayer);
+        }
+        
+        internal static void AddSoundPlayer2Pool(AudioPlayer audioPlayer)
+        {
+            if (AudioPlayerModel.SoundPlayerInPlaying.ContainsKey(audioPlayer.GetName))
+            {
+                AudioPlayerModel.SoundPlayerInPlaying[audioPlayer.GetName].Add(audioPlayer);
+            }
+            else
+            {
+                AudioPlayerModel.SoundPlayerInPlaying.Add(audioPlayer.GetName, new List<AudioPlayer> { audioPlayer });
+            }
+        }
+        
+        public static void ForEachAllSound(Action<AudioPlayer> operation)
+        {
+            var soundPlayerInPlaying =
+                AudioPlayerModel.SoundPlayerInPlaying.SelectMany(keyValuePair => keyValuePair.Value);
+            
+            var pool = ListPool<AudioPlayer>.Get((AudioPlayerModel.SoundPlayerInPlaying.Count / 8 + 1) * 16);
+            
+            foreach (var audioPlayer in soundPlayerInPlaying)
+            {
+                pool.Add(audioPlayer);
+            }
+            
+            foreach (var audioPlayer in pool)
+            {
+                operation(audioPlayer);
+            }
+            
+            pool.Release2Pool();
+        }
+    }
+
+    internal class AudioPlayerModel : AbstractModel
+    {
+        public Dictionary<string, List<AudioPlayer>> SoundPlayerInPlaying =
+            new Dictionary<string, List<AudioPlayer>>(30);
+        
+        protected override void OnInit()
+        {
+            
+        }
+    }
+}

QFramework.Unity2018+/Assets/QFramework/Toolkits/AudioKit/Scripts/AudioKitArchitecture.cs.meta

@@ -1,31 +1,26 @@
 /****************************************************************************
-* Copyright (c) 2017 snowcold
-* Copyright (c) 2017 ~ 2024 liangxiegame UNDER MIT LICENSE
-*
-* https://qframework.cn
-* https://github.com/liangxiegame/QFramework
-* https://gitee.com/liangxiegame/QFramework
-****************************************************************************/
+ * Copyright (c) 2017 snowcold
+ * Copyright (c) 2017 ~ 2025 liangxiegame UNDER MIT LICENSE
+ *
+ * https://qframework.cn
+ * https://github.com/liangxiegame/QFramework
+ * https://gitee.com/liangxiegame/QFramework
+ ****************************************************************************/
 
-using System;
-using System.Linq;
+using UnityEngine;
 
 namespace QFramework
 {
-    using System.Collections.Generic;
-    using UnityEngine;
 
     [MonoSingletonPath("QFramework/AudioKit/AudioManager")]
-    public class AudioManager : MonoBehaviour, ISingleton
+    public class AudioManager : MonoBehaviour, ISingleton,IController
     {
-
         public AudioPlayer MusicPlayer { get; private set; }
 
         public AudioPlayer VoicePlayer { get; private set; }
 
         public void OnSingletonInit()
         {
-
             SafeObjectPool<AudioPlayer>.Instance.Init(10, 1);
             MusicPlayer = AudioPlayer.Allocate(AudioKit.Settings.MusicVolume);
             MusicPlayer.UsedCache = false;
@@ -74,41 +69,12 @@ public void OnSingletonInit()
                 }
                 else
                 {
-                    ForEachAllSound(player => player.Stop());
+                    AudioKitArchitecture.ForEachAllSound(player => player.Stop());
                 }
             }).UnRegisterWhenGameObjectDestroyed(gameObject);
-            
-        }
-
-        private static Dictionary<string, List<AudioPlayer>> mSoundPlayerInPlaying =
-            new Dictionary<string, List<AudioPlayer>>(30);
-
-
-        public void ForEachAllSound(Action<AudioPlayer> operation)
-        {
-            foreach (var audioPlayer in mSoundPlayerInPlaying.SelectMany(keyValuePair => keyValuePair.Value))
-            {
-                operation(audioPlayer);
-            }
-        }
-
-        public void AddSoundPlayer2Pool(AudioPlayer audioPlayer)
-        {
-            if (mSoundPlayerInPlaying.ContainsKey(audioPlayer.GetName))
-            {
-                mSoundPlayerInPlaying[audioPlayer.GetName].Add(audioPlayer);
-            }
-            else
-            {
-                mSoundPlayerInPlaying.Add(audioPlayer.GetName, new List<AudioPlayer> { audioPlayer });
-            }
-        }
-
-        public void RemoveSoundPlayerFromPool(AudioPlayer audioPlayer)
-        {
-            mSoundPlayerInPlaying[audioPlayer.GetName].Remove(audioPlayer);
         }
 
+        
         #region 对外接口
 
         public void Init()
@@ -138,9 +104,7 @@ public void CheckAudioListener()
 
         #endregion
 
-
-
-
+        
         public static void PlayVoiceOnce(string voiceName)
         {
 
@@ -159,9 +123,11 @@ public static void PlayVoiceOnce(string voiceName)
 
         #endregion
 
-        public void ClearAllPlayingSound()
+
+
+        public IArchitecture GetArchitecture()
         {
-            mSoundPlayerInPlaying.Clear();
+            return AudioKitArchitecture.Interface;
         }
     }
 }