diff --git a/Assets/ResWork/Sound/s015_LuckyCup.wav b/Assets/ResWork/Sound/s015_LuckyCup.wav new file mode 100644 index 0000000..5c7a642 Binary files /dev/null and b/Assets/ResWork/Sound/s015_LuckyCup.wav differ diff --git a/Assets/ResWork/Sound/s015_LuckyCup.wav.meta b/Assets/ResWork/Sound/s015_LuckyCup.wav.meta new file mode 100644 index 0000000..630c8f3 --- /dev/null +++ b/Assets/ResWork/Sound/s015_LuckyCup.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7bf1fe9a095546149aa06daff6e469f2 +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/s016_LuckyCup.wav b/Assets/ResWork/Sound/s016_LuckyCup.wav new file mode 100644 index 0000000..2328d48 Binary files /dev/null and b/Assets/ResWork/Sound/s016_LuckyCup.wav differ diff --git a/Assets/ResWork/Sound/s016_LuckyCup.wav.meta b/Assets/ResWork/Sound/s016_LuckyCup.wav.meta new file mode 100644 index 0000000..453a711 --- /dev/null +++ b/Assets/ResWork/Sound/s016_LuckyCup.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 65cc2a048a917f340949eb64950cb31b +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/s017_LuckyGetItem.wav b/Assets/ResWork/Sound/s017_LuckyGetItem.wav new file mode 100644 index 0000000..8fb5aae Binary files /dev/null and b/Assets/ResWork/Sound/s017_LuckyGetItem.wav differ diff --git a/Assets/ResWork/Sound/s017_LuckyGetItem.wav.meta b/Assets/ResWork/Sound/s017_LuckyGetItem.wav.meta new file mode 100644 index 0000000..1dfbd1e --- /dev/null +++ b/Assets/ResWork/Sound/s017_LuckyGetItem.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 32340c42066b68f459c52633fedfd5e8 +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/s018_LuckyGetItem.wav b/Assets/ResWork/Sound/s018_LuckyGetItem.wav new file mode 100644 index 0000000..88d6686 Binary files /dev/null and b/Assets/ResWork/Sound/s018_LuckyGetItem.wav differ diff --git a/Assets/ResWork/Sound/s018_LuckyGetItem.wav.meta b/Assets/ResWork/Sound/s018_LuckyGetItem.wav.meta new file mode 100644 index 0000000..fc74538 --- /dev/null +++ b/Assets/ResWork/Sound/s018_LuckyGetItem.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2409b50e7cbcbb84182692ff9264311c +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/s019_LuckyGetItem.wav b/Assets/ResWork/Sound/s019_LuckyGetItem.wav new file mode 100644 index 0000000..457413a Binary files /dev/null and b/Assets/ResWork/Sound/s019_LuckyGetItem.wav differ diff --git a/Assets/ResWork/Sound/s019_LuckyGetItem.wav.meta b/Assets/ResWork/Sound/s019_LuckyGetItem.wav.meta new file mode 100644 index 0000000..dab8327 --- /dev/null +++ b/Assets/ResWork/Sound/s019_LuckyGetItem.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 38ca2ccc81cb7054fbd0bf58895252e7 +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/Scripts/AttachToGameObject/SoundInfo.cs b/Assets/Scripts/AttachToGameObject/SoundInfo.cs index 0f1e084..c5cc1fb 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, + s012_Title, s013_GachaOpen, s014_GachaOpen, s015_LuckyCup, s016_LuckyCup, s017_LuckyGetItem, s018_LuckyGetItem, s019_LuckyGetItem, Max } public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max } diff --git a/Assets/Scripts/Game/Game_Lucky.cs b/Assets/Scripts/Game/Game_Lucky.cs index aee6c71..66e3766 100644 --- a/Assets/Scripts/Game/Game_Lucky.cs +++ b/Assets/Scripts/Game/Game_Lucky.cs @@ -193,6 +193,8 @@ public class Game_Lucky : MonoBehaviour isRotating = true; list_dropobj.ForEach(f => f.GetComponent().Tilt_Cup()); + + SoundInfo.Ins.Play_OneShot((eSound)Random.Range(14, 16)); } private void Update() diff --git a/Assets/Scripts/Game/LuckyGameObj.cs b/Assets/Scripts/Game/LuckyGameObj.cs index 661f978..f2b1495 100644 --- a/Assets/Scripts/Game/LuckyGameObj.cs +++ b/Assets/Scripts/Game/LuckyGameObj.cs @@ -68,6 +68,7 @@ public class LuckyGameObj : MonoBehaviour void Set_Collision(int amount) { + SoundInfo.Ins.Play_OneShot((eSound)Random.Range(16, 19)); LobbyUI.Ins.m_Game_Lucky.Add_Amount(amount); m_image.enabled = false; go_effect.SetActive(true);