[修改]1. 修改命名空间异常

GameFrameX · Jan 20, 2025 · 652263f · 652263f
1 parent ef48958
commit 652263f
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 21 deletions.
diff --git a/Runtime/EventArgs/PlaySoundFailureEventArgs.cs b/Runtime/EventArgs/PlaySoundFailureEventArgs.cs
@@ -8,7 +8,7 @@
 using GameFrameX.Event.Runtime;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 播放声音失败事件。

diff --git a/Runtime/EventArgs/PlaySoundSuccessEventArgs.cs b/Runtime/EventArgs/PlaySoundSuccessEventArgs.cs
@@ -8,7 +8,7 @@
 using GameFrameX.Event.Runtime;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 播放声音成功事件。

diff --git a/Runtime/EventArgs/PlaySoundUpdateEventArgs.cs b/Runtime/EventArgs/PlaySoundUpdateEventArgs.cs
@@ -8,7 +8,7 @@
 using GameFrameX.Event.Runtime;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 播放声音更新事件。

diff --git a/Runtime/EventArgs/ResetSoundAgentEventArgs.cs b/Runtime/EventArgs/ResetSoundAgentEventArgs.cs
@@ -8,7 +8,7 @@
 using GameFrameX.Event.Runtime;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 重置声音代理事件。

diff --git a/Runtime/Interface.meta b/Runtime/Interface.meta
diff --git a/Runtime/Sound/Sound/ISoundAgent.cs → Runtime/Interface/ISoundAgent.cs b/Runtime/Sound/Sound/ISoundAgent.cs → Runtime/Interface/ISoundAgent.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音代理接口。

diff --git a/Runtime/Sound/Sound/ISoundAgent.cs.meta → Runtime/Interface/ISoundAgent.cs.meta b/Runtime/Sound/Sound/ISoundAgent.cs.meta → Runtime/Interface/ISoundAgent.cs.meta
diff --git a/Runtime/Sound/Sound/ISoundAgentHelper.cs → Runtime/Interface/ISoundAgentHelper.cs b/Runtime/Sound/Sound/ISoundAgentHelper.cs → Runtime/Interface/ISoundAgentHelper.cs
@@ -7,7 +7,7 @@
 
 using System;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音代理辅助器接口。

diff --git a/...ime/Sound/Sound/ISoundAgentHelper.cs.meta → Runtime/Interface/ISoundAgentHelper.cs.meta b/...ime/Sound/Sound/ISoundAgentHelper.cs.meta → Runtime/Interface/ISoundAgentHelper.cs.meta
diff --git a/Runtime/Sound/Sound/ISoundGroup.cs → Runtime/Interface/ISoundGroup.cs b/Runtime/Sound/Sound/ISoundGroup.cs → Runtime/Interface/ISoundGroup.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音组接口。

diff --git a/Runtime/Sound/Sound/ISoundGroup.cs.meta → Runtime/Interface/ISoundGroup.cs.meta b/Runtime/Sound/Sound/ISoundGroup.cs.meta → Runtime/Interface/ISoundGroup.cs.meta
diff --git a/Runtime/Sound/Sound/ISoundGroupHelper.cs → Runtime/Interface/ISoundGroupHelper.cs b/Runtime/Sound/Sound/ISoundGroupHelper.cs → Runtime/Interface/ISoundGroupHelper.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音组辅助器接口。

diff --git a/...ime/Sound/Sound/ISoundGroupHelper.cs.meta → Runtime/Interface/ISoundGroupHelper.cs.meta b/...ime/Sound/Sound/ISoundGroupHelper.cs.meta → Runtime/Interface/ISoundGroupHelper.cs.meta
diff --git a/Runtime/Sound/Sound/ISoundHelper.cs → Runtime/Interface/ISoundHelper.cs b/Runtime/Sound/Sound/ISoundHelper.cs → Runtime/Interface/ISoundHelper.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音辅助器接口。

diff --git a/Runtime/Sound/Sound/ISoundHelper.cs.meta → Runtime/Interface/ISoundHelper.cs.meta b/Runtime/Sound/Sound/ISoundHelper.cs.meta → Runtime/Interface/ISoundHelper.cs.meta
diff --git a/Runtime/Sound/Sound/ISoundManager.cs → Runtime/Interface/ISoundManager.cs b/Runtime/Sound/Sound/ISoundManager.cs → Runtime/Interface/ISoundManager.cs
@@ -10,7 +10,7 @@
 using Cysharp.Threading.Tasks;
 using GameFrameX.Asset.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音管理器接口。

diff --git a/Runtime/Sound/Sound/ISoundManager.cs.meta → Runtime/Interface/ISoundManager.cs.meta b/Runtime/Sound/Sound/ISoundManager.cs.meta → Runtime/Interface/ISoundManager.cs.meta
diff --git a/Runtime/Sound/Sound/Constant.cs b/Runtime/Sound/Sound/Constant.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音相关常量。

diff --git a/Runtime/Sound/Sound/PlaySoundErrorCode.cs b/Runtime/Sound/Sound/PlaySoundErrorCode.cs
@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 播放声音错误码。

diff --git a/Runtime/Sound/Sound/PlaySoundParams.cs b/Runtime/Sound/Sound/PlaySoundParams.cs
@@ -7,7 +7,7 @@
 
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 播放声音参数。
@@ -223,10 +223,11 @@ internal bool Referenced
         /// 创建播放声音参数。
         /// </summary>
         /// <returns>创建的播放声音参数。</returns>
-        public static PlaySoundParams Create()
+        public static PlaySoundParams Create(bool isLoop =false)
         {
             PlaySoundParams playSoundParams = ReferencePool.Acquire<PlaySoundParams>();
             playSoundParams.m_Referenced = true;
+            playSoundParams.m_Loop = isLoop;
             return playSoundParams;
         }
 

diff --git a/Runtime/Sound/Sound/SoundManager.PlaySoundInfo.cs b/Runtime/Sound/Sound/SoundManager.PlaySoundInfo.cs
@@ -7,7 +7,7 @@
 
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     public sealed partial class SoundManager : GameFrameworkModule, ISoundManager
     {

diff --git a/Runtime/Sound/Sound/SoundManager.SoundAgent.cs b/Runtime/Sound/Sound/SoundManager.SoundAgent.cs
@@ -8,7 +8,7 @@
 using System;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     public sealed partial class SoundManager : GameFrameworkModule, ISoundManager
     {

diff --git a/Runtime/Sound/Sound/SoundManager.SoundGroup.cs b/Runtime/Sound/Sound/SoundManager.SoundGroup.cs
@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using GameFrameX.Runtime;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     public sealed partial class SoundManager : GameFrameworkModule, ISoundManager
     {

diff --git a/Runtime/Sound/Sound/SoundManager.cs b/Runtime/Sound/Sound/SoundManager.cs
@@ -13,7 +13,7 @@
 using UnityEngine;
 using YooAsset;
 
-namespace GameFrameX.Sound
+namespace GameFrameX.Sound.Runtime
 {
     /// <summary>
     /// 声音管理器。

diff --git a/Runtime/Sound/SoundComponent.cs b/Runtime/Sound/SoundComponent.cs
@@ -605,7 +605,7 @@ private bool AddSoundAgentHelper(string soundGroupName, SoundGroupHelperBase sou
             return true;
         }
 
-        private void OnPlaySoundSuccess(object sender, GameFrameX.Sound.PlaySoundSuccessEventArgs eventArgs)
+        private void OnPlaySoundSuccess(object sender, PlaySoundSuccessEventArgs eventArgs)
         {
             PlaySoundInfo playSoundInfo = (PlaySoundInfo)eventArgs.UserData;
             if (playSoundInfo != null)
@@ -624,7 +624,7 @@ private void OnPlaySoundSuccess(object sender, GameFrameX.Sound.PlaySoundSuccess
             m_EventComponent.Fire(this, eventArgs);
         }
 
-        private void OnPlaySoundFailure(object sender, GameFrameX.Sound.PlaySoundFailureEventArgs eventArgs)
+        private void OnPlaySoundFailure(object sender, PlaySoundFailureEventArgs eventArgs)
         {
             string logMessage = Utility.Text.Format("Play sound failure, asset name '{0}', sound group name '{1}', error code '{2}', error message '{3}'.",
                                                     eventArgs.SoundAssetName, eventArgs.SoundGroupName, eventArgs.ErrorCode, eventArgs.ErrorMessage);
@@ -640,7 +640,7 @@ private void OnPlaySoundFailure(object sender, GameFrameX.Sound.PlaySoundFailure
             m_EventComponent.Fire(this, eventArgs);
         }
 
-        private void OnPlaySoundUpdate(object sender, GameFrameX.Sound.PlaySoundUpdateEventArgs eventArgs)
+        private void OnPlaySoundUpdate(object sender, PlaySoundUpdateEventArgs eventArgs)
         {
             m_EventComponent.Fire(this, eventArgs);
         }