Merge pull request #21 from jakobwcrowe/megaminerzero

Editor: Various bugfixes

Assets/Resources/MainMixer.mixer

@@ -1,23 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!244 &-7482437823656399522
-AudioMixerEffectController:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_EffectID: edde4d902ac6edc4d9d67a8c9e433fb6
-  m_EffectName: Lowpass
-  m_MixLevel: 6a832196d6ceedd48bbde9fbe4177202
-  m_Parameters:
-  - m_ParameterName: Cutoff freq
-    m_GUID: 911cb1bf4bb1b624ab3a68e1eb57ba29
-  - m_ParameterName: Resonance
-    m_GUID: 1f89dac5f0e643c4ab8774d8ad05e968
-  m_SendTarget: {fileID: 0}
-  m_EnableWetMix: 0
-  m_Bypass: 0
 --- !u!243 &-7454359775428337364
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -33,7 +15,6 @@ AudioMixerGroupController:
   m_Send: 00000000000000000000000000000000
   m_Effects:
   - {fileID: -3827691611382659438}
-  - {fileID: -7482437823656399522}
   m_UserColorIndex: 0
   m_Mute: 0
   m_Solo: 0

Assets/Resources/Sfx/games/forkLifter/zoomFast.ogg.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bae94bedea157574fa32d28216adaf01
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    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/Games/ForkLifter/Pea.cs

@@ -19,7 +19,13 @@ namespace RhythmHeavenMania.Games.ForkLifter
         private void Start()
         {
             anim = GetComponent<Animator>();
-            Jukebox.PlayOneShotGame("forkLifter/zoom");
+
+            // SCHEDULING zoom sound so it lines up with when it meets the fork.
+            var currentDspTime = AudioSettings.dspTime;
+            var cond = Conductor.instance;
+            var zoomStartTime = currentDspTime + (double)(cond.secPerBeat * 2 / cond.musicSource.pitch) - 0.317;
+            Jukebox.PlayOneShotScheduledGame("forkLifter/zoomFast", (double)zoomStartTime);
+
             GetComponentInChildren<SpriteRenderer>().sprite = ForkLifter.instance.peaSprites[type];
 
             for (int i = 0; i < transform.GetChild(0).childCount; i++)

Assets/Scripts/LevelEditor/Timeline/Timeline.cs

@@ -189,6 +189,14 @@ namespace RhythmHeavenMania.Editor.Track
             MetronomeBTN.transform.GetChild(0).GetComponent<Image>().color = Color.gray;
 
             timelineState.SetState(true, false, false);
+
+            AutoBtnUpdate();
+        }
+
+        public void AutoBtnUpdate()
+        {
+            var animName = GameManager.instance.autoplay ? "Idle" : "Disabled";
+            AutoplayBTN.GetComponent<Animator>().Play(animName, 0, 0);
         }
 
         public static string RandomID()

Assets/Scripts/Util/Jukebox.cs

@@ -57,6 +57,26 @@ namespace RhythmHeavenMania.Util
             GameManager.instance.SoundObjects.Add(oneShot);
         }
 
+        public static void PlayOneShotScheduled(string name, double targetTime)
+        {
+            GameObject oneShot = new GameObject("oneShotScheduled");
+
+            var audioSource = oneShot.AddComponent<AudioSource>();
+            audioSource.playOnAwake = false;
+
+            var snd = oneShot.AddComponent<Sound>();
+
+            var clip = Resources.Load<AudioClip>($"Sfx/{name}");
+            audioSource.clip = clip;
+            snd.clip = clip;
+            
+            snd.scheduled = true;
+            snd.scheduledTime = targetTime;
+            audioSource.PlayScheduled(targetTime);
+            
+            GameManager.instance.SoundObjects.Add(oneShot);
+        }
+
         public static void PlayOneShotGame(string name, float beat = -1)
         {
             if (GameManager.instance.currentGame == name.Split('/')[0])
@@ -64,6 +84,14 @@ namespace RhythmHeavenMania.Util
                 PlayOneShot($"games/{name}", beat);
             }
         }
+
+        public static void PlayOneShotScheduledGame(string name, double targetTime)
+        {
+            if (GameManager.instance.currentGame == name.Split('/')[0])
+            {
+                PlayOneShotScheduled($"games/{name}", targetTime);
+            }
+        }
     }
 
 }

Assets/Scripts/Util/Sound.cs

@@ -9,6 +9,10 @@ namespace RhythmHeavenMania.Util
         public AudioClip clip;
         public float pitch = 1;
 
+        // For use with PlayOneShotScheduled
+        public bool scheduled;
+        public double scheduledTime;
+
         private AudioSource audioSource;
 
         private int pauseTimes = 0;
@@ -26,7 +30,7 @@ namespace RhythmHeavenMania.Util
             audioSource.clip = clip;
             audioSource.pitch = pitch;
 
-            if (beat == -1)
+            if (beat == -1 && !scheduled)
             {
                 audioSource.PlayScheduled(Time.time);
                 playInstant = true;
@@ -39,12 +43,21 @@ namespace RhythmHeavenMania.Util
 
             startTime = Conductor.instance.songPosition;
 
-            StartCoroutine(NotRelyOnBeatSound());
+            if (!scheduled)
+                StartCoroutine(NotRelyOnBeatSound());
         }
 
         private void Update()
         {
-            if (!playInstant)
+            if (scheduled)
+            {
+                if (AudioSettings.dspTime > scheduledTime && playIndex < 1)
+                {
+                    StartCoroutine(NotRelyOnBeatSound());
+                    playIndex++;
+                }
+            }
+            else if (!playInstant)
             {
                 if (Conductor.instance.songPositionInBeats > beat && playIndex < 1)
                 {