yangwu
/
chicken_dy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决和系统类型AudioType的命名冲突

This commit is contained in:
yangjing 2022-02-16 17:00:22 +08:00
parent ce949b475a
commit f676745a25
15 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Core/AudioManager/AudioConfig.cs
View File

@ -12,11 +12,11 @@ public class AudioConfig : ConfigBase<AudioConfig>
[Serializable] [Serializable]
public class AudioPack public class AudioPack
{ {
public AudioType myType; public AudioClipType myType;
public List<AudioClip> myClips; public List<AudioClip> myClips;
} }
public enum AudioType public enum AudioClipType
{ {
None = -1, None = -1,

12
Assets/Scripts/Core/AudioManager/AudioManager.cs
View File

@ -8,7 +8,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
AudioSource mMusicPlayer; AudioSource mMusicPlayer;
AudioSource mSoundPlayer; 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() protected override void Initialize()
{ {
@ -73,7 +73,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
mSoundPlayer.enabled = pIsOn; mSoundPlayer.enabled = pIsOn;
} }
public void PlayBGMusic(AudioType pType, float pVolumeScale = 1) public void PlayBGMusic(AudioClipType pType, float pVolumeScale = 1)
{ {
CheckMusicPlayer(); 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(); 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); AudioClip tClip = GetClip(pType);
if (tClip == null) 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); AudioClip tClip = GetClip(pType);
if (tClip == null) if (tClip == null)
@ -165,7 +165,7 @@ public class AudioManager : D_MonoSingleton<AudioManager>
Destroy(pAudioSrc); Destroy(pAudioSrc);
} }
private AudioClip GetClip(AudioType pType) private AudioClip GetClip(AudioClipType pType)
{ {
if (!mAudioDic.ContainsKey(pType) || mAudioDic[pType].Count == 0) if (!mAudioDic.ContainsKey(pType) || mAudioDic[pType].Count == 0)
return null; return null;

2
Assets/Scripts/Core/UITools/UIToggleSwap.cs
View File

@ -26,7 +26,7 @@ public class UIToggleSwap : MonoBehaviour
[SerializeField] GameObject mSignOn; [SerializeField] GameObject mSignOn;
[SerializeField] GameObject mSignOff; [SerializeField] GameObject mSignOff;
[SerializeField] AudioType mClickSound = AudioType.None; [SerializeField] AudioClipType mClickSound = AudioClipType.None;
private Button mBtnClick; private Button mBtnClick;
private bool mIsOn; private bool mIsOn;

6
Assets/Scripts/Game/GameLogic.cs
View File

@ -78,13 +78,13 @@ public class GameLogic : MonoBehaviour
if (tEdData.IsGoodEnding) if (tEdData.IsGoodEnding)
{ {
PlayerData.Instance.UnlockNewLevel(); PlayerData.Instance.UnlockNewLevel();
AudioManager.Instance.PlaySound(AudioType.Win); AudioManager.Instance.PlaySound(AudioClipType.Win);
ToukaStageCommonEvent.Instance.StageSuccessEvent(PlayerData.Instance.CurrentLevel); ToukaStageCommonEvent.Instance.StageSuccessEvent(PlayerData.Instance.CurrentLevel);
} }
else else
{ {
AudioManager.Instance.PlaySound(AudioType.Lose); AudioManager.Instance.PlaySound(AudioClipType.Lose);
ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel); ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel);
} }
@ -92,7 +92,7 @@ public class GameLogic : MonoBehaviour
} }
else else
{ {
AudioManager.Instance.PlaySound(AudioType.Lose); AudioManager.Instance.PlaySound(AudioClipType.Lose);
tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed(), false, true); tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed(), false, true);
ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel); ToukaStageCommonEvent.Instance.StageFailureEvent(PlayerData.Instance.CurrentLevel);

6
Assets/Scripts/UI/CustomControl/ButtonEndings.cs
View File

@ -26,7 +26,7 @@ public class ButtonEndings : MonoBehaviour
private void Awake() private void Awake()
{ {
Button tBtn = GetComponent<Button>(); 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) public void Init(int pLevelID, int pUnlockCount, int pTotalCount)
@ -68,7 +68,7 @@ public class ButtonEndings : MonoBehaviour
{ {
mGobNewTag.transform.localScale = Vector3.zero; mGobNewTag.transform.localScale = Vector3.zero;
mGobNewTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce); 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.localScale = Vector3.zero;
mGobCompleteTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce); mGobCompleteTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce);
AudioManager.Instance.PlaySound(AudioType.Complete); AudioManager.Instance.PlaySound(AudioClipType.Complete);
} }
} }
} }

2
Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs
View File

@ -30,7 +30,7 @@ public class LevelCell : MonoBehaviour
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnBg, OnClickBg); UIUtils.BindBtn(mBtnBg, OnClickBg);
UIUtils.BindBtn(mBtnComingSoon, OnClickComingSoon, AudioType.New); UIUtils.BindBtn(mBtnComingSoon, OnClickComingSoon, AudioClipType.New);
} }
public void Init(int pIndex) public void Init(int pIndex)

4
Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs
View File

@ -86,11 +86,11 @@ public class LevelPage : PageView
private void PlayScrollPage() private void PlayScrollPage()
{ {
AudioManager.Instance.PlaySound(AudioType.TurnPage, 0.7f); AudioManager.Instance.PlaySound(AudioClipType.TurnPage, 0.7f);
} }
private void PlayReachEdge() private void PlayReachEdge()
{ {
AudioManager.Instance.PlaySound(AudioType.ReachEdge, 0.7f); AudioManager.Instance.PlaySound(AudioClipType.ReachEdge, 0.7f);
} }
} }

2
Assets/Scripts/UI/PanelEndings.cs
View File

@ -28,7 +28,7 @@ public class PanelEndings : BasePanel
{ {
base.OnClose(); base.OnClose();
AudioManager.Instance.PlaySound(AudioType.UIClose); AudioManager.Instance.PlaySound(AudioClipType.UIClose);
} }
public void Init(int pLevelID) public void Init(int pLevelID)

10
Assets/Scripts/UI/PanelGame.cs
View File

@ -39,9 +39,9 @@ public class PanelGame : BasePanel
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioType.Click_Normal); UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal);
UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioType.Click_Tip); UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioClipType.Click_Tip);
UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioType.Click_Play); UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioClipType.Click_Play);
mBtnEndings.DelClick = OnClickEndings; mBtnEndings.DelClick = OnClickEndings;
@ -151,13 +151,13 @@ public class PanelGame : BasePanel
mAtrAction.gameObject.SetActive(true); mAtrAction.gameObject.SetActive(true);
mAtrAction.Play("Action"); mAtrAction.Play("Action");
AudioManager.Instance.PlaySound(AudioType.Click_Play); AudioManager.Instance.PlaySound(AudioClipType.Click_Play);
TimerManager.Instance.Schedule(PlayActionSound, 1f); TimerManager.Instance.Schedule(PlayActionSound, 1f);
} }
private void PlayActionSound() private void PlayActionSound()
{ {
AudioManager.Instance.PlaySound(AudioType.Action); AudioManager.Instance.PlaySound(AudioClipType.Action);
TimerManager.Instance.Schedule(StartPlay, 1f); TimerManager.Instance.Schedule(StartPlay, 1f);
} }

6
Assets/Scripts/UI/PanelLevel.cs
View File

@ -18,7 +18,7 @@ public class PanelLevel : BasePanel
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnBack, Close); UIUtils.BindBtn(mBtnBack, Close);
UIUtils.BindBtn(mBtnBackToMain, OnClickBackToMain, AudioType.Click_Normal); UIUtils.BindBtn(mBtnBackToMain, OnClickBackToMain, AudioClipType.Click_Normal);
mLvPage.DelClickLevel = OnClickLevel; mLvPage.DelClickLevel = OnClickLevel;
} }
@ -42,7 +42,7 @@ public class PanelLevel : BasePanel
{ {
base.OnClose(); base.OnClose();
AudioManager.Instance.PlaySound(AudioType.UIClose); AudioManager.Instance.PlaySound(AudioClipType.UIClose);
} }
public void Init(bool pOpenInLevel) public void Init(bool pOpenInLevel)
@ -67,7 +67,7 @@ public class PanelLevel : BasePanel
mRctScream.gameObject.SetActive(true); mRctScream.gameObject.SetActive(true);
mRctScream.position = tCell.transform.position; mRctScream.position = tCell.transform.position;
AudioManager.Instance.PlaySound(AudioType.StartGame); AudioManager.Instance.PlaySound(AudioClipType.StartGame);
PlayerData.Instance.CurrentLevel = pLevelIndex + 1; PlayerData.Instance.CurrentLevel = pLevelIndex + 1;

14
Assets/Scripts/UI/PanelMain.cs
View File

@ -62,11 +62,11 @@ public class PanelMain : BasePanel
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnOpen, OnClickOpen); UIUtils.BindBtn(mBtnOpen, OnClickOpen);
UIUtils.BindBtn(mBtnLast, OnClickLast, AudioType.Click_Last); UIUtils.BindBtn(mBtnLast, OnClickLast, AudioClipType.Click_Last);
UIUtils.BindBtn(mBtnNext, OnClickNext, AudioType.Click_Next); UIUtils.BindBtn(mBtnNext, OnClickNext, AudioClipType.Click_Next);
UIUtils.BindBtn(mBtnStartSingle, OnClickStartSingle, AudioType.StartGame); UIUtils.BindBtn(mBtnStartSingle, OnClickStartSingle, AudioClipType.StartGame);
UIUtils.BindBtn(mBtnStart, OnClickStart, AudioType.StartGame); UIUtils.BindBtn(mBtnStart, OnClickStart, AudioClipType.StartGame);
UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioType.Click_Normal); UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal);
UIUtils.BindBtn(mBtnPrivacy, OnClickPrivacy); UIUtils.BindBtn(mBtnPrivacy, OnClickPrivacy);
} }
@ -177,7 +177,7 @@ public class PanelMain : BasePanel
{ {
mBtnStartSingle.gameObject.SetActive(true); mBtnStartSingle.gameObject.SetActive(true);
AudioManager.Instance.PlayBGMusic(AudioType.BGM, 0.8f); AudioManager.Instance.PlayBGMusic(AudioClipType.BGM, 0.8f);
} }
private void ShowFilm() private void ShowFilm()
@ -191,7 +191,7 @@ public class PanelMain : BasePanel
ShowBubble(); ShowBubble();
}; };
AudioManager.Instance.PlayBGMusic(AudioType.BGM, 0.8f); AudioManager.Instance.PlayBGMusic(AudioClipType.BGM, 0.8f);
} }
private void InitLevelIcons() private void InitLevelIcons()

4
Assets/Scripts/UI/PanelNoAdsTip.cs
View File

@ -26,14 +26,14 @@ public class PanelNoAdsTip : BasePanel
mCvsBg.DOFade(1, 0.3f); mCvsBg.DOFade(1, 0.3f);
mRctBg.DOAnchorPosY(100, 0.3f); mRctBg.DOAnchorPosY(100, 0.3f);
AudioManager.Instance.PlaySound(AudioType.Click_Tip); AudioManager.Instance.PlaySound(AudioClipType.Click_Tip);
} }
public override void OnClose() public override void OnClose()
{ {
base.OnClose(); base.OnClose();
AudioManager.Instance.PlaySound(AudioType.UIClose); AudioManager.Instance.PlaySound(AudioClipType.UIClose);
} }
private void OnClickMask() private void OnClickMask()

8
Assets/Scripts/UI/PanelResult.cs
View File

@ -30,10 +30,10 @@ public class PanelResult : BasePanel
private void Awake() private void Awake()
{ {
UIUtils.BindBtn(mBtnAgain1, OnClickAgain, AudioType.Click_Normal); UIUtils.BindBtn(mBtnAgain1, OnClickAgain, AudioClipType.Click_Normal);
UIUtils.BindBtn(mBtnAgain2, OnClickAgain, AudioType.Click_Normal); UIUtils.BindBtn(mBtnAgain2, OnClickAgain, AudioClipType.Click_Normal);
UIUtils.BindBtn(mBtnNext, OnClickNext, AudioType.Click_Normal); UIUtils.BindBtn(mBtnNext, OnClickNext, AudioClipType.Click_Normal);
UIUtils.BindBtn(mBtnChoose, OnClickChoose, AudioType.Click_Normal); UIUtils.BindBtn(mBtnChoose, OnClickChoose, AudioClipType.Click_Normal);
mBtnEndings.DelClick = OnClickEndings; mBtnEndings.DelClick = OnClickEndings;
} }

2
Assets/Scripts/UI/PanelSettings.cs
View File

@ -39,7 +39,7 @@ public class PanelSettings : BasePanel
{ {
base.OnClose(); base.OnClose();
AudioManager.Instance.PlaySound(AudioType.UIClose); AudioManager.Instance.PlaySound(AudioClipType.UIClose);
mTglBGM.OnSwitch -= SwitchBGM; mTglBGM.OnSwitch -= SwitchBGM;
mTglSound.OnSwitch -= SwitchSound; mTglSound.OnSwitch -= SwitchSound;

2
Assets/Scripts/Utils/UIUtils.cs
View File

@ -6,7 +6,7 @@ using UnityEngine.UI;
public static class UIUtils 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); pBtn.onClick.AddListener(pDel);