From c915e763525319b65b04a0a6f8d20fb957c3cd12 Mon Sep 17 00:00:00 2001 From: yangjing Date: Mon, 14 Feb 2022 17:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=9F=B3=E6=95=88=E5=92=8CBG?= =?UTF-8?q?M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Audio/LogoSound.meta | 8 +++ Assets/Resources/Audio/LogoSound/010_2.mp3 | Bin 0 -> 6656 bytes .../Resources/Audio/LogoSound/010_2.mp3.meta | 36 ++++++++++++ Assets/Resources/Audio/LogoSound/020_1.mp3 | Bin 0 -> 4784 bytes .../Resources/Audio/LogoSound/020_1.mp3.meta | 36 ++++++++++++ .../{UISound => LogoSound}/26_SE_CHIN.mp3 | Bin .../26_SE_CHIN.mp3.meta | 0 .../{UISound => LogoSound}/68_SE_PULU.mp3 | Bin .../68_SE_PULU.mp3.meta | 0 .../Resources/Audio/UISound/104_SE_XYLO3.mp3 | Bin 0 -> 4576 bytes .../Audio/UISound/104_SE_XYLO3.mp3.meta | 36 ++++++++++++ .../Resources/Audio/UISound/105_SE_XYLO2.mp3 | Bin 0 -> 3952 bytes .../Audio/UISound/105_SE_XYLO2.mp3.meta | 36 ++++++++++++ .../Resources/Audio/UISound/106_SE_XYLO1.mp3 | Bin 0 -> 5408 bytes .../Audio/UISound/106_SE_XYLO1.mp3.meta | 36 ++++++++++++ Assets/Resources/AudioConfig.asset | 47 +++++++++++++++- Assets/Resources/UIs/PanelMain.prefab | 5 ++ Assets/Resources/UIs/PanelSettings.prefab | 2 + Assets/Scripts/Config/AudioConfig.cs | 20 ++++++- Assets/Scripts/Core/AudioManager.cs | 33 ++++++++--- Assets/Scripts/Core/UIManager/UIManager.cs | 18 +----- Assets/Scripts/Game/GameLogic.cs | 6 ++ .../Scripts/UI/CustomControl/ButtonEndings.cs | 2 +- .../UI/CustomControl/LevelList/LevelPage.cs | 16 ++++++ Assets/Scripts/UI/CustomControl/PageView.cs | 10 +++- Assets/Scripts/UI/PanelEndings.cs | 7 +++ Assets/Scripts/UI/PanelGame.cs | 16 ++++-- Assets/Scripts/UI/PanelLevel.cs | 11 +++- Assets/Scripts/UI/PanelMain.cs | 53 ++++++++++++++++-- Assets/Scripts/UI/PanelResult.cs | 8 +-- Assets/Scripts/UI/PanelSettings.cs | 2 + Assets/Scripts/Utils/UITools/UIToggleSwap.cs | 3 + Assets/Scripts/Utils/UITools/UIUtils.cs | 2 + 33 files changed, 404 insertions(+), 45 deletions(-) create mode 100644 Assets/Resources/Audio/LogoSound.meta create mode 100644 Assets/Resources/Audio/LogoSound/010_2.mp3 create mode 100644 Assets/Resources/Audio/LogoSound/010_2.mp3.meta create mode 100644 Assets/Resources/Audio/LogoSound/020_1.mp3 create mode 100644 Assets/Resources/Audio/LogoSound/020_1.mp3.meta rename Assets/Resources/Audio/{UISound => LogoSound}/26_SE_CHIN.mp3 (100%) rename Assets/Resources/Audio/{UISound => LogoSound}/26_SE_CHIN.mp3.meta (100%) rename Assets/Resources/Audio/{UISound => LogoSound}/68_SE_PULU.mp3 (100%) rename Assets/Resources/Audio/{UISound => LogoSound}/68_SE_PULU.mp3.meta (100%) create mode 100644 Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3 create mode 100644 Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3.meta create mode 100644 Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3 create mode 100644 Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3.meta create mode 100644 Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3 create mode 100644 Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3.meta diff --git a/Assets/Resources/Audio/LogoSound.meta b/Assets/Resources/Audio/LogoSound.meta new file mode 100644 index 00000000..de0d5a3a --- /dev/null +++ b/Assets/Resources/Audio/LogoSound.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a03bb7c4004e74d35a349c60e8216507 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/LogoSound/010_2.mp3 b/Assets/Resources/Audio/LogoSound/010_2.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..ecfc8596086d2fd41d2a3de7155bc4290ce50353 GIT binary patch literal 6656 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 BGOhps literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3.meta b/Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3.meta new file mode 100644 index 00000000..98bd8a39 --- /dev/null +++ b/Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: c964589478e574c59a509b7c3b555823 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + forceToMono: 1 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3 b/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..600cdf89826616c2e74edbdbac68e6fbef33a06b GIT binary patch literal 5408 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 FzW_2M0fhhn literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3.meta b/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3.meta new file mode 100644 index 00000000..ed9627d7 --- /dev/null +++ b/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 5ca3534a3bc1c485ab46b719d77c0ff0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + forceToMono: 1 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AudioConfig.asset b/Assets/Resources/AudioConfig.asset index c6714ac5..980fd575 100644 --- a/Assets/Resources/AudioConfig.asset +++ b/Assets/Resources/AudioConfig.asset @@ -12,4 +12,49 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d4c1d4ac76fb492e9badc39ba99288c, type: 3} m_Name: AudioConfig m_EditorClassIdentifier: - AudioPacks: [] + AudioPacks: + - myType: 0 + myClips: + - {fileID: 8300000, guid: 47c17744484df471789b35506acb6247, type: 3} + - myType: 101 + myClips: + - {fileID: 8300000, guid: 158f2f6b832054362b6ed4a0672acea0, type: 3} + - myType: 102 + myClips: + - {fileID: 8300000, guid: cef8d55b1bc954d15a9dd8351005fdef, type: 3} + - myType: 103 + myClips: + - {fileID: 8300000, guid: 3d067c6f5cb66480ebadea306998e7ed, type: 3} + - myType: 104 + myClips: + - {fileID: 8300000, guid: 8a1349168556c40cbbe33988990b702a, type: 3} + - myType: 105 + myClips: + - {fileID: 8300000, guid: 9db658cc186d6412da483738cee75232, type: 3} + - myType: 106 + myClips: + - {fileID: 8300000, guid: 3c6b0269fb9624c519e809e65a912630, type: 3} + - myType: 201 + myClips: + - {fileID: 8300000, guid: 4b08699866dfe4b79a29c91ba2c658ce, type: 3} + - myType: 202 + myClips: + - {fileID: 8300000, guid: 1b53e9ae5e38f464a94d34dde19d7646, type: 3} + - myType: 203 + myClips: + - {fileID: 8300000, guid: 01e380bf3bb804b25a7b50d204172e63, type: 3} + - myType: 204 + myClips: + - {fileID: 8300000, guid: c964589478e574c59a509b7c3b555823, type: 3} + - myType: 205 + myClips: + - {fileID: 8300000, guid: 5ca3534a3bc1c485ab46b719d77c0ff0, type: 3} + - myType: 206 + myClips: + - {fileID: 8300000, guid: 502c80f0b8bc144c5bcd00f7a5b996b5, type: 3} + - myType: 207 + myClips: + - {fileID: 8300000, guid: 4529820553b6043cfb28ea8a474e645d, type: 3} + - myType: 208 + myClips: + - {fileID: 8300000, guid: 5ca3534a3bc1c485ab46b719d77c0ff0, type: 3} diff --git a/Assets/Resources/UIs/PanelMain.prefab b/Assets/Resources/UIs/PanelMain.prefab index 34b2d3af..19b1e402 100644 --- a/Assets/Resources/UIs/PanelMain.prefab +++ b/Assets/Resources/UIs/PanelMain.prefab @@ -1087,6 +1087,11 @@ MonoBehaviour: mCvsOpenPart: {fileID: 3358427266420662963} mBtnOpen: {fileID: 2617655800311524037} mGobLogo: {fileID: 2462780529621831198} + mLogoSounds: + - {fileID: 8300000, guid: 2fe24cf0c6467410abbe6a0400b26c78, type: 3} + - {fileID: 8300000, guid: 31cea82df675641a1acb62fea506dd5b, type: 3} + - {fileID: 8300000, guid: 95210ea5d59b94937bf9090a9c16733d, type: 3} + - {fileID: 8300000, guid: 2b37b0d87cba54cab936589f9e1e21c7, type: 3} mIconPosX: - -900 - -450 diff --git a/Assets/Resources/UIs/PanelSettings.prefab b/Assets/Resources/UIs/PanelSettings.prefab index 2affe128..db0aaaad 100644 --- a/Assets/Resources/UIs/PanelSettings.prefab +++ b/Assets/Resources/UIs/PanelSettings.prefab @@ -564,6 +564,7 @@ MonoBehaviour: m_EditorClassIdentifier: mSignOn: {fileID: 1753321238473391198} mSignOff: {fileID: 7169702685638789580} + mClickSound: 204 --- !u!1 &7169702685638789580 GameObject: m_ObjectHideFlags: 0 @@ -773,6 +774,7 @@ MonoBehaviour: m_EditorClassIdentifier: mSignOn: {fileID: 1397343710898404738} mSignOff: {fileID: 2280471745191183687} + mClickSound: 204 --- !u!1 &9049642900839062096 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Config/AudioConfig.cs b/Assets/Scripts/Config/AudioConfig.cs index 06c8185b..57a8ed53 100644 --- a/Assets/Scripts/Config/AudioConfig.cs +++ b/Assets/Scripts/Config/AudioConfig.cs @@ -20,5 +20,23 @@ public enum AudioType { None = -1, - BGM + BGM = 0, + + StartGame = 101, + Action = 102, + Win = 103, + Lose = 104, + Complete = 105, + New = 106, + + TurnPage = 201, + ReachEdge = 202, + + Click_Normal = 203, + Click_Tip = 204, + Click_Last = 205, + Click_Next = 206, + Click_Play = 207, + + UIClose = 208 } diff --git a/Assets/Scripts/Core/AudioManager.cs b/Assets/Scripts/Core/AudioManager.cs index 0c22e45d..f2812c8d 100644 --- a/Assets/Scripts/Core/AudioManager.cs +++ b/Assets/Scripts/Core/AudioManager.cs @@ -81,18 +81,24 @@ public class AudioManager : D_MonoSingleton if (tClip == null) return; - mMusicPlayer.clip = tClip; - mMusicPlayer.loop = true; - mMusicPlayer.volume *= pVolumeScale; - mMusicPlayer.Play(); + if (mMusicPlayer.enabled) + { + mMusicPlayer.clip = tClip; + mMusicPlayer.loop = true; + mMusicPlayer.volume *= pVolumeScale; + mMusicPlayer.Play(); + } } public void StopBGMusic() { CheckMusicPlayer(); - mMusicPlayer.Stop(); - mMusicPlayer.clip = null; + if (mMusicPlayer.enabled) + { + mMusicPlayer.Stop(); + mMusicPlayer.clip = null; + } } public void PlaySound(AudioType pType, float pVolumeScale = 1) @@ -103,7 +109,10 @@ public class AudioManager : D_MonoSingleton if (tClip == null) return; - mSoundPlayer.PlayOneShot(tClip, pVolumeScale); + if (mSoundPlayer.enabled) + { + mSoundPlayer.PlayOneShot(tClip, pVolumeScale); + } } public void PlaySound(AudioClip pClip, float pVolumeScale = 1) @@ -114,7 +123,10 @@ public class AudioManager : D_MonoSingleton if (tClip == null) return; - mSoundPlayer.PlayOneShot(tClip, pVolumeScale); + if (mSoundPlayer.enabled) + { + mSoundPlayer.PlayOneShot(tClip, pVolumeScale); + } } public void PlaySound3D(AudioSource pAudioSrc, AudioType pType) @@ -123,7 +135,10 @@ public class AudioManager : D_MonoSingleton if (tClip == null) return; - pAudioSrc.PlayOneShot(tClip); + if (pAudioSrc.enabled) + { + pAudioSrc.PlayOneShot(tClip); + } } public AudioSource PlaySoundLoop(AudioType pType, float pVolumeScale = 1) diff --git a/Assets/Scripts/Core/UIManager/UIManager.cs b/Assets/Scripts/Core/UIManager/UIManager.cs index 0c54e974..5c60688c 100644 --- a/Assets/Scripts/Core/UIManager/UIManager.cs +++ b/Assets/Scripts/Core/UIManager/UIManager.cs @@ -67,22 +67,7 @@ public class UIManager : S_MonoSingleton public T CloseUI() where T : BasePanel { T tUI = GetUI(); - tUI.gameObject.SetActive(false); - tUI.OnClose(); - - int tIndex = mUIList.IndexOf(tUI); - if (tIndex == mUIList.Count - 1) - { - mUIList.Remove(tUI); - if (mUIList.Count > 0) - { - mUIList[mUIList.Count - 1].OnFocus(true); - } - } - else - { - mUIList.Remove(tUI); - } + CloseUI(tUI); return tUI; } @@ -90,6 +75,7 @@ public class UIManager : S_MonoSingleton public void CloseUI(BasePanel pBasePanel) { pBasePanel.gameObject.SetActive(false); + pBasePanel.OnClose(); int tIndex = mUIList.IndexOf(pBasePanel); if (tIndex == mUIList.Count - 1) diff --git a/Assets/Scripts/Game/GameLogic.cs b/Assets/Scripts/Game/GameLogic.cs index ef90ec6b..20d28eb8 100644 --- a/Assets/Scripts/Game/GameLogic.cs +++ b/Assets/Scripts/Game/GameLogic.cs @@ -69,11 +69,17 @@ public class GameLogic : MonoBehaviour if (tEdData.IsGoodEnding) { PlayerData.Instance.UnlockNewLevel(); + AudioManager.Instance.PlaySound(AudioType.Win); + } + else + { + AudioManager.Instance.PlaySound(AudioType.Lose); } tUIResult.Init(PlayerData.Instance.CurrentLevelID, tEdData.EndingName, tEdData.IsGoodEnding, tHasNew, PlayerData.Instance.IsNextLevelPassed()); } else { + AudioManager.Instance.PlaySound(AudioType.Lose); tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, false, PlayerData.Instance.IsNextLevelPassed()); } diff --git a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs index 5c57ce39..b9475d7f 100644 --- a/Assets/Scripts/UI/CustomControl/ButtonEndings.cs +++ b/Assets/Scripts/UI/CustomControl/ButtonEndings.cs @@ -25,7 +25,7 @@ public class ButtonEndings : MonoBehaviour private void Awake() { Button tBtn = GetComponent