a few more fixes
This commit is contained in:
parent
a3820f3f06
commit
f1d3652bf8
Binary file not shown.
BIN
Assets/Resources/Sfx/games/airboarder/crouchCharge.wav
Normal file
BIN
Assets/Resources/Sfx/games/airboarder/crouchCharge.wav
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: d047a8cbdf949a24f882434c0851f646
|
guid: c73fe9e4419eb29498d846b6dbb1223e
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
Binary file not shown.
Binary file not shown.
BIN
Assets/Resources/Sfx/games/airboarder/start1.wav
Normal file
BIN
Assets/Resources/Sfx/games/airboarder/start1.wav
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: c2474b4057e748c47a85d52cbf988332
|
guid: 1bb4e7022962568468529adbd238b5dd
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
Binary file not shown.
BIN
Assets/Resources/Sfx/games/airboarder/start2.wav
Normal file
BIN
Assets/Resources/Sfx/games/airboarder/start2.wav
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: f882749dd96777043b9a638007b5b6b6
|
guid: d0ddfe988b573bd438767ea835bf94a1
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
BIN
Assets/Resources/Sfx/games/airboarder/start3.wav
Normal file
BIN
Assets/Resources/Sfx/games/airboarder/start3.wav
Normal file
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 50cb54db5a695ca4d875a5d309598995
|
guid: b6c7beb236efd7d41ad81d7c93ae81cb
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
@ -230,13 +230,23 @@ namespace HeavenStudio.Games
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Player.GetComponent<Animator>().DoScaledAnimationAsync("duck",1f, 0, 1);
|
Player.GetComponent<Animator>().DoScaledAnimationAsync("duck",1f, 0, 1);
|
||||||
|
SoundByte.PlayOneShotGame("airboarder/crouch");
|
||||||
|
BeatAction.New(this, new() {
|
||||||
|
new(currentBeat, ()=>playerCantBop = true),
|
||||||
|
new(currentBeat+1.5f, ()=>playerCantBop = false)});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease)){
|
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease)){
|
||||||
Player.GetComponent<Animator>().DoScaledAnimationAsync("hold",1f, 0, 1);
|
if (wantsCrouch)
|
||||||
playerCantBop = false;}
|
{
|
||||||
|
Player.GetComponent<Animator>().DoScaledAnimationAsync("hold",1f, 0, 1);
|
||||||
|
playerCantBop = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease)){
|
if (PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease)){
|
||||||
Player.GetComponent<Animator>().DoScaledAnimationAsync("hold",1f, 0, 1);
|
Player.GetComponent<Animator>().DoScaledAnimationAsync("jump",1f, 0, 1);
|
||||||
|
SoundByte.PlayOneShotGame("airboarder/jump");
|
||||||
playerCantBop = false;}
|
playerCantBop = false;}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -308,6 +318,7 @@ namespace HeavenStudio.Games
|
||||||
BeatAction.New(instance, new List<BeatAction.Action>(){
|
BeatAction.New(instance, new List<BeatAction.Action>(){
|
||||||
new BeatAction.Action(beat, delegate {SoundByte.PlayOneShotGame("airboarder/start1");}),
|
new BeatAction.Action(beat, delegate {SoundByte.PlayOneShotGame("airboarder/start1");}),
|
||||||
new BeatAction.Action(beat + 6.5, delegate {SoundByte.PlayOneShotGame("airboarder/start2");}),
|
new BeatAction.Action(beat + 6.5, delegate {SoundByte.PlayOneShotGame("airboarder/start2");}),
|
||||||
|
new BeatAction.Action(beat + 7, delegate {SoundByte.PlayOneShotGame("airboarder/start3");}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
BeatAction.New(instance, new List<BeatAction.Action>(){
|
BeatAction.New(instance, new List<BeatAction.Action>(){
|
||||||
|
|
|
||||||
|
|
@ -73,13 +73,16 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
new BeatAction.Action(crouchBeat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
|
new BeatAction.Action(crouchBeat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
|
||||||
|
|
||||||
new BeatAction.Action(crouchBeat+1, delegate {game.cpu2CantBop = true;} ),
|
new BeatAction.Action(crouchBeat+1, delegate {game.cpu2CantBop = true;} ),
|
||||||
|
new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
|
||||||
new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
|
new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
|
||||||
|
new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");}),
|
||||||
new BeatAction.Action(crouchBeat+1, delegate {game.CPU1.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
|
new BeatAction.Action(crouchBeat+1, delegate {game.CPU1.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
|
||||||
new BeatAction.Action(crouchBeat+1, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
|
new BeatAction.Action(crouchBeat+1, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
|
||||||
|
new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
|
||||||
new BeatAction.Action(crouchBeat+2, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
|
new BeatAction.Action(crouchBeat+2, delegate {game.CPU2.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
|
||||||
new BeatAction.Action(crouchBeat+2, delegate {game.Player.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
|
new BeatAction.Action(crouchBeat+2, delegate {game.Player.GetComponent<Animator>().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
|
||||||
new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");})
|
new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
|
||||||
|
new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");})
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -101,12 +104,14 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DuckSuccess(PlayerActionEvent caller, float state)
|
public void DuckSuccess(PlayerActionEvent caller, float state)
|
||||||
{
|
{
|
||||||
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f, 0, 1);
|
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("duck", 1f, 0, 1);
|
||||||
SoundByte.PlayOneShotGame("airboarder/crouch");
|
SoundByte.PlayOneShotGame("airboarder/crouch");
|
||||||
SoundByte.PlayOneShotGame("airboarder/crouchvox");
|
SoundByte.PlayOneShotGame("airboarder/crouchvox");
|
||||||
double beat = caller.startBeat + caller.timer;
|
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
|
new(beat, ()=>game.playerCantBop = true),
|
||||||
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -116,6 +121,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
anim.DoScaledAnimationAsync("shake", 1f, 0, 0);
|
anim.DoScaledAnimationAsync("shake", 1f, 0, 0);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
|
new(beat, ()=>game.playerCantBop = true),
|
||||||
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -125,8 +131,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
||||||
anim.DoScaledAnimationAsync("break", 1f, 0, 0);
|
anim.DoScaledAnimationAsync("break", 1f, 0, 0);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.MissSound(beat);
|
// game.MissSound(beat);
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
|
new(beat, ()=>game.playerCantBop = true),
|
||||||
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -135,7 +142,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
public void CrouchSuccess(PlayerActionEvent caller, float state)
|
public void CrouchSuccess(PlayerActionEvent caller, float state)
|
||||||
{
|
{
|
||||||
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);
|
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("charge", 1f, 0, 1);
|
||||||
|
SoundByte.PlayOneShotGame("airboarder/crouch");
|
||||||
SoundByte.PlayOneShotGame("airboarder/crouchCharge");
|
SoundByte.PlayOneShotGame("airboarder/crouchCharge");
|
||||||
|
SoundByte.PlayOneShotGame("airboarder/crouchvox");
|
||||||
game.playerCantBop = true;
|
game.playerCantBop = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,7 +157,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
||||||
anim.DoScaledAnimationAsync("break", 1f, 0, 0);
|
anim.DoScaledAnimationAsync("break", 1f, 0, 0);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.MissSound(beat);
|
// game.MissSound(beat);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,8 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
SoundByte.PlayOneShotGame("airboarder/jumpvox");
|
SoundByte.PlayOneShotGame("airboarder/jumpvox");
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
new(beat+1f, ()=>game.playerCantBop = false)});
|
new(beat, ()=>game.playerCantBop = true),
|
||||||
|
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
||||||
game.wantsCrouch = false;
|
game.wantsCrouch = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -95,7 +96,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
|
||||||
public void JumpEmpty(PlayerActionEvent caller){
|
public void JumpEmpty(PlayerActionEvent caller){
|
||||||
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
game.Player.GetComponent<Animator>().DoScaledAnimationAsync("hit2", 1f, 0, 1);
|
||||||
double beat = caller.startBeat + caller.timer;
|
double beat = caller.startBeat + caller.timer;
|
||||||
game.MissSound(beat);
|
// game.MissSound(beat);
|
||||||
BeatAction.New(this, new() {
|
BeatAction.New(this, new() {
|
||||||
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
new(beat+1.5f, ()=>game.playerCantBop = false)});
|
||||||
game.wantsCrouch = false;
|
game.wantsCrouch = false;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue