mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-22 01:25:12 +00:00
Fixed Working Dough Swing (#948)
Working Dough was overlooked when swing was being added, this should fix it
This commit is contained in:
parent
245f22d7ef
commit
b630a90b8d
4 changed files with 10 additions and 8 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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<BeatAction.Action>()
|
||||
|
@ -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<BeatAction.Action>()
|
||||
{
|
||||
|
|
|
@ -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: []
|
||||
|
|
Loading…
Reference in a new issue