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

disappear fix

Browse source
This commit is contained in:
Rapandrasmus 2023-08-07 21:59:32 +02:00
parent e4d2ecf614
commit 39b6c80e4a
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs
View file

@ -18,6 +18,9 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
private int direction = 0; private int direction = 0;
public double monkeyBeat; public double monkeyBeat;
private double disappearBeat = 0;
private bool disappear = false;
private PlayerActionEvent inputEvent; private PlayerActionEvent inputEvent;
private void Awake() private void Awake()
@ -38,6 +41,18 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
game.ScoreMiss(); game.ScoreMiss();
} }
} }
if (disappear)
{
float normalizedBeat = Conductor.instance.GetPositionFromBeat(disappearBeat, 0.5f);
anim.DoNormalizedAnimation(isPink ? "PinkAppear" : "Appear", 1 - normalizedBeat);
float normalizedBeatClose = Conductor.instance.GetPositionFromBeat(disappearBeat + 0.25f, 0.25f);
holeAnim.DoNormalizedAnimation("HoleClose", Mathf.Clamp01(normalizedBeatClose));
if (normalizedBeat > 1f)
{
Destroy(gameObject);
}
}
} }
public void Appear(double beat, bool instant, Animator hole, int dir) public void Appear(double beat, bool instant, Animator hole, int dir)
@ -49,17 +64,11 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
anim.DoScaledAnimationAsync(isPink ? "PinkAppear" : "Appear", 0.4f, instant ? 1 : 0); anim.DoScaledAnimationAsync(isPink ? "PinkAppear" : "Appear", 0.4f, instant ? 1 : 0);
} }
public void Disappear() public void Disappear(double beat)
{ {
holeAnim.DoScaledAnimationAsync("HoleClose", 0.4f); disappear = true;
anim.DoScaledAnimationAsync(isPink ? "PinkAppear" : "Appear", -0.4f, 1); disappearBeat = beat;
StartCoroutine(DisappearCoroutine()); Update();
}
private IEnumerator DisappearCoroutine()
{
yield return !anim.IsAnimationNotPlaying();
Destroy(gameObject);
} }
public void Prepare(double prepareBeat, double inputBeat) public void Prepare(double prepareBeat, double inputBeat)

2
Assets/Scripts/Games/MonkeyWatch/WatchMonkeyHandler.cs
View file

@ -66,7 +66,7 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
currentMonkeys.Add(spawnedMonkey); currentMonkeys.Add(spawnedMonkey);
if (currentMonkeys.Count > maxMonkeys) if (currentMonkeys.Count > maxMonkeys)
{ {
currentMonkeys[0].Disappear(); currentMonkeys[0].Disappear(Conductor.instance.songPositionInBeats);
currentMonkeys.Remove(currentMonkeys[0]); currentMonkeys.Remove(currentMonkeys[0]);
} }
} }