added background music to Project1

robertoguazon · Oct 24, 2016 · f64dccc · f64dccc
1 parent 4bd9ad9
commit f64dccc
Show file tree

Hide file tree

Showing 27 changed files with 78 additions and 12 deletions.
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/.vs/Project1_Borais-Francisco-Mabasa-Guazon/v14/.suo b/Project1_Borais-Francisco-Mabasa-Guazon/.vs/Project1_Borais-Francisco-Mabasa-Guazon/v14/.suo
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/audios/background_music.wav b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/audios/background_music.wav
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/audios/background_music.wav.meta b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/audios/background_music.wav.meta
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/Audio Controller.prefab b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/Audio Controller.prefab
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/Audio Controller.prefab.meta b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/Audio Controller.prefab.meta
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scenes/Menu.unity b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scenes/Menu.unity
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/Audio.cs b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/Audio.cs
@@ -3,16 +3,23 @@
 
 public class Audio : MonoBehaviour {
 
+    [SerializeField]
+    private AudioClip backgroundMusic;
     [SerializeField]
     private AudioClip dropChipSound;
     [SerializeField]
     private AudioClip pressButtonSound;
+    [SerializeField]
 
-    private static AudioSource _audioSource;
-    private static Audio _instance = null;
+    private static AudioSource _soundEffectsSource;
+    private static AudioSource _backgroundMusicSource;
+
+    private static AudioClip _backgroundMusic;
     private static AudioClip _dropChipSound;
     private static AudioClip _pressButtonSound;
 
+    private static Audio _instance = null;
+
     void Awake() {
         if (_instance == null) {
 
@@ -30,27 +37,40 @@ void Awake() {
 
 	// Use this for initialization
 	void Start () {
-
-        _audioSource = GetComponent<AudioSource>();
-        Debug.Log("Audio Source: " + _audioSource);
+        _soundEffectsSource = gameObject.AddComponent<AudioSource>();
+        _backgroundMusicSource = gameObject.AddComponent<AudioSource>();
+        Debug.Log("Audio Source: " + _soundEffectsSource);
 
         _dropChipSound = dropChipSound;
         _pressButtonSound = pressButtonSound;
+        _backgroundMusic = backgroundMusic;
+
+        _backgroundMusicSource.loop = true;
+        _backgroundMusicSource.volume = 0.5f;
+        PlayBackgroundMusic(); // start playing
     }
 
     public static void PlayDropChip() {
         Debug.Log("Drop chip sound: " + _dropChipSound);
-        if (_audioSource.clip != _dropChipSound) {
-            _audioSource.clip = _dropChipSound;
+        if (_soundEffectsSource.clip != _dropChipSound) {
+            _soundEffectsSource.clip = _dropChipSound;
         }
-        _audioSource.Play();
+        _soundEffectsSource.Play();
     }
 
     public static void PlayPressButton() {
-        if (_audioSource.clip != _pressButtonSound)
+        if (_soundEffectsSource.clip != _pressButtonSound)
         {
-            _audioSource.clip = _pressButtonSound;
+            _soundEffectsSource.clip = _pressButtonSound;
+        }
+        _soundEffectsSource.Play();
+    }
+
+    public static void PlayBackgroundMusic() {
+        if (_backgroundMusicSource.clip != _backgroundMusic) {
+            _backgroundMusicSource.clip = _backgroundMusic;
         }
-        _audioSource.Play();
+
+        _backgroundMusicSource.Play();
     }
 }
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/MenuController.cs b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/MenuController.cs
@@ -0,0 +1,11 @@
+using UnityEngine;
+using System.Collections;
+
+public class MenuController : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+
+	}
+
+}
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/MenuController.cs.meta b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/MenuController.cs.meta
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentLayout.dwlt b/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentLayout.dwlt
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentMaximizeLayout.dwlt b/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentMaximizeLayout.dwlt
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll b/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/assetDatabase3 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/assetDatabase3
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/expandedItems b/Project1_Borais-Francisco-Mabasa-Guazon/Library/expandedItems
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000004000000000000000 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000004000000000000000
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000006100000000000000 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000006100000000000000
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36295c75141239441ac36844401be045 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36295c75141239441ac36844401be045
diff --git a/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36295c75141239441ac36844401be045.info b/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36295c75141239441ac36844401be045.info
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c
diff --git a/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c.info b/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c.info
diff --git a/...ais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c.resource b/...ais-Francisco-Mabasa-Guazon/Library/metadata/36/36695417f12095747a30c4a334cd740c.resource
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/43/430392c86d4e4eb42a93963c591917ea b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/43/430392c86d4e4eb42a93963c591917ea
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/59/59d7504d9d2adf24f97b2a6852532826 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/59/59d7504d9d2adf24f97b2a6852532826
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/c5/c59df63988936e445af53f65f7412fac b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/c5/c59df63988936e445af53f65f7412fac
diff --git a/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/c5/c59df63988936e445af53f65f7412fac.info b/..._Borais-Francisco-Mabasa-Guazon/Library/metadata/c5/c59df63988936e445af53f65f7412fac.info
diff --git a/...ect1_Borais-Francisco-Mabasa-Guazon/Project1_Borais-Francisco-Mabasa-Guazon.CSharp.csproj b/...ect1_Borais-Francisco-Mabasa-Guazon/Project1_Borais-Francisco-Mabasa-Guazon.CSharp.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Assets\scripts\Checker.cs" />
     <Compile Include="Assets\scripts\GameController.cs" />
     <Compile Include="Assets\scripts\Grid.cs" />
+    <Compile Include="Assets\scripts\MenuController.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2015\UnityVS.CSharp.targets" />
 </Project>