lisätty efektien soittomahdollisuus

Assets/Audio/lautanen.it.meta

+fileFormatVersion: 2
+guid: 117f35b9a9c960540ae24eea2bf3ea27
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 1
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/AudioSystem.cs

@@ -10,8 +10,10 @@ public class AudioSystem : MonoBehaviour, IAction
     private List<AudioClip> musics = new List<AudioClip>();
 
     [SerializeField]
-    private AudioSource ac;
+    private AudioSource ac = null;
+    
     // Start is called before the first frame update
+    
     void Start()
     {
 
@@ -22,12 +24,7 @@ public class AudioSystem : MonoBehaviour, IAction
         React(EventType.GameStarts);
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
+    
     public void React(EventType type) {
         if (type == EventType.GameStarts)
         {
@@ -62,7 +59,8 @@ public class AudioSystem : MonoBehaviour, IAction
 
     public void GameStartsClip()
     {
-        StartCoroutine("FadeOutIn", new Timing(0,0));
+        StartCoroutine("FadeOutIn", new Timing(2,1));
+        StartCoroutine("PlayEffect", 6);
     }
     public void CitySmallClip()
     {
@@ -80,7 +78,6 @@ public class AudioSystem : MonoBehaviour, IAction
     {
         StartCoroutine("FadeOutIn", new Timing(2, 6));
     }
-
     IEnumerator FadeOutIn(Timing t) {
         //yield return FadeOut(t.duration);
         yield return StartCoroutine("FadeOut", t.duration);
@@ -115,13 +112,20 @@ public class AudioSystem : MonoBehaviour, IAction
         {
             float current = Time.time - start;
             //(max-current)/(max-min)
-            float volume = (end - Time.time) / (end - start);
+            float volume = (Time.time - start) / (end - start);
             yield return null;
             ac.volume = volume;
         }
         ac.volume = 1;
     }
-
+    public IEnumerator PlayEffect(int clip)
+    {
+        AudioSource v = gameObject.AddComponent<AudioSource>();
+        v.clip = musics[clip];
+        v.Play();
+        yield return new WaitForSeconds(v.clip.length + 1);
+        Destroy(v);
+    }
 
 
 

Assets/Scripts/EventSystem/EventType.cs

@@ -4,14 +4,17 @@ using UnityEngine;
 
 public enum EventType
 {
-    GameStarts, //music
-    TimePeriodChanged, // music
-    CitySmall, //music
-    CityBig, //music
-    WoodChopped, //effect
-    StoneCut, //effect
-    HuntingSmall, //music
-    HuntingBig, //music
-    UpgradeBuilt //effect
+    //music
+    GameStarts, 
+    TimePeriodChanged, 
+    CitySmall, 
+    CityBig, 
+    HuntingSmall,
+    HuntingBig, 
+    //effects
+    WoodChopped, 
+    StoneCut, 
+    Berrypicked,
+    UpgradeBuilt
 
 }