From f676745a253df7a51494ae4ee5b114587cfbfc6f Mon Sep 17 00:00:00 2001
From: yangjing <phantomj@126.com>
Date: Wed, 16 Feb 2022 17:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=92=8C=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8BAudioType=E7=9A=84=E5=91=BD=E5=90=8D=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Core/AudioManager/AudioConfig.cs    |  4 ++--
 Assets/Scripts/Core/AudioManager/AudioManager.cs   | 12 ++++++------
 Assets/Scripts/Core/UITools/UIToggleSwap.cs        |  2 +-
 Assets/Scripts/Game/GameLogic.cs                   |  6 +++---
 Assets/Scripts/UI/CustomControl/ButtonEndings.cs   |  6 +++---
 .../UI/CustomControl/LevelPage/LevelCell.cs        |  2 +-
 .../UI/CustomControl/LevelPage/LevelPage.cs        |  4 ++--
 Assets/Scripts/UI/PanelEndings.cs                  |  2 +-
 Assets/Scripts/UI/PanelGame.cs                     | 10 +++++-----
 Assets/Scripts/UI/PanelLevel.cs                    |  6 +++---
 Assets/Scripts/UI/PanelMain.cs                     | 14 +++++++-------
 Assets/Scripts/UI/PanelNoAdsTip.cs                 |  4 ++--
 Assets/Scripts/UI/PanelResult.cs                   |  8 ++++----
 Assets/Scripts/UI/PanelSettings.cs                 |  2 +-
 Assets/Scripts/Utils/UIUtils.cs                    |  2 +-
 15 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Assets/Scripts/Core/AudioManager/AudioConfig.cs b/Assets/Scripts/Core/AudioManager/AudioConfig.cs
index 57a8ed53..48df7387 100644
--- a/Assets/Scripts/Core/AudioManager/AudioConfig.cs
+++ b/Assets/Scripts/Core/AudioManager/AudioConfig.cs
@@ -12,11 +12,11 @@ public class AudioConfig : ConfigBase<AudioConfig>
 [Serializable]
 public class AudioPack
 {
-    public AudioType myType;
+    public AudioClipType myType;
     public List<AudioClip> myClips;
 }
 
-public enum AudioType
+public enum AudioClipType
 {
     None = -1,
 
diff --git a/Assets/Scripts/Core/AudioManager/AudioManager.cs b/Assets/Scripts/Core/AudioManager/AudioManager.cs
index f2812c8d..b44e3d6b 100644
--- a/Assets/Scripts/Core/AudioManager/AudioManager.cs
+++ b/Assets/Scripts/Core/AudioManager/AudioManager.cs
@@ -8,7 +8,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
     AudioSource mMusicPlayer;
     AudioSource mSoundPlayer;
 
-    private Dictionary<AudioType, List<AudioClip>> mAudioDic = new Dictionary<AudioType, List<AudioClip>>();
+    private Dictionary<AudioClipType, List<AudioClip>> mAudioDic = new Dictionary<AudioClipType, List<AudioClip>>();
 
     protected override void Initialize()
     {
@@ -73,7 +73,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         mSoundPlayer.enabled = pIsOn;
     }
 
-    public void PlayBGMusic(AudioType pType, float pVolumeScale = 1)
+    public void PlayBGMusic(AudioClipType pType, float pVolumeScale = 1)
     {
         CheckMusicPlayer();
 
@@ -101,7 +101,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         }
     }
 
-    public void PlaySound(AudioType pType, float pVolumeScale = 1)
+    public void PlaySound(AudioClipType pType, float pVolumeScale = 1)
     {
         CheckSoundPlayer();
 
@@ -129,7 +129,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         }
     }
 
-    public void PlaySound3D(AudioSource pAudioSrc, AudioType pType)
+    public void PlaySound3D(AudioSource pAudioSrc, AudioClipType pType)
     {
         AudioClip tClip = GetClip(pType);
         if (tClip == null)
@@ -141,7 +141,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         }
     }
 
-    public AudioSource PlaySoundLoop(AudioType pType, float pVolumeScale = 1)
+    public AudioSource PlaySoundLoop(AudioClipType pType, float pVolumeScale = 1)
     {
         AudioClip tClip = GetClip(pType);
         if (tClip == null)
@@ -165,7 +165,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
         Destroy(pAudioSrc);
     }
 
-    private AudioClip GetClip(AudioType pType)
+    private AudioClip GetClip(AudioClipType pType)
     {
         if (!mAudioDic.ContainsKey(pType) || mAudioDic[pType].Count == 0)
             return null;
diff --git a/Assets/Scripts/Core/UITools/UIToggleSwap.cs b/Assets/Scripts/Core/UITools/UIToggleSwap.cs
index b533c766..5b8a4523 100644
--- a/Assets/Scripts/Core/UITools/UIToggleSwap.cs
+++ b/Assets/Scripts/Core/UITools/UIToggleSwap.cs
@@ -26,7 +26,7 @@ public class UIToggleSwap : MonoBehaviour
 
     [SerializeField] GameObject mSignOn;
     [SerializeField] GameObject mSignOff;
-    [SerializeField] AudioType mClickSound = AudioType.None;
+    [SerializeField] AudioClipType mClickSound = AudioClipType.None;
 
     private Button mBtnClick;
     private bool mIsOn;
diff --git a/Assets/Scripts/Game/GameLogic.cs b/Assets/Scripts/Game/GameLogic.cs
index 2448069f..c61e7f6d 100644
--- a/Assets/Scripts/Game/GameLogic.cs
+++ b/Assets/Scripts/Game/GameLogic.cs
@@ -78,13 +78,13 @@ public class GameLogic : MonoBehaviour
                 if (tEdData.IsGoodEnding)
                 {
                     PlayerData.Instance.UnlockNewLevel();
-                    AudioManager.Instance.PlaySound(AudioType.Win);
+                    AudioManager.Instance.PlaySound(AudioClipType.Win);
 
                     ToukaStageCommonEvent.Instance.StageSuccessEvent(PlayerData.Instance.CurrentLevel);
                 }
                 else
                 {
-                    AudioManager.Instance.PlaySound(AudioType.Lose);
+                    AudioManager.Instance.PlaySound(AudioClipType.Lose);
 
                     ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel);
                 }
@@ -92,7 +92,7 @@ public class GameLogic : MonoBehaviour
             }
             else
             {
-                AudioManager.Instance.PlaySound(AudioType.Lose);
+                AudioManager.Instance.PlaySound(AudioClipType.Lose);
                 tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed(), false, true);
 
                 ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel);
diff --git a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs
index 3ae564f4..72f2425c 100644
--- a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs
+++ b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs
@@ -26,7 +26,7 @@ public class ButtonEndings : MonoBehaviour
     private void Awake()
     {
         Button tBtn = GetComponent<Button>();
-        UIUtils.BindBtn(tBtn, OnClick, AudioType.Click_Tip);
+        UIUtils.BindBtn(tBtn, OnClick, AudioClipType.Click_Tip);
     }
 
     public void Init(int pLevelID, int pUnlockCount, int pTotalCount)
@@ -68,7 +68,7 @@ public class ButtonEndings : MonoBehaviour
             {
                 mGobNewTag.transform.localScale = Vector3.zero;
                 mGobNewTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce);
-                AudioManager.Instance.PlaySound(AudioType.New);
+                AudioManager.Instance.PlaySound(AudioClipType.New);
             }
         }
     }
@@ -82,7 +82,7 @@ public class ButtonEndings : MonoBehaviour
             {
                 mGobCompleteTag.transform.localScale = Vector3.zero;
                 mGobCompleteTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce);
-                AudioManager.Instance.PlaySound(AudioType.Complete);
+                AudioManager.Instance.PlaySound(AudioClipType.Complete);
             }
         }
     }
diff --git a/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs b/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs
index d8982db4..773be46e 100644
--- a/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs
+++ b/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs
@@ -30,7 +30,7 @@ public class LevelCell : MonoBehaviour
     private void Awake()
     {
         UIUtils.BindBtn(mBtnBg, OnClickBg);
-        UIUtils.BindBtn(mBtnComingSoon, OnClickComingSoon, AudioType.New);
+        UIUtils.BindBtn(mBtnComingSoon, OnClickComingSoon, AudioClipType.New);
     }
 
     public void Init(int pIndex)
diff --git a/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs
index 3011569a..6128b128 100644
--- a/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs
+++ b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs
@@ -86,11 +86,11 @@ public class LevelPage : PageView
 
     private void PlayScrollPage()
     {
-        AudioManager.Instance.PlaySound(AudioType.TurnPage, 0.7f);
+        AudioManager.Instance.PlaySound(AudioClipType.TurnPage, 0.7f);
     }
 
     private void PlayReachEdge()
     {
-        AudioManager.Instance.PlaySound(AudioType.ReachEdge, 0.7f);
+        AudioManager.Instance.PlaySound(AudioClipType.ReachEdge, 0.7f);
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/UI/PanelEndings.cs b/Assets/Scripts/UI/PanelEndings.cs
index 5f23cd9c..6464f13f 100644
--- a/Assets/Scripts/UI/PanelEndings.cs
+++ b/Assets/Scripts/UI/PanelEndings.cs
@@ -28,7 +28,7 @@ public class PanelEndings : BasePanel
     {
         base.OnClose();
 
-        AudioManager.Instance.PlaySound(AudioType.UIClose);
+        AudioManager.Instance.PlaySound(AudioClipType.UIClose);
     }
 
     public void Init(int pLevelID)
diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs
index e8359c77..f536582c 100644
--- a/Assets/Scripts/UI/PanelGame.cs
+++ b/Assets/Scripts/UI/PanelGame.cs
@@ -39,9 +39,9 @@ public class PanelGame : BasePanel
 
     private void Awake()
     {
-        UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioType.Click_Normal);
-        UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioType.Click_Tip);
-        UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioType.Click_Play);
+        UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal);
+        UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioClipType.Click_Tip);
+        UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioClipType.Click_Play);
 
         mBtnEndings.DelClick = OnClickEndings;
 
@@ -151,13 +151,13 @@ public class PanelGame : BasePanel
         mAtrAction.gameObject.SetActive(true);
         mAtrAction.Play("Action");
 
-        AudioManager.Instance.PlaySound(AudioType.Click_Play);
+        AudioManager.Instance.PlaySound(AudioClipType.Click_Play);
         TimerManager.Instance.Schedule(PlayActionSound, 1f);
     }
 
     private void PlayActionSound()
     {
-        AudioManager.Instance.PlaySound(AudioType.Action);
+        AudioManager.Instance.PlaySound(AudioClipType.Action);
         TimerManager.Instance.Schedule(StartPlay, 1f);
     }
 
diff --git a/Assets/Scripts/UI/PanelLevel.cs b/Assets/Scripts/UI/PanelLevel.cs
index 241c5cfb..0f50ad92 100644
--- a/Assets/Scripts/UI/PanelLevel.cs
+++ b/Assets/Scripts/UI/PanelLevel.cs
@@ -18,7 +18,7 @@ public class PanelLevel : BasePanel
     private void Awake()
     {
         UIUtils.BindBtn(mBtnBack, Close);
-        UIUtils.BindBtn(mBtnBackToMain, OnClickBackToMain, AudioType.Click_Normal);
+        UIUtils.BindBtn(mBtnBackToMain, OnClickBackToMain, AudioClipType.Click_Normal);
 
         mLvPage.DelClickLevel = OnClickLevel;
     }
@@ -42,7 +42,7 @@ public class PanelLevel : BasePanel
     {
         base.OnClose();
 
-        AudioManager.Instance.PlaySound(AudioType.UIClose);
+        AudioManager.Instance.PlaySound(AudioClipType.UIClose);
     }
 
     public void Init(bool pOpenInLevel)
@@ -67,7 +67,7 @@ public class PanelLevel : BasePanel
 
             mRctScream.gameObject.SetActive(true);
             mRctScream.position = tCell.transform.position;
-            AudioManager.Instance.PlaySound(AudioType.StartGame);
+            AudioManager.Instance.PlaySound(AudioClipType.StartGame);
 
             PlayerData.Instance.CurrentLevel = pLevelIndex + 1;
 
diff --git a/Assets/Scripts/UI/PanelMain.cs b/Assets/Scripts/UI/PanelMain.cs
index e427721c..c216cf25 100644
--- a/Assets/Scripts/UI/PanelMain.cs
+++ b/Assets/Scripts/UI/PanelMain.cs
@@ -62,11 +62,11 @@ public class PanelMain : BasePanel
     private void Awake()
     {
         UIUtils.BindBtn(mBtnOpen, OnClickOpen);
-        UIUtils.BindBtn(mBtnLast, OnClickLast, AudioType.Click_Last);
-        UIUtils.BindBtn(mBtnNext, OnClickNext, AudioType.Click_Next);
-        UIUtils.BindBtn(mBtnStartSingle, OnClickStartSingle, AudioType.StartGame);
-        UIUtils.BindBtn(mBtnStart, OnClickStart, AudioType.StartGame);
-        UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioType.Click_Normal);
+        UIUtils.BindBtn(mBtnLast, OnClickLast, AudioClipType.Click_Last);
+        UIUtils.BindBtn(mBtnNext, OnClickNext, AudioClipType.Click_Next);
+        UIUtils.BindBtn(mBtnStartSingle, OnClickStartSingle, AudioClipType.StartGame);
+        UIUtils.BindBtn(mBtnStart, OnClickStart, AudioClipType.StartGame);
+        UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal);
         UIUtils.BindBtn(mBtnPrivacy, OnClickPrivacy);
     }
 
@@ -177,7 +177,7 @@ public class PanelMain : BasePanel
     {
         mBtnStartSingle.gameObject.SetActive(true);
 
-        AudioManager.Instance.PlayBGMusic(AudioType.BGM, 0.8f);
+        AudioManager.Instance.PlayBGMusic(AudioClipType.BGM, 0.8f);
     }
 
     private void ShowFilm()
@@ -191,7 +191,7 @@ public class PanelMain : BasePanel
             ShowBubble();
         };
 
-        AudioManager.Instance.PlayBGMusic(AudioType.BGM, 0.8f);
+        AudioManager.Instance.PlayBGMusic(AudioClipType.BGM, 0.8f);
     }
 
     private void InitLevelIcons()
diff --git a/Assets/Scripts/UI/PanelNoAdsTip.cs b/Assets/Scripts/UI/PanelNoAdsTip.cs
index 9a59fe91..a80d5def 100644
--- a/Assets/Scripts/UI/PanelNoAdsTip.cs
+++ b/Assets/Scripts/UI/PanelNoAdsTip.cs
@@ -26,14 +26,14 @@ public class PanelNoAdsTip : BasePanel
         mCvsBg.DOFade(1, 0.3f);
         mRctBg.DOAnchorPosY(100, 0.3f);
 
-        AudioManager.Instance.PlaySound(AudioType.Click_Tip);
+        AudioManager.Instance.PlaySound(AudioClipType.Click_Tip);
     }
 
     public override void OnClose()
     {
         base.OnClose();
 
-        AudioManager.Instance.PlaySound(AudioType.UIClose);
+        AudioManager.Instance.PlaySound(AudioClipType.UIClose);
     }
 
     private void OnClickMask()
diff --git a/Assets/Scripts/UI/PanelResult.cs b/Assets/Scripts/UI/PanelResult.cs
index c2b4a100..2070f776 100644
--- a/Assets/Scripts/UI/PanelResult.cs
+++ b/Assets/Scripts/UI/PanelResult.cs
@@ -30,10 +30,10 @@ public class PanelResult : BasePanel
 
     private void Awake()
     {
-        UIUtils.BindBtn(mBtnAgain1, OnClickAgain, AudioType.Click_Normal);
-        UIUtils.BindBtn(mBtnAgain2, OnClickAgain, AudioType.Click_Normal);
-        UIUtils.BindBtn(mBtnNext, OnClickNext, AudioType.Click_Normal);
-        UIUtils.BindBtn(mBtnChoose, OnClickChoose, AudioType.Click_Normal);
+        UIUtils.BindBtn(mBtnAgain1, OnClickAgain, AudioClipType.Click_Normal);
+        UIUtils.BindBtn(mBtnAgain2, OnClickAgain, AudioClipType.Click_Normal);
+        UIUtils.BindBtn(mBtnNext, OnClickNext, AudioClipType.Click_Normal);
+        UIUtils.BindBtn(mBtnChoose, OnClickChoose, AudioClipType.Click_Normal);
 
         mBtnEndings.DelClick = OnClickEndings;
     }
diff --git a/Assets/Scripts/UI/PanelSettings.cs b/Assets/Scripts/UI/PanelSettings.cs
index 9ff16019..e0ef42d6 100644
--- a/Assets/Scripts/UI/PanelSettings.cs
+++ b/Assets/Scripts/UI/PanelSettings.cs
@@ -39,7 +39,7 @@ public class PanelSettings : BasePanel
     {
         base.OnClose();
 
-        AudioManager.Instance.PlaySound(AudioType.UIClose);
+        AudioManager.Instance.PlaySound(AudioClipType.UIClose);
 
         mTglBGM.OnSwitch -= SwitchBGM;
         mTglSound.OnSwitch -= SwitchSound;
diff --git a/Assets/Scripts/Utils/UIUtils.cs b/Assets/Scripts/Utils/UIUtils.cs
index 88de8bda..13ba47c4 100644
--- a/Assets/Scripts/Utils/UIUtils.cs
+++ b/Assets/Scripts/Utils/UIUtils.cs
@@ -6,7 +6,7 @@ using UnityEngine.UI;
 
 public static class UIUtils
 {
-    public static void BindBtn(Button pBtn, UnityAction pDel, AudioType pSound = AudioType.None)
+    public static void BindBtn(Button pBtn, UnityAction pDel, AudioClipType pSound = AudioClipType.None)
     {
         pBtn.onClick.AddListener(pDel);