diff --git a/Assets/ResWork/ShowAlbum/ShowAlbum.cs b/Assets/ResWork/ShowAlbum/ShowAlbum.cs index 0d02ffb..6b2a9df 100644 --- a/Assets/ResWork/ShowAlbum/ShowAlbum.cs +++ b/Assets/ResWork/ShowAlbum/ShowAlbum.cs @@ -12,6 +12,7 @@ public class ShowAlbum : MonoBehaviourSingletonTemplate public void Show(T data, bool preview) { + SoundInfo.Ins.Play_OneShot(eSound.s004_OpenAlbum); m_MainUICanvas.SetActive(false); m_ShowPanel.Set(data, preview, () => { m_MainUICanvas.SetActive(true); }); } diff --git a/Assets/ResWork/Sound/s003_SelectAlbum.wav b/Assets/ResWork/Sound/s003_SelectAlbum.wav new file mode 100644 index 0000000..daa1050 Binary files /dev/null and b/Assets/ResWork/Sound/s003_SelectAlbum.wav differ diff --git a/Assets/ResWork/Sound/s003_SelectAlbum.wav.meta b/Assets/ResWork/Sound/s003_SelectAlbum.wav.meta new file mode 100644 index 0000000..c9be46a --- /dev/null +++ b/Assets/ResWork/Sound/s003_SelectAlbum.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 884b6d6b640fc814d99eb276cf01bcbe +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s004_OpenAlbum.wav b/Assets/ResWork/Sound/s004_OpenAlbum.wav new file mode 100644 index 0000000..e5e2cf0 Binary files /dev/null and b/Assets/ResWork/Sound/s004_OpenAlbum.wav differ diff --git a/Assets/ResWork/Sound/s004_OpenAlbum.wav.meta b/Assets/ResWork/Sound/s004_OpenAlbum.wav.meta new file mode 100644 index 0000000..3453f95 --- /dev/null +++ b/Assets/ResWork/Sound/s004_OpenAlbum.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bedea2294c63f3940865062d9bfe8e03 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s005_MiniGameResult.wav b/Assets/ResWork/Sound/s005_MiniGameResult.wav new file mode 100644 index 0000000..074a23a Binary files /dev/null and b/Assets/ResWork/Sound/s005_MiniGameResult.wav differ diff --git a/Assets/ResWork/Sound/s005_MiniGameResult.wav.meta b/Assets/ResWork/Sound/s005_MiniGameResult.wav.meta new file mode 100644 index 0000000..044b1a6 --- /dev/null +++ b/Assets/ResWork/Sound/s005_MiniGameResult.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 826ee32545638574883bf804a35e0aaf +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav b/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav new file mode 100644 index 0000000..b33c47d Binary files /dev/null and b/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav differ diff --git a/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav.meta b/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav.meta new file mode 100644 index 0000000..678ef97 --- /dev/null +++ b/Assets/ResWork/Sound/s006_MiniGameGetHeart.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7f5ed85bc3ec6854ab0d0eb17772d003 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav b/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav new file mode 100644 index 0000000..907d4ef Binary files /dev/null and b/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav differ diff --git a/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav.meta b/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav.meta new file mode 100644 index 0000000..1c5795a --- /dev/null +++ b/Assets/ResWork/Sound/s007_MiniGameGetChatCoint.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 821b02d0f4a9c6243b4eed732e9b07b8 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav b/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav new file mode 100644 index 0000000..e7d9754 Binary files /dev/null and b/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav differ diff --git a/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav.meta b/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav.meta new file mode 100644 index 0000000..3e458fe --- /dev/null +++ b/Assets/ResWork/Sound/s008_MiniGameGetGachaCoin.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 13a07f8a9fe660842a3869bc9579d461 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav b/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav new file mode 100644 index 0000000..3f0f929 Binary files /dev/null and b/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav differ diff --git a/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav.meta b/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav.meta new file mode 100644 index 0000000..d70959b --- /dev/null +++ b/Assets/ResWork/Sound/s009_MiniGameUseBomb.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 30b2660e336ef83439732cf4375e7e8f +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav b/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav new file mode 100644 index 0000000..4461b88 Binary files /dev/null and b/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav differ diff --git a/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav.meta b/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav.meta new file mode 100644 index 0000000..3fa2087 --- /dev/null +++ b/Assets/ResWork/Sound/s010_MiniGameUseUmbrella.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a01e2bcfdb25b35419dbd9e1195317e7 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav b/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav new file mode 100644 index 0000000..2a816b6 Binary files /dev/null and b/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav differ diff --git a/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav.meta b/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav.meta new file mode 100644 index 0000000..8a5f65a --- /dev/null +++ b/Assets/ResWork/Sound/s011_MiniGameUseDildo.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8eb7825b9b7d12441a493aeb67e20670 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.01 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 385eea2..586dc77 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -12783,6 +12783,15 @@ MonoBehaviour: arr_clip: - {fileID: 8300000, guid: 566a779851d20d948a663e4cb01b8e7b, type: 3} - {fileID: 8300000, guid: dcc9169a3dc11454799276674a8fd96b, type: 3} + - {fileID: 8300000, guid: 884b6d6b640fc814d99eb276cf01bcbe, type: 3} + - {fileID: 8300000, guid: bedea2294c63f3940865062d9bfe8e03, type: 3} + - {fileID: 8300000, guid: 826ee32545638574883bf804a35e0aaf, type: 3} + - {fileID: 8300000, guid: 7f5ed85bc3ec6854ab0d0eb17772d003, type: 3} + - {fileID: 8300000, guid: 821b02d0f4a9c6243b4eed732e9b07b8, type: 3} + - {fileID: 8300000, guid: 13a07f8a9fe660842a3869bc9579d461, type: 3} + - {fileID: 8300000, guid: 30b2660e336ef83439732cf4375e7e8f, type: 3} + - {fileID: 8300000, guid: a01e2bcfdb25b35419dbd9e1195317e7, type: 3} + - {fileID: 8300000, guid: 8eb7825b9b7d12441a493aeb67e20670, type: 3} arr_bgm: - {fileID: 8300000, guid: f6114cbd9684c734a86622e924246b10, type: 3} - {fileID: 8300000, guid: 91f78e0e508d80b4bbc02cf71c03b081, type: 3} diff --git a/Assets/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index e162d5e..b50d4d8 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -1,9 +1,13 @@ using System.Collections.Generic; using UnityEngine; -public enum eSound { s001_ButtonClick, s002_UIClose, - Max - } +public enum eSound { + s001_ButtonClick, s002_UIClose, s003_SelectAlbum, s004_OpenAlbum, + s005_MiniGameResult, s006_MiniGameGetHeart, s007_MiniGameGetChatCoint, s008_MiniGameGetGachaCoin, s009_MiniGameUseBomb, + s010_MiniGameUseUmbrella, s011_MiniGameUseDildo, + + Max +} public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max } public class SoundInfo : MonoBehaviourSingletonTemplate @@ -44,7 +48,7 @@ public class SoundInfo : MonoBehaviourSingletonTemplate return vol; } - public void Play_OneShot(eSound _sound, float vol = 0.5f) + public void Play_OneShot(eSound _sound, float vol = 1f) { if (SaveMgr.Ins.Get_Option(eOption.Sound)) Play_OneShot(dic_clip[_sound], vol); diff --git a/Assets/Scripts/Game/Game_Mini.cs b/Assets/Scripts/Game/Game_Mini.cs index d31a02d..296a236 100644 --- a/Assets/Scripts/Game/Game_Mini.cs +++ b/Assets/Scripts/Game/Game_Mini.cs @@ -291,12 +291,15 @@ public class Game_Mini : MonoBehaviour { // 아이템 적용 case eMiniGameObtacleType.ItemBomb: list_MiniGameObtacle.ForEach(f => f.Off_OnlyObtacle()); + SoundInfo.Ins.Play_OneShot(eSound.s009_MiniGameUseBomb); break; case eMiniGameObtacleType.ItemUmbrella: StartCoroutine(Co_Shiled()); + SoundInfo.Ins.Play_OneShot(eSound.s010_MiniGameUseUmbrella); break; case eMiniGameObtacleType.ItemDildo: list_MiniGameObtacle.ForEach(f => f.Change_Item(dic_weight)); + SoundInfo.Ins.Play_OneShot(eSound.s011_MiniGameUseDildo); break; } } @@ -306,10 +309,22 @@ public class Game_Mini : MonoBehaviour dic_Money.Add(type, 0); dic_Money[type] += val; - if (type == eMiniGameObtacleType.ItemBomb || type == eMiniGameObtacleType.ItemUmbrella || - type == eMiniGameObtacleType.ItemDildo) + switch (type) { + case eMiniGameObtacleType.AlbumOpen: + SoundInfo.Ins.Play_OneShot(eSound.s006_MiniGameGetHeart); + break; + case eMiniGameObtacleType.ChatCoin: + SoundInfo.Ins.Play_OneShot(eSound.s007_MiniGameGetChatCoint); + break; + case eMiniGameObtacleType.GachaCoin: + SoundInfo.Ins.Play_OneShot(eSound.s008_MiniGameGetGachaCoin); + break; + case eMiniGameObtacleType.ItemBomb: + case eMiniGameObtacleType.ItemUmbrella: + case eMiniGameObtacleType.ItemDildo: if (dic_Money[type] > 5) dic_Money[type] = 5; + break; } dic_Money[type].Obfuscate(); diff --git a/Assets/Scripts/Game/Game_Mini_Result.cs b/Assets/Scripts/Game/Game_Mini_Result.cs index 4a303fe..9fd998d 100644 --- a/Assets/Scripts/Game/Game_Mini_Result.cs +++ b/Assets/Scripts/Game/Game_Mini_Result.cs @@ -8,6 +8,7 @@ public class Game_Mini_Result : MonoBehaviour public void Set(float playtime) { gameObject.SetActive(true); + SoundInfo.Ins.Play_OneShot(eSound.s005_MiniGameResult); texts[0].text = DSUtil.Get_TimeText_MS(playtime); diff --git a/Assets/Scripts/UI/AlbumCard.cs b/Assets/Scripts/UI/AlbumCard.cs index 472dcb1..ee7308e 100644 --- a/Assets/Scripts/UI/AlbumCard.cs +++ b/Assets/Scripts/UI/AlbumCard.cs @@ -52,5 +52,6 @@ public class AlbumCard : CardBase public void OnClick_Show() { if (IsObtain()) ShowAlbum.Ins.Show(m_Data, false); + else SoundInfo.Ins.Play_OneShot(eSound.s003_SelectAlbum); } } \ No newline at end of file diff --git a/Assets/SheGotWet_Memo.txt b/Assets/SheGotWet_Memo.txt index b248b60..428360e 100644 --- a/Assets/SheGotWet_Memo.txt +++ b/Assets/SheGotWet_Memo.txt @@ -4,4 +4,5 @@ 상점은 이야기 후 다시 광고 제거권 - - 구매 후 UI 처리 \ No newline at end of file + - 구매 후 UI 처리 +파이어 베이스 \ No newline at end of file