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 00000000..ecfc8596 Binary files /dev/null and b/Assets/Resources/Audio/LogoSound/010_2.mp3 differ diff --git a/Assets/Resources/Audio/LogoSound/010_2.mp3.meta b/Assets/Resources/Audio/LogoSound/010_2.mp3.meta new file mode 100644 index 00000000..1c5e68c4 --- /dev/null +++ b/Assets/Resources/Audio/LogoSound/010_2.mp3.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 31cea82df675641a1acb62fea506dd5b +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/LogoSound/020_1.mp3 b/Assets/Resources/Audio/LogoSound/020_1.mp3 new file mode 100644 index 00000000..0baa3749 Binary files /dev/null and b/Assets/Resources/Audio/LogoSound/020_1.mp3 differ diff --git a/Assets/Resources/Audio/LogoSound/020_1.mp3.meta b/Assets/Resources/Audio/LogoSound/020_1.mp3.meta new file mode 100644 index 00000000..5f9e50be --- /dev/null +++ b/Assets/Resources/Audio/LogoSound/020_1.mp3.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 2fe24cf0c6467410abbe6a0400b26c78 +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/26_SE_CHIN.mp3 b/Assets/Resources/Audio/LogoSound/26_SE_CHIN.mp3 similarity index 100% rename from Assets/Resources/Audio/UISound/26_SE_CHIN.mp3 rename to Assets/Resources/Audio/LogoSound/26_SE_CHIN.mp3 diff --git a/Assets/Resources/Audio/UISound/26_SE_CHIN.mp3.meta b/Assets/Resources/Audio/LogoSound/26_SE_CHIN.mp3.meta similarity index 100% rename from Assets/Resources/Audio/UISound/26_SE_CHIN.mp3.meta rename to Assets/Resources/Audio/LogoSound/26_SE_CHIN.mp3.meta diff --git a/Assets/Resources/Audio/UISound/68_SE_PULU.mp3 b/Assets/Resources/Audio/LogoSound/68_SE_PULU.mp3 similarity index 100% rename from Assets/Resources/Audio/UISound/68_SE_PULU.mp3 rename to Assets/Resources/Audio/LogoSound/68_SE_PULU.mp3 diff --git a/Assets/Resources/Audio/UISound/68_SE_PULU.mp3.meta b/Assets/Resources/Audio/LogoSound/68_SE_PULU.mp3.meta similarity index 100% rename from Assets/Resources/Audio/UISound/68_SE_PULU.mp3.meta rename to Assets/Resources/Audio/LogoSound/68_SE_PULU.mp3.meta diff --git a/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3 b/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3 new file mode 100644 index 00000000..bd7889c5 Binary files /dev/null and b/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3 differ diff --git a/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3.meta b/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3.meta new file mode 100644 index 00000000..981a03e9 --- /dev/null +++ b/Assets/Resources/Audio/UISound/104_SE_XYLO3.mp3.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 502c80f0b8bc144c5bcd00f7a5b996b5 +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/105_SE_XYLO2.mp3 b/Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3 new file mode 100644 index 00000000..e00aee65 Binary files /dev/null and b/Assets/Resources/Audio/UISound/105_SE_XYLO2.mp3 differ 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 00000000..600cdf89 Binary files /dev/null and b/Assets/Resources/Audio/UISound/106_SE_XYLO1.mp3 differ 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