mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

remove useless logic

Browse source
This commit is contained in:
Rapandrasmus 2024-01-01 16:13:22 +01:00
parent b46066e5d3
commit 5d3fa1784f
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Assets/Scripts/Games/TotemClimb/TCJumper.cs
View file

@ -131,14 +131,9 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
bool playedFall = false; bool playedFall = false;
bool firstFrame = true;
while(normalizedBeat < 1f) while(normalizedBeat < 1f)
{ {
if (_game.IsExpectingInputNow(Minigame.InputAction_BasicPress) && PlayerInput.GetIsAction(Minigame.InputAction_BasicPress) && !firstFrame)
{
yield break;
}
transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat); transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat);
if (normalizedBeat >= 0.5f && !playedFall) if (normalizedBeat >= 0.5f && !playedFall)
@ -147,7 +142,6 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
playedFall = true; playedFall = true;
} }
normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
firstFrame = false;
yield return null; yield return null;
} }
_anim.Play("Idle", 0, 0); _anim.Play("Idle", 0, 0);
@ -175,14 +169,9 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
bool playedFall = false; bool playedFall = false;
bool firstFrame = true;
while (normalizedBeat < 1f) while (normalizedBeat < 1f)
{ {
if (_game.IsExpectingInputNow(Minigame.InputAction_BasicPress) && PlayerInput.GetIsAction(Minigame.InputAction_BasicPress) && !firstFrame)
{
yield break;
}
transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat); transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat);
if (normalizedBeat >= 0.5f && !playedFall) if (normalizedBeat >= 0.5f && !playedFall)
@ -192,7 +181,6 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
} }
normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
firstFrame = false;
yield return null; yield return null;
} }
_anim.Play("Idle", 0, 0); _anim.Play("Idle", 0, 0);
@ -239,14 +227,9 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
bool playedFall = false; bool playedFall = false;
bool firstFrame = true;
while (normalizedBeat < 1f) while (normalizedBeat < 1f)
{ {
if (_game.IsExpectingInputNow(Minigame.InputAction_BasicPress) && PlayerInput.GetIsAction(Minigame.InputAction_BasicPress) && !firstFrame)
{
yield break;
}
transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat); transform.position = GetPathPositionFromBeat(_path, Math.Clamp(Conductor.instance.songPositionInBeatsAsDouble, beat, beat + _path.positions[0].duration), beat);
if (normalizedBeat >= 0.5f && !playedFall) if (normalizedBeat >= 0.5f && !playedFall)
@ -256,7 +239,6 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
} }
normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration); normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, _path.positions[0].duration);
firstFrame = false;
yield return null; yield return null;
} }
_anim.Play("Idle", 0, 0); _anim.Play("Idle", 0, 0);
@ -266,17 +248,12 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
private IEnumerator HoldCo(double beat) private IEnumerator HoldCo(double beat)
{ {
float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, 2 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat + 2))); float normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, 2);
Transform dragonPoint = _game.GetDragonPointAtBeat(beat); Transform dragonPoint = _game.GetDragonPointAtBeat(beat);
bool canUnHold = true; bool canUnHold = true;
while (normalizedBeat < 1f) while (normalizedBeat < 1f)
{ {
if (_game.IsExpectingInputNow(Minigame.InputAction_FlickRelease) && PlayerInput.GetIsAction(Minigame.InputAction_FlickRelease)) normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, 2);
{
yield break;
}
normalizedBeat = Conductor.instance.GetPositionFromBeat(beat, 1);
transform.position = dragonPoint.position; transform.position = dragonPoint.position;
if (!_game.IsExpectingInputNow(Minigame.InputAction_FlickRelease) if (!_game.IsExpectingInputNow(Minigame.InputAction_FlickRelease)