etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-14 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fan Club: fix references

Browse source
This commit is contained in:
minenice55 2022-03-25 18:51:43 -04:00
parent 383ff599ad
commit c3db3ac3d7
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Assets/Scripts/Games/FanClub/FanClub.cs
View file

@ -137,28 +137,29 @@ namespace HeavenStudio.Games
private void Update() private void Update()
{ {
if (Conductor.instance.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1)) var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{ {
if (Conductor.instance.songPositionInBeats >= bop.startBeat && Conductor.instance.songPositionInBeats < bop.startBeat + bop.length) if (cond.songPositionInBeats >= bop.startBeat && cond.songPositionInBeats < bop.startBeat + bop.length)
{ {
if (!(Conductor.instance.songPositionInBeats >= noBop.startBeat && Conductor.instance.songPositionInBeats < noBop.startBeat + noBop.length)) if (!(cond.songPositionInBeats >= noBop.startBeat && cond.songPositionInBeats < noBop.startBeat + noBop.length))
idolAnimator.Play("IdolBeat", 0, 0); idolAnimator.Play("IdolBeat", 0, 0);
} }
} }
if (Conductor.instance.ReportBeat(ref specBop.lastReportedBeat, specBop.startBeat % 1)) if (cond.ReportBeat(ref specBop.lastReportedBeat, specBop.startBeat % 1))
{ {
if (Conductor.instance.songPositionInBeats >= specBop.startBeat && Conductor.instance.songPositionInBeats < specBop.startBeat + specBop.length) if (cond.songPositionInBeats >= specBop.startBeat && cond.songPositionInBeats < specBop.startBeat + specBop.length)
{ {
if (!(Conductor.instance.songPositionInBeats >= noSpecBop.startBeat && Conductor.instance.songPositionInBeats < noSpecBop.startBeat + noSpecBop.length)) if (!(cond.songPositionInBeats >= noSpecBop.startBeat && cond.songPositionInBeats < noSpecBop.startBeat + noSpecBop.length))
BopAll(); BopAll();
} }
} }
//idol jumping physics //idol jumping physics
float jumpPos = cond.GetPositionFromBeat(jumpStartTime, 1f); float jumpPos = cond.GetPositionFromBeat(idolJumpStartTime, 1f);
float IDOL_SHADOW_SCALE = 1f; float IDOL_SHADOW_SCALE = 1f;
if (cond.songPositionInBeats >= jumpStartTime && cond.songPositionInBeats < jumpStartTime + 1f) if (cond.songPositionInBeats >= idolJumpStartTime && cond.songPositionInBeats < idolJumpStartTime + 1f)
{ {
hasJumped = true; hasJumped = true;
float yMul = jumpPos * 2f - 1f; float yMul = jumpPos * 2f - 1f;
@ -171,10 +172,10 @@ namespace HeavenStudio.Games
{ {
if (hasJumped) if (hasJumped)
{ {
DisableBop(cond.songPositionInBeats, 1.5); DisableBop(cond.songPositionInBeats, 1.5f);
//TODO: landing anim //TODO: landing anim
} }
jumpStartTime = Single.MinValue; idolJumpStartTime = Single.MinValue;
//TODO: idol start position //TODO: idol start position
Arisa.transform.localPosition = new Vector3(0, 0); Arisa.transform.localPosition = new Vector3(0, 0);
ArisaShadow.transform.localScale = new Vector3(IDOL_SHADOW_SCALE, IDOL_SHADOW_SCALE, 1f); ArisaShadow.transform.localScale = new Vector3(IDOL_SHADOW_SCALE, IDOL_SHADOW_SCALE, 1f);