diff --git a/Assets/Scripts/Games/WorkingDough/BGBall.cs b/Assets/Scripts/Games/WorkingDough/BGBall.cs index 1bfdcf7bd..c437ebf89 100644 --- a/Assets/Scripts/Games/WorkingDough/BGBall.cs +++ b/Assets/Scripts/Games/WorkingDough/BGBall.cs @@ -15,7 +15,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough public void Init(double beat, bool hasGandw) { - startBeat = beat; + startBeat = Conductor.instance.GetUnSwungBeat(beat); path = WorkingDough.instance.GetPath("BGBall"); if (gandw != null) gandw.SetActive(hasGandw); Update(); @@ -27,7 +27,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough if (cond.isPlaying && !cond.isPaused) { - double beat = cond.songPositionInBeats; + double beat = cond.unswungSongPositionInBeats; if (startBeat != double.MinValue) { Vector3 pos = GetPathPositionFromBeat(path, Math.Max(startBeat, beat), startBeat); diff --git a/Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs b/Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs index ed4dfde0c..79fe13612 100644 --- a/Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs +++ b/Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs @@ -15,7 +15,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough public void Init(double beat, bool hasGandw) { - startBeat = beat; + startBeat = Conductor.instance.GetUnSwungBeat(beat); path = WorkingDough.instance.GetPath("NPCBall"); if (gandw != null) gandw.SetActive(hasGandw); Update(); @@ -27,7 +27,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough if (cond.isPlaying && !cond.isPaused) { - double beat = cond.songPositionInBeats; + double beat = cond.unswungSongPositionInBeats; if (startBeat > double.MinValue) { Vector3 pos = GetPathPositionFromBeat(path, Math.Max(beat, startBeat), startBeat); diff --git a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs index aacdfe422..421c1bafc 100644 --- a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs +++ b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs @@ -47,7 +47,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough public void Init(double beat, bool isBig, bool hasGandw) { - startBeat = beat; + startBeat = Conductor.instance.GetUnSwungBeat(beat); big = isBig; canJust = true; canWrong = true; @@ -75,7 +75,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough if (startBeat > double.MinValue) { Vector3 pos = new Vector3(); - double beat = cond.songPositionInBeats; + double beat = cond.unswungSongPositionInBeats; switch (currentState) { case State.None: @@ -137,7 +137,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough wrongInput.CleanUp(); } if (currentState is State.Hit or State.Barely or State.Weak) return; - double beat = Conductor.instance.songPositionInBeatsAsDouble; + double beat = Conductor.instance.unswungSongPositionInBeatsAsDouble; startBeat = beat; game.playerImpact.SetActive(true); BeatAction.New(game, new List() @@ -195,7 +195,7 @@ namespace HeavenStudio.Games.Scripts_WorkingDough rightInput.CleanUp(); } if (currentState is State.Hit or State.Barely or State.Weak) return; - double beat = Conductor.instance.songPositionInBeats; + double beat = Conductor.instance.unswungSongPositionInBeats; game.playerImpact.SetActive(true); BeatAction.New(game, new List() { diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 61fa2bb50..e71e5d838 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -403,5 +403,7 @@ MonoBehaviour: - Assets/Scripts/Games/LaunchParty/LaunchPartyRocket.cs - Assets/Scripts/Util/BeatAction.cs - Assets/Scripts/Games/FanClub/NtrIdolAri.cs + - Assets/Scripts/Games/WorkingDough/NPCDoughBall.cs + - Assets/Scripts/Games/WorkingDough/BGBall.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []