This commit is contained in:
Rapandrasmus 2023-08-03 22:26:40 +02:00 committed by GitHub
parent e816b2de37
commit cd94ee3761
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1365,7 +1365,7 @@ namespace HeavenStudio.Games
SoundByte.PlayOneShotGame("airRally/birdieCatch"); SoundByte.PlayOneShotGame("airRally/birdieCatch");
shuttleActive = false; shuttleActive = false;
recursingRally = false; recursingRally = false;
if (ActiveShuttle != null) Destroy(ActiveShuttle); if (ActiveShuttle != null) Destroy(ActiveShuttle.gameObject);
} }
public void RallyOnHit(PlayerActionEvent caller, float state) public void RallyOnHit(PlayerActionEvent caller, float state)
@ -1374,7 +1374,7 @@ namespace HeavenStudio.Games
if (state >= 1 || state <= -1) if (state >= 1 || state <= -1)
{ {
ActiveShuttle.GetComponent<Shuttlecock>().DoNearMiss(); ActiveShuttle.DoNearMiss();
hasMissed = true; hasMissed = true;
shuttleActive = false; shuttleActive = false;
ActiveShuttle = null; ActiveShuttle = null;
@ -1383,7 +1383,7 @@ namespace HeavenStudio.Games
{ {
ReturnObject(Conductor.instance.songPositionInBeatsAsDouble, caller.startBeat + caller.timer + 1f, false); ReturnObject(Conductor.instance.songPositionInBeatsAsDouble, caller.startBeat + caller.timer + 1f, false);
hasMissed = false; hasMissed = false;
ActiveShuttle.GetComponent<Shuttlecock>().DoHit(DistanceAtBeat(caller.startBeat + caller.timer)); ActiveShuttle.DoHit(DistanceAtBeat(caller.startBeat + caller.timer));
string distanceString = DistanceAtBeat(caller.startBeat + caller.timer) switch string distanceString = DistanceAtBeat(caller.startBeat + caller.timer) switch
{ {
DistanceSound.close => "Close", DistanceSound.close => "Close",
@ -1414,7 +1414,7 @@ namespace HeavenStudio.Games
if (state >= 1 || state <= -1) if (state >= 1 || state <= -1)
{ {
ActiveShuttle.GetComponent<Shuttlecock>().DoThrough(); ActiveShuttle.DoThrough();
hasMissed = true; hasMissed = true;
shuttleActive = false; shuttleActive = false;
} }
@ -1422,7 +1422,7 @@ namespace HeavenStudio.Games
{ {
ReturnObject(Conductor.instance.songPositionInBeatsAsDouble, caller.startBeat + caller.timer + 2f, true); ReturnObject(Conductor.instance.songPositionInBeatsAsDouble, caller.startBeat + caller.timer + 2f, true);
hasMissed = false; hasMissed = false;
ActiveShuttle.GetComponent<Shuttlecock>().DoHit(DistanceAtBeat(caller.startBeat + caller.timer)); ActiveShuttle.DoHit(DistanceAtBeat(caller.startBeat + caller.timer));
string distanceString = DistanceAtBeat(caller.startBeat + caller.timer) switch string distanceString = DistanceAtBeat(caller.startBeat + caller.timer) switch
{ {
@ -1454,7 +1454,7 @@ namespace HeavenStudio.Games
public void RallyOnMiss(PlayerActionEvent caller) public void RallyOnMiss(PlayerActionEvent caller)
{ {
ActiveShuttle.GetComponent<Shuttlecock>().DoThrough(); ActiveShuttle.DoThrough();
hasMissed = true; hasMissed = true;
shuttleActive = false; shuttleActive = false;
ActiveShuttle = null; ActiveShuttle = null;