From 8ff7539d2b551415838378127efeb937f419435a Mon Sep 17 00:00:00 2001 From: minenice55 <43734252+minenice55@users.noreply.github.com> Date: Thu, 9 Jun 2022 02:46:51 -0400 Subject: [PATCH] I shouldn't be coding at midnight (#96) * Fix Sheets issue 11 * Textboxes: Fix unicode glyphs sometimes not displaying * Fan Club: fix order of operation bug * Conductor: refactor ReportBeat this fixes issues with using crop stomp alongside tempo changes * Built to Scale (Gold): temporarily disable post-processing game renders very incorrectly due to the post processing effects will need someone who knows what they're doing in that field to fix it proper * marked some assets for deletion * I'm dumb and left in debug prints * peabrain moment VERY IMPORTANT FIX * Make this not loop --- .../Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim | 2 +- Assets/Scripts/Conductor.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim b/Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim index 24499bcfa..46a8579e9 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim +++ b/Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim @@ -66,7 +66,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 1acfb49b0..7f60d3cf1 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -203,6 +203,10 @@ namespace HeavenStudio if (result) { lastReportedBeat += 1f; + if (lastReportedBeat < songPositionInBeats) + { + lastReportedBeat = Mathf.Round(songPositionInBeats); + } } return result; }