diff --git a/Assets/ResWork/Sound/s012_Title.wav b/Assets/ResWork/Sound/s012_Title.wav new file mode 100644 index 0000000..f79f36a Binary files /dev/null and b/Assets/ResWork/Sound/s012_Title.wav differ diff --git a/Assets/ResWork/Sound/s012_Title.wav.meta b/Assets/ResWork/Sound/s012_Title.wav.meta new file mode 100644 index 0000000..cd3398a --- /dev/null +++ b/Assets/ResWork/Sound/s012_Title.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d8886705e44c1cc40b2f6ee13d3ab806 +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/s013_GachaOpen.wav b/Assets/ResWork/Sound/s013_GachaOpen.wav new file mode 100644 index 0000000..018b183 Binary files /dev/null and b/Assets/ResWork/Sound/s013_GachaOpen.wav differ diff --git a/Assets/ResWork/Sound/s013_GachaOpen.wav.meta b/Assets/ResWork/Sound/s013_GachaOpen.wav.meta new file mode 100644 index 0000000..b825569 --- /dev/null +++ b/Assets/ResWork/Sound/s013_GachaOpen.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2630ab513f86d24429e50c7b24a88cb2 +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/s014_GachaOpen.wav b/Assets/ResWork/Sound/s014_GachaOpen.wav new file mode 100644 index 0000000..3ed7c4d Binary files /dev/null and b/Assets/ResWork/Sound/s014_GachaOpen.wav differ diff --git a/Assets/ResWork/Sound/s014_GachaOpen.wav.meta b/Assets/ResWork/Sound/s014_GachaOpen.wav.meta new file mode 100644 index 0000000..17d6dde --- /dev/null +++ b/Assets/ResWork/Sound/s014_GachaOpen.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4aa31db6a4437114bb2b5f801cad743c +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 586dc77..cf8a806 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -12792,6 +12792,9 @@ MonoBehaviour: - {fileID: 8300000, guid: 30b2660e336ef83439732cf4375e7e8f, type: 3} - {fileID: 8300000, guid: a01e2bcfdb25b35419dbd9e1195317e7, type: 3} - {fileID: 8300000, guid: 8eb7825b9b7d12441a493aeb67e20670, type: 3} + - {fileID: 8300000, guid: d8886705e44c1cc40b2f6ee13d3ab806, type: 3} + - {fileID: 8300000, guid: 2630ab513f86d24429e50c7b24a88cb2, type: 3} + - {fileID: 8300000, guid: 4aa31db6a4437114bb2b5f801cad743c, type: 3} arr_bgm: - {fileID: 8300000, guid: f6114cbd9684c734a86622e924246b10, type: 3} - {fileID: 8300000, guid: 91f78e0e508d80b4bbc02cf71c03b081, type: 3} diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 46a474c..dfe8536 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -28,6 +28,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate Load(); yield return null; SoundInfo.Ins.Play_BGM(eBGM.b001_BGM); + SoundInfo.Ins.Play_OneShot(eSound.s012_Title); while (!LobbyUI.Ins) yield return null; LobbyUI.Ins.Set_Money(); } diff --git a/Assets/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index b50d4d8..0f1e084 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -5,7 +5,7 @@ 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, - + s012_Title, s013_GachaOpen, s014_GachaOpen, Max } public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max } diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 431ed58..ce4ad75 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -114,11 +114,24 @@ public class GachaUI : uScrollViewMgr { if (SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"))) { + SoundInfo.Ins.Play_OneShot((eSound)Random.Range(12, 14)); SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount")); var gradedata = table_gacharateconfig.Ins.Get_RadomData(); DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); SaveMgr.Ins.Add_Money(reward.Item1, reward.Item2); + switch (reward.Item1) + { + case eMoney.AlbumOpen: + SoundInfo.Ins.Play_OneShot(eSound.s006_MiniGameGetHeart); + break; + case eMoney.Chat: + SoundInfo.Ins.Play_OneShot(eSound.s007_MiniGameGetChatCoint); + break; + case eMoney.Gacha: + SoundInfo.Ins.Play_OneShot(eSound.s008_MiniGameGetGachaCoin); + break; + } SaveMgr.Ins.Add_Money(eMoney.Lucky, reward.Item3); SaveMgr.Ins.Save(); list_log.Add((reward.Item1, reward.Item2));