diff --git a/Assets/ResWork/Sound/게임 로비.wav b/Assets/ResWork/Sound/게임 로비.wav new file mode 100644 index 0000000..b5b721a Binary files /dev/null and b/Assets/ResWork/Sound/게임 로비.wav differ diff --git a/Assets/ResWork/Sound/게임 로비.wav.meta b/Assets/ResWork/Sound/게임 로비.wav.meta new file mode 100644 index 0000000..0385722 --- /dev/null +++ b/Assets/ResWork/Sound/게임 로비.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 204b5c2111c37664197c0e12db7ddea3 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/앨범.wav b/Assets/ResWork/Sound/앨범.wav new file mode 100644 index 0000000..49d2891 Binary files /dev/null and b/Assets/ResWork/Sound/앨범.wav differ diff --git a/Assets/ResWork/Sound/앨범.wav.meta b/Assets/ResWork/Sound/앨범.wav.meta new file mode 100644 index 0000000..cde7d77 --- /dev/null +++ b/Assets/ResWork/Sound/앨범.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8e28dfb2369b6874f8fe9535d49f0d47 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/인게임 BGM.wav b/Assets/ResWork/Sound/인게임 BGM.wav new file mode 100644 index 0000000..ee97808 Binary files /dev/null and b/Assets/ResWork/Sound/인게임 BGM.wav differ diff --git a/Assets/ResWork/Sound/인게임 BGM.wav.meta b/Assets/ResWork/Sound/인게임 BGM.wav.meta new file mode 100644 index 0000000..38e2d80 --- /dev/null +++ b/Assets/ResWork/Sound/인게임 BGM.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 059f4c07102684640942fcf2b7f4816c +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/타이틀.wav b/Assets/ResWork/Sound/타이틀.wav new file mode 100644 index 0000000..ce2ed6c Binary files /dev/null and b/Assets/ResWork/Sound/타이틀.wav differ diff --git a/Assets/ResWork/Sound/타이틀.wav.meta b/Assets/ResWork/Sound/타이틀.wav.meta new file mode 100644 index 0000000..ece7c9d --- /dev/null +++ b/Assets/ResWork/Sound/타이틀.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1401bffe8915f674ea9c54be5dc84841 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Sound/피버 모드 BGM.wav b/Assets/ResWork/Sound/피버 모드 BGM.wav new file mode 100644 index 0000000..e4f3f47 Binary files /dev/null and b/Assets/ResWork/Sound/피버 모드 BGM.wav differ diff --git a/Assets/ResWork/Sound/피버 모드 BGM.wav.meta b/Assets/ResWork/Sound/피버 모드 BGM.wav.meta new file mode 100644 index 0000000..abf129b --- /dev/null +++ b/Assets/ResWork/Sound/피버 모드 BGM.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1668f0bdf472fcf46a817e1ea879d992 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 4d7d363..4ab9fb0 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -215,7 +215,7 @@ public class HorseRushPanel : AddrHandleBase if (canDefaultComboCondition && canFeverIncreaseCondition) { //Debug.Log("###### F E V E R ######"); - SoundInfo.Ins.Play_BGM(eBGM.b003_Fever); + SoundInfo.Ins.Play_BGM(eBGM.Fever); // _bottomFillImage.color = new Color(1, 0.84f, 0.33f, 1); FadeFeverBg(true); @@ -225,7 +225,7 @@ public class HorseRushPanel : AddrHandleBase if (beforeFever && !IsFever) { - SoundInfo.Ins.Play_BGM(eBGM.b002_MiniGame); + SoundInfo.Ins.Play_BGM(eBGM.Ingame); // _bottomFillImage.color = new Color(0.86f, 0, 0, 1); FadeFeverBg(false); @@ -274,6 +274,7 @@ public class HorseRushPanel : AddrHandleBase public void GameStart(bool isFree) { gameObject.SetActive(true); + SoundInfo.Ins.Play_BGM(eBGM.Ingame); //if (GameManager.Instance.IsPackageCPurchased()) //{ @@ -658,5 +659,6 @@ public class HorseRushPanel : AddrHandleBase { gameObject.SetActive(false); DSUtil.InActivateGameObjects(gos_sexy); + LobbyUI.Ins.Go_Home(); } -} +} \ No newline at end of file diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d7e916f..713fbf2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -21900,14 +21900,11 @@ MonoBehaviour: - {fileID: 8300000, guid: e0eb2da7439fc034ca5c8191f20d6dba, type: 3} - {fileID: 8300000, guid: 259a0b95d0f01dc429937c074f67213b, type: 3} arr_bgm: - - {fileID: 8300000, guid: f84b956bd038a0a469e34451d8edf1d4, type: 3} - - {fileID: 8300000, guid: 91f78e0e508d80b4bbc02cf71c03b081, type: 3} - - {fileID: 8300000, guid: e682e098a0a157d4ebcb22c3866ba6f7, type: 3} - - {fileID: 8300000, guid: d0aa6e330da77f2448cefe11552d975d, type: 3} - - {fileID: 8300000, guid: 57be5e76d2009144ebbab33847528018, type: 3} - - {fileID: 8300000, guid: ecf1162c59cfdf4458815bce9ea7e364, type: 3} - - {fileID: 8300000, guid: cd75e3c503563014988e7bac86abdd11, type: 3} - - {fileID: 8300000, guid: 8ec33f981f6e4b14384e10d848ce9f32, type: 3} + - {fileID: 8300000, guid: 1401bffe8915f674ea9c54be5dc84841, type: 3} + - {fileID: 8300000, guid: 204b5c2111c37664197c0e12db7ddea3, type: 3} + - {fileID: 8300000, guid: 8e28dfb2369b6874f8fe9535d49f0d47, type: 3} + - {fileID: 8300000, guid: 059f4c07102684640942fcf2b7f4816c, type: 3} + - {fileID: 8300000, guid: 1668f0bdf472fcf46a817e1ea879d992, type: 3} --- !u!114 &500962030 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 7d80ac3..8ae73cf 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -22,7 +22,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate } Load(); yield return null; - SoundInfo.Ins.Play_BGM(eBGM.b008_Title); + SoundInfo.Ins.Play_BGM(eBGM.Title); 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 b462758..45e814b 100644 --- a/Assets/Scripts/AttachToGameObject/SoundInfo.cs +++ b/Assets/Scripts/AttachToGameObject/SoundInfo.cs @@ -13,7 +13,7 @@ public enum eSound { } public enum eBGM { - b001_BGM, b002_MiniGame, b003_Fever, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, b008_Title, + Title, Lobby, Album, Ingame, Fever, Max } diff --git a/Assets/Scripts/Game/Game_Lucky.cs b/Assets/Scripts/Game/Game_Lucky.cs index 46b871c..8444b0d 100644 --- a/Assets/Scripts/Game/Game_Lucky.cs +++ b/Assets/Scripts/Game/Game_Lucky.cs @@ -78,7 +78,7 @@ public class Game_Lucky : MonoBehaviour public void Set() { gameObject.SetActive(true); - SoundInfo.Ins.Play_BGM(eBGM.b007_LuckyGame); + //SoundInfo.Ins.Play_BGM(eBGM.b007_LuckyGame); m_LuckyGameCupCounter.Set(count => { texts[2].text = count.ToString(); }); m_Game_Lucky_Result.gameObject.SetActive(false); ADInfo.Ins.Set_Banner(false); diff --git a/Assets/Scripts/Title/TitleInfo.cs b/Assets/Scripts/Title/TitleInfo.cs index d48329e..3d4d8de 100644 --- a/Assets/Scripts/Title/TitleInfo.cs +++ b/Assets/Scripts/Title/TitleInfo.cs @@ -75,8 +75,6 @@ public class TitleInfo : MonoBehaviour gameObject.SetActive(false); go_LobbyUI.SetActive(true); - - SoundInfo.Ins.Play_BGM(eBGM.b001_BGM); } IEnumerator LoadVersionData(Action success, Action fail) diff --git a/Assets/Scripts/UI/AlbumUI.cs b/Assets/Scripts/UI/AlbumUI.cs index eb69692..01bdb02 100644 --- a/Assets/Scripts/UI/AlbumUI.cs +++ b/Assets/Scripts/UI/AlbumUI.cs @@ -22,7 +22,7 @@ public class AlbumUI : uScrollViewMgr public void Set(int girlid = 0) { gameObject.SetActive(true); - SoundInfo.Ins.Play_BGM(eBGM.b006_Album); + SoundInfo.Ins.Play_BGM(eBGM.Album); DSUtil.InActivateGameObjects(gos_onoff); if (girlid > 0) curGirl = girlid; diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 79ef0a1..40c0a29 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -60,7 +60,7 @@ public class GachaUI : uScrollViewMgr public void Set() { gameObject.SetActive(true); - SoundInfo.Ins.Play_BGM(eBGM.b005_Gacha); + //SoundInfo.Ins.Play_BGM(eBGM.b005_Gacha); DSUtil.InActivateGameObjects(gos_grade); for (int i = 0; i < texts_luckypoint.Length; i++) { @@ -201,13 +201,14 @@ public class GachaUI : uScrollViewMgr if (!isGacha && SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"), true, ToastY)) { CanSkip = isGacha = true; + isRewardGiven = false; Init_GachaAnim(); PlayVideo(); } } public GameObject[] gos_effect; - bool isGacha = false, CanSkip; + bool isGacha = false, CanSkip, isRewardGiven; void Init_GachaAnim() { @@ -251,6 +252,9 @@ public class GachaUI : uScrollViewMgr } IEnumerator GachaReward2() { + if (isRewardGiven) yield break; + isRewardGiven = true; + SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount")); var gradedata = table_gacharateconfig.Ins.Get_RadomData(); var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); @@ -311,7 +315,7 @@ public class GachaUI : uScrollViewMgr DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 2); break; } - isGacha = false; + CanSkip = isGacha = false; if (gradedata.n_GachaGrade == 9) { // 가챠 9등급 스페셜 앨범 지급 @@ -326,7 +330,7 @@ public class GachaUI : uScrollViewMgr public void OnClick_Skip() { - if (!CanSkip) return; + if (!CanSkip || isRewardGiven) return; CanSkip = false; StopAllCoroutines(); @@ -385,6 +389,7 @@ public class GachaUI : uScrollViewMgr { DSUtil.InActivateGameObjects(gos_off_isPlaying); videoPlayer.Play(); + videoPlayer.SetDirectAudioMute(0, !SaveMgr.Ins.Get_Option(eOption.Sound)); StartCoroutine(GachaReward()); } } diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index fcf17f3..5b5ef78 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -194,7 +194,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate public void Go_Home() { - SoundInfo.Ins.Play_BGM(eBGM.b001_BGM); + SoundInfo.Ins.Play_BGM(eBGM.Lobby); m_AlbumUI.gameObject.SetActive(false); m_GachaUI.gameObject.SetActive(false); go_shop.SetActive(false); diff --git a/Assets/Scripts/UI/MiniGameAlbumSelect.cs b/Assets/Scripts/UI/MiniGameAlbumSelect.cs index 7c5e0c7..748c8c8 100644 --- a/Assets/Scripts/UI/MiniGameAlbumSelect.cs +++ b/Assets/Scripts/UI/MiniGameAlbumSelect.cs @@ -60,6 +60,7 @@ public class MiniGameAlbumSelect : uScrollViewMgr SaveMgr.Ins.m_SelectMiniGameGirl = m_SelectCard.Get_IntData(); SaveMgr.Ins.m_SelectMiniGameTab = CurTab; LobbyUI.Ins.m_MiniGame.GameStart(false); + gameObject.SetActive(false); } } } \ No newline at end of file