etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 11:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

cowbell no longer drifts out of sync

Browse source
This commit is contained in:
DPS2004 2022-08-20 14:45:54 -04:00
parent 0b4f05dc9b
commit a8403ff078
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Assets/Scripts/Games/Tunnel/Tunnel.cs
View file

@ -68,10 +68,7 @@ namespace HeavenStudio.Games
public BezierCurve3D handCurve; public BezierCurve3D handCurve;
public GameEvent cowbell = new GameEvent();
public PlayerActionEvent cowbell;
public int driverState; public int driverState;
@ -90,13 +87,21 @@ namespace HeavenStudio.Games
{ {
driverState = 0; driverState = 0;
handStart = -1f; handStart = -1f;
cowbell = null;
} }
private void Update() private void Update()
{ {
var cond = Conductor.instance;
if (cond.ReportBeat(ref cowbell.lastReportedBeat, cowbell.startBeat % 1))
{
if (cond.songPositionInBeats >= cowbell.startBeat && cond.songPositionInBeats < cowbell.startBeat + cowbell.length)
{
ScheduleInput(cond.songPositionInBeats, 1, InputType.STANDARD_DOWN, CowbellSuccess, CowbellMiss, CowbellEmpty);
}
}
if (PlayerInput.Pressed() && !IsExpectingInputNow()) if (PlayerInput.Pressed() && !IsExpectingInputNow())
{ {
HitCowbell(); HitCowbell();
@ -132,25 +137,16 @@ namespace HeavenStudio.Games
{ {
started = true; started = true;
cowbell.length = length;
cowbell.startBeat = beat;
for (int i = 1; i <= length; i++)
{
ScheduleInput(beat, i, InputType.STANDARD_DOWN, CowbellSuccess, CowbellMiss, CowbellEmpty);
}
//if (coin != null) return; //for (int i = 1; i <= length; i++)
//{
//ScheduleInput(beat, i, InputType.STANDARD_DOWN, CowbellSuccess, CowbellMiss, CowbellEmpty);
//}
//Play sound and animations
//handAnimator.Play("Throw", 0, 0);
//Game state says the hand is throwing the coin
//isThrowing = true;
//this.audienceReacting = audienceReacting;
//coin = ScheduleInput(beat, 6f, InputType.STANDARD_DOWN, CatchSuccess, CatchMiss, CatchEmpty);
//cowbell = ScheduleInput(beat, 0f, InputType.STANDARD_DOWN, CowbellSuccess, CowbellMiss, CowbellEmpty);
//coin.perfectOnly = true;
} }
public void CowbellSuccess(PlayerActionEvent caller, float state) public void CowbellSuccess(PlayerActionEvent caller, float state)