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

minor tweaks

Browse source
This commit is contained in:
Rapandrasmus 2024-01-01 19:09:52 +01:00
parent 5c41073582
commit 6833090320
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Resources/Games/totemClimb.prefab
View file

@ -282,7 +282,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 1
m_Sprite: {fileID: -1752908610, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} m_Sprite: {fileID: -1752908610, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -16336,7 +16336,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 2
m_Sprite: {fileID: -1228472510, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} m_Sprite: {fileID: -1228472510, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0

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

@ -106,7 +106,7 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
_path.positions = new PathPos[2]; _path.positions = new PathPos[2];
_path.positions[0] = new PathPos() _path.positions[0] = new PathPos()
{ {
duration = 1 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat + 1)), duration = (_game.EndBeat <= beat + 1) ? 1 : 1 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat + 1)),
height = _jumpHeight, height = _jumpHeight,
target = _game.IsTripleBeat(beat) ? _game.GetJumperFrogPointAtBeat(beat, 1) : _game.GetJumperPointAtBeat(beat) target = _game.IsTripleBeat(beat) ? _game.GetJumperFrogPointAtBeat(beat, 1) : _game.GetJumperPointAtBeat(beat)
}; };
@ -145,6 +145,7 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
yield return null; yield return null;
} }
_anim.Play("Idle", 0, 0); _anim.Play("Idle", 0, 0);
if (beat + 1 >= _onPlayBeat && _game.EndBeat <= beat + 1) SoundByte.PlayOneShotGame("totemClimb/totemland");
} }
private IEnumerator JumpTripleCo(double beat, bool enter, bool miss, bool nearMiss) private IEnumerator JumpTripleCo(double beat, bool enter, bool miss, bool nearMiss)
@ -194,7 +195,7 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
_path.positions = new PathPos[2]; _path.positions = new PathPos[2];
_path.positions[0] = new PathPos() _path.positions[0] = new PathPos()
{ {
duration = 2 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat + 2)), duration = (_game.EndBeat <= beat + 2) ? 2 : 2 - (float)Conductor.instance.SecsToBeats(Minigame.justEarlyTime, Conductor.instance.GetBpmAtBeat(beat + 2)),
height = _jumpHighHeight, height = _jumpHighHeight,
target = _game.GetDragonPointAtBeat(beat) target = _game.GetDragonPointAtBeat(beat)
}; };
@ -244,6 +245,7 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
_anim.Play("Idle", 0, 0); _anim.Play("Idle", 0, 0);
_highParticle.Stop(); _highParticle.Stop();
_highMissParticle.Stop(); _highMissParticle.Stop();
if (beat + 2 >= _onPlayBeat && _game.EndBeat <= beat + 2) SoundByte.PlayOneShotGame("totemClimb/totemland");
} }
private IEnumerator HoldCo(double beat) private IEnumerator HoldCo(double beat)
@ -342,13 +344,13 @@ namespace HeavenStudio.Games.Scripts_TotemClimb
{ {
HighJump(caller.startBeat + caller.timer, state >= 1f && state <= -1f); HighJump(caller.startBeat + caller.timer, state >= 1f && state <= -1f);
_game.ReleaseDragonAtBeat(caller.startBeat + caller.timer); _game.ReleaseDragonAtBeat(caller.startBeat + caller.timer);
if (caller.startBeat + caller.timer >= _onPlayBeat) SoundByte.PlayOneShotGame("totemClimb/superjumpgood");
if (state >= 1f || state <= -1f) if (state >= 1f || state <= -1f)
{ {
if (caller.startBeat + caller.timer >= _onPlayBeat) SoundByte.PlayOneShot("nearMiss"); if (caller.startBeat + caller.timer >= _onPlayBeat) SoundByte.PlayOneShot("nearMiss");
return; return;
} }
_jumpParticle.PlayScaledAsync(0.5f); _jumpParticle.PlayScaledAsync(0.5f);
if (caller.startBeat + caller.timer >= _onPlayBeat) SoundByte.PlayOneShotGame("totemClimb/superjumpgood");
} }
private void Miss(PlayerActionEvent caller) private void Miss(PlayerActionEvent caller)