bgm 적용

Assets/ResWork/Sound/b002_MiniGame.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97c8afe5f59692641abee4bef437cfd4
+guid: 91f78e0e508d80b4bbc02cf71c03b081
 AudioImporter:
   externalObjects: {}
   serializedVersion: 8
@@ -11,7 +11,7 @@ AudioImporter:
     compressionFormat: 1
     quality: 0.01
     conversionMode: 0
-    preloadAudioData: 1
+    preloadAudioData: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1

Assets/ResWork/Sound/b003_MiniGame.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e682e098a0a157d4ebcb22c3866ba6f7
+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: 

Assets/ResWork/Sound/b004_MiniGame.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d0aa6e330da77f2448cefe11552d975d
+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: 

Assets/ResWork/Sound/b005_Gacha.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 57be5e76d2009144ebbab33847528018
+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: 

Assets/ResWork/Sound/b006_Album.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ecf1162c59cfdf4458815bce9ea7e364
+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: 

Assets/ResWork/Sound/b007_LuckyGame.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: cd75e3c503563014988e7bac86abdd11
+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: 

Assets/ResWork/Sound/s002_UIClose.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: dcc9169a3dc11454799276674a8fd96b
+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: 

Assets/Scenes/SampleScene.unity

@@ -2010,7 +2010,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &57057792
@@ -12771,9 +12771,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   arr_clip:
   - {fileID: 8300000, guid: 566a779851d20d948a663e4cb01b8e7b, type: 3}
-  - {fileID: 8300000, guid: 97c8afe5f59692641abee4bef437cfd4, type: 3}
+  - {fileID: 8300000, guid: dcc9169a3dc11454799276674a8fd96b, type: 3}
   arr_bgm:
   - {fileID: 8300000, guid: f6114cbd9684c734a86622e924246b10, 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}
 --- !u!114 &500962030
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16843,7 +16849,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &739554961
@@ -24227,7 +24233,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1037328794
@@ -25565,7 +25571,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1112515673
@@ -26032,7 +26038,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1123846438
@@ -37878,7 +37884,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -241.96, y: -45}
+  m_AnchoredPosition: {x: -241.96002, y: -45}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1626309762
@@ -49350,7 +49356,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -52.05}
+  m_AnchoredPosition: {x: 0, y: -52.050003}
   m_SizeDelta: {x: 250, y: 69.59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2091270812

Assets/Scripts/AttachToGameObject/SoundInfo.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public enum eSound { s001_ButtonClick, s002_Bubble,
+public enum eSound { s001_ButtonClick, s002_UIClose,
                      Max
                    }
-public enum eBGM { b001_BGM, Max }
+public enum eBGM { b001_BGM, b002_MiniGame, b003_MiniGame, b004_MiniGame, b005_Gacha, b006_Album, b007_LuckyGame, Max }
 
 public class SoundInfo : MonoBehaviourSingletonTemplate<SoundInfo>
 {
@@ -90,7 +90,7 @@ public class SoundInfo : MonoBehaviourSingletonTemplate<SoundInfo>
     //}
     public void Play_BGM(eBGM _bgm)
     {
-        if (SaveMgr.Ins.Get_Option(eOption.Bgm) && CurBGM != _bgm)
+        if (CurBGM != _bgm)
         {
             CurBGM = _bgm;
             if (BGM_AudioSource == null)
@@ -103,7 +103,10 @@ public class SoundInfo : MonoBehaviourSingletonTemplate<SoundInfo>
             BGM_AudioSource.clip = dic_bgmclip[_bgm];
             BGM_AudioSource.loop = true;
             BGM_AudioSource.volume = 1f;// OptionInfo.Ins.slider_BGM.value;
-            BGM_AudioSource.Play();
+            if (SaveMgr.Ins.Get_Option(eOption.Bgm))
+                RePlay_BGM();
+            else
+                Stop_BGM();
         }
     }
 

Assets/Scripts/Game/Game_Lucky.cs

@@ -51,6 +51,7 @@ public class Game_Lucky : MonoBehaviour
     public void Set()
     {
         gameObject.SetActive(true);
+        SoundInfo.Ins.Play_BGM(eBGM.b007_LuckyGame);
         m_Game_Lucky_Result.gameObject.SetActive(false);
         ADInfo.Ins.Set_Banner(false);
 

Assets/Scripts/Game/Game_Lucky_Result.cs

@@ -17,5 +17,6 @@ public class Game_Lucky_Result : MonoBehaviour
         gameObject.SetActive(false);
         LobbyUI.Ins.m_Game_Lucky.ReleaseImage();
         ADInfo.Ins.Set_Banner(true);
+        LobbyUI.Ins.Go_Home();
     }
 }

Assets/Scripts/Game/Game_Mini.cs

@@ -112,6 +112,7 @@ public class Game_Mini : MonoBehaviour
     public void Set()
     {
         gameObject.SetActive(true);
+        SoundInfo.Ins.Play_BGM((eBGM)Random.Range(1, 4));
 
         Init();
 
@@ -350,5 +351,7 @@ public class Game_Mini : MonoBehaviour
         AddrResourceMgr.Ins.Relese(m_Handle1);
         AddrResourceMgr.Ins.Relese(m_Handle2);
         AddrResourceMgr.Ins.Relese(m_HandleSD);
+
+        LobbyUI.Ins.Go_Home();
     }
 }

Assets/Scripts/Game/MiniGameObtacle.cs

@@ -176,8 +176,8 @@ public class MiniGameObtacle : MonoBehaviour
         if (showeffect)
         {
             LobbyUI.Ins.m_Game_Mini.Show_HitEffect(m_RectTransform.position);
-            if (playsound)
+            //if (playsound)
-                SoundInfo.Ins.Play_OneShot(eSound.s002_Bubble, 1f);
+            //    SoundInfo.Ins.Play_OneShot(eSound.s002_Bubble, 1f);
         }
     }
 

Assets/Scripts/UI/AlbumUI.cs

@@ -9,6 +9,8 @@ public class AlbumUI : uScrollViewMgr
     public void Set()
     {
         gameObject.SetActive(true);
+        SoundInfo.Ins.Play_BGM(eBGM.b006_Album);
+
         var lst = table_album.Ins.Get_DataList(curGirl);
         Set_ScrollView(lst);
         texts[0].text = table_girl.Ins.Get_Data(curGirl).s_Name;

Assets/Scripts/UI/GachaUI.cs

@@ -17,6 +17,7 @@ public class GachaUI : uScrollViewMgr
     public void Set()
     {
         gameObject.SetActive(true);
+        SoundInfo.Ins.Play_BGM(eBGM.b005_Gacha);
         DSUtil.InActivateGameObjects(gos_grade);
         Set_UI(false);
     }

Assets/Scripts/UI/LobbyUI.cs

@@ -86,8 +86,9 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
                 break;
         }
     }
-    void Go_Home()
+    public void Go_Home()
     {
+        SoundInfo.Ins.Play_BGM(eBGM.b001_BGM);
         m_AlbumUI.gameObject.SetActive(false);
         m_GachaUI.gameObject.SetActive(false);
         go_shop.SetActive(false);