diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 2a9c7a83c..3c7a81897 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -31,6 +31,8 @@ namespace HeavenStudio // Current time of the song private float time; + double lastAbsTime; + // an AudioSource attached to this GameObject that will play the music. public AudioSource musicSource; @@ -140,6 +142,7 @@ namespace HeavenStudio musicSource.PlayScheduled(AudioSettings.dspTime); } } + lastAbsTime = Time.realtimeSinceStartupAsDouble; // GameManager.instance.SetCurrentEventToClosest(songPositionInBeats); } @@ -172,7 +175,9 @@ namespace HeavenStudio if (isPlaying) { - var dt = Time.unscaledDeltaTime * musicSource.pitch; + double absTime = Time.realtimeSinceStartupAsDouble; + float dt = (float) (absTime - lastAbsTime) * musicSource.pitch; + lastAbsTime = absTime; time += dt; diff --git a/Assets/Scripts/GameManager.cs.meta b/Assets/Scripts/GameManager.cs.meta index bf2338a7f..e772e389e 100644 --- a/Assets/Scripts/GameManager.cs.meta +++ b/Assets/Scripts/GameManager.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: -43 + executionOrder: -44 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs.meta b/Assets/Scripts/Games/PlayerActionEvent.cs.meta index bd61831d1..0b76c9a62 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs.meta +++ b/Assets/Scripts/Games/PlayerActionEvent.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -43 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Games/PlayerActionObject.cs.meta b/Assets/Scripts/Games/PlayerActionObject.cs.meta index 5e3a2acf7..0b00cf0a8 100644 --- a/Assets/Scripts/Games/PlayerActionObject.cs.meta +++ b/Assets/Scripts/Games/PlayerActionObject.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -42 icon: {instanceID: 0} userData: assetBundleName: