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

improved interaction between roll and end block

Browse source
This commit is contained in:
Rapandrasmus 2023-06-26 22:31:11 +02:00
parent 01635e71ad
commit de4216af66
3 changed files with 120 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assets/Resources/Prefabs/Games/NightWalkAgb/JumpPlatform.prefab
View file

@ -278,6 +278,7 @@ MonoBehaviour:
fallYan: {fileID: 142440390168805750}
fish: {fileID: 3392966659349309181}
rollPlatform: {fileID: 5041901577087691681}
rollPlatformLong: {fileID: 4921680285842369143}
--- !u!95 &4653690538679061971
Animator:
serializedVersion: 5

109
Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs
View file

@ -38,6 +38,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
[SerializeField] private GameObject fallYan;
[SerializeField] private Animator fish;
[SerializeField] private Animator rollPlatform;
[SerializeField] private GameObject rollPlatformLong;
private bool playYanIsFalling;
private double playYanFallBeat;
private bool isFish;
@ -61,9 +62,14 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
isFish = game.FishOnBeat(endBeat);
fish.gameObject.SetActive(isFish);
isEndEvent = game.endBeat == endBeat;
if (isEndEvent) anim.Play("EndIdle", 0, 0);
isRollPlatform = game.RollOnBeat(endBeat);
rollPlatform.transform.parent.gameObject.SetActive(isRollPlatform);
rollPlatformLong.SetActive(nextPlatformIsSameHeight && !isFinalBlock && !isEndEvent);
if (isEndEvent)
{
if (isRollPlatform) rollPlatform.Play("EndIdle", 0, 0);
else anim.Play("EndIdle", 0, 0);
}
if (isRollPlatform)
{
platform.SetActive(false);
@ -230,7 +236,8 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
if (!startGlowing && isEndEvent && game.hitJumps >= game.requiredJumps && AgbNightWalk.hitJumpsPersist >= game.requiredJumpsP)
{
anim.DoScaledAnimationAsync("EndGlow", 0.5f);
if (isRollPlatform) rollPlatform.DoScaledAnimationAsync("EndGlow", 0.5f);
else anim.DoScaledAnimationAsync("EndGlow", 0.5f);
startGlowing = true;
}
}
@ -281,6 +288,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
private void JustRollRelease(PlayerActionEvent caller, float state)
{
canKickRelease = false;
double beat = Conductor.instance.songPositionInBeats;
if (isFish)
{
game.ScoreMiss();
@ -297,7 +305,68 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
fish.DoScaledAnimationAsync("FishIdle", 0.5f);
})
});
return;
}
else if (isFinalBlock)
{
handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat);
double missTime = 1.5 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat));
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + missTime, delegate
{
game.ScoreMiss();
handler.StopAll();
}),
});
}
if (isEndEvent)
{
if (game.hitJumps >= game.requiredJumps && AgbNightWalk.hitJumpsPersist >= game.requiredJumpsP)
{
anim.DoScaledAnimationAsync("EndPop", 0.5f);
handler.StopAll();
handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat + 1);
game.playYan.Float(Conductor.instance.songPositionInBeats);
handler.DevolveAll();
if (isFish)
{
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 0.5, delegate
{
game.ScoreMiss();
game.playYan.Shock();
fish.DoScaledAnimationAsync("Shock", 0.5f);
}),
new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate
{
game.playYan.Fall(caller.timer + caller.startBeat + 4);
fish.DoScaledAnimationAsync("FishIdle", 0.5f);
})
});
}
}
else
{
game.playYan.HighJump(beat, true, state >= 1f || state <= -1f);
handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat);
double missTime = 1.5 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat));
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + missTime, delegate
{
game.ScoreMiss();
handler.StopAll();
}),
});
}
}
else
{
handler.RaiseHeight(beat, lastAdditionalHeightInUnits, additionalHeightInUnits);
game.playYan.HighJump(beat, isFinalBlock, state >= 1f || state <= -1f);
}
if (state >= 1f || state <= -1f)
{
@ -305,7 +374,6 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
rollPlatform.DoScaledAnimationAsync("UmbrellaBarely", 0.5f);
return;
}
game.playYan.HighJump(Conductor.instance.songPositionInBeats);
SoundByte.PlayOneShot("games/nightWalkRvl/highJump7");
rollPlatform.DoScaledAnimationAsync("Umbrella", 0.5f);
game.starHandler.Evolve(game.evolveAmount);
@ -338,7 +406,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
canKick = false;
double beat = Conductor.instance.songPositionInBeats;
handler.RaiseHeight(beat, lastAdditionalHeightInUnits, additionalHeightInUnits);
game.playYan.Jump(beat);
game.playYan.Jump(beat, isFinalBlock);
if (isFish)
{
BeatAction.New(gameObject, new List<BeatAction.Action>()
@ -360,6 +428,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
}
else if (isFinalBlock)
{
handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat);
double missTime = 1 - Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(beat));
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
@ -367,11 +436,13 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
{
game.ScoreMiss();
handler.StopAll();
game.playYan.Fall(beat + missTime);
handler.DestroyPlatforms(caller.timer + caller.startBeat + 2, endBeat - 2, endBeat);
}),
});
}
if (isEndEvent)
{
}
if (state >= 1 || state <= -1)
{
@ -422,19 +493,19 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
if (isFish)
{
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 0.5, delegate
{
game.ScoreMiss();
game.playYan.Shock();
fish.DoScaledAnimationAsync("Shock", 0.5f);
}),
new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate
{
game.playYan.Fall(caller.timer + caller.startBeat + 4);
fish.DoScaledAnimationAsync("FishIdle", 0.5f);
})
});
new BeatAction.Action(beat + 0.5, delegate
{
game.ScoreMiss();
game.playYan.Shock();
fish.DoScaledAnimationAsync("Shock", 0.5f);
}),
new BeatAction.Action(caller.timer + caller.startBeat + 4, delegate
{
game.playYan.Fall(caller.timer + caller.startBeat + 4);
fish.DoScaledAnimationAsync("FishIdle", 0.5f);
})
});
}
}
else

35
Assets/Scripts/Games/NightWalkAgb/AgbPlayYan.cs
View file

@ -18,7 +18,9 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
Whiffing,
Floating,
Rolling,
HighJumping
HighJumping,
JumpingFall,
HighJumpingFall
}
private JumpingState jumpingState;
private AgbNightWalk game;
@ -50,7 +52,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
balloonTrans.localPosition = new Vector3(balloonTrans.localPosition.x + UnityEngine.Random.Range(randomMinBalloonX, randomMaxBalloonX), balloonTrans.localPosition.y);
}
}
bool hasFallen;
private void Update()
{
var cond = Conductor.instance;
@ -67,6 +69,16 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
Walk();
}
break;
case JumpingState.JumpingFall:
Vector3 posf = GetPathPositionFromBeat(jumpPath, cond.songPositionInBeatsAsDouble, jumpBeat);
transform.localPosition = posf;
float normalizedBeatf = cond.GetPositionFromBeat(jumpBeat, jumpPath.positions[0].duration);
if (normalizedBeatf >= 1f && !hasFallen)
{
hasFallen = true;
SoundByte.PlayOneShotGame("nightWalkAgb/fall");
}
break;
case JumpingState.Walking:
transform.localPosition = Vector3.zero;
anim.DoScaledAnimation("Walk", walkBeat, 0.5f, 0.35f);
@ -115,6 +127,16 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
Walk();
}
break;
case JumpingState.HighJumpingFall:
Vector3 posHf = GetPathPositionFromBeat(highJumpPath, cond.songPositionInBeatsAsDouble, jumpBeat);
transform.localPosition = posHf;
float normalizedBeatHf = cond.GetPositionFromBeat(jumpBeat, highJumpPath.positions[0].duration);
if (normalizedBeatHf >= 1f && !hasFallen)
{
hasFallen = true;
SoundByte.PlayOneShotGame("nightWalkAgb/fall");
}
break;
}
}
}
@ -155,9 +177,9 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
if (UnityEngine.Random.Range(1, 3) == 1) star.DoScaledAnimationAsync("Blink", 0.5f);
Invoke("StarBlink", UnityEngine.Random.Range(0.1f, 0.3f));
}
public void Jump(double beat)
public void Jump(double beat, bool fall = false)
{
jumpingState = JumpingState.Jumping;
jumpingState = fall ? JumpingState.JumpingFall : JumpingState.Jumping;
jumpBeat = beat;
anim.Play("Jump", 0, 0);
spriteTrans.localEulerAngles = Vector3.zero;
@ -165,13 +187,14 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
Update();
}
public void HighJump(double beat)
public void HighJump(double beat, bool fall = false, bool barely = false)
{
jumpingState = JumpingState.HighJumping;
jumpingState = fall ? JumpingState.HighJumpingFall : JumpingState.HighJumping;
jumpBeat = beat;
anim.DoScaledAnimationAsync("HighJump", 0.5f);
spriteTrans.localEulerAngles = Vector3.zero;
highJumpPath.positions[0].duration = 1.5f - (float)Conductor.instance.SecsToBeats(Minigame.earlyTime, Conductor.instance.GetBpmAtBeat(jumpBeat));
highJumpPath.positions[0].height = barely ? 3.5f : 4.5f;
Update();
}