Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-26 02:00:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'playerAudio'

Browse Source
This commit is contained in:
Vladdie 2022-05-01 03:00:52 -05:00
commit 3a2896a2a7
5 changed files with 11848 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3846
Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
View File

File diff suppressed because it is too large Load Diff

8010
Assets/Racer/Animations/falling.anim
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/Aerial/AerialJumpingState.cs
View File

@ -4,6 +4,7 @@ using UnityEngine;
public class AerialJumpingState : AerialBaseState
{
private int previousJumpNum;
public override void EnterState(AerialStateManager aSM, AerialBaseState previousState){

27
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs
View File

@ -116,6 +116,15 @@ public class AerialStateManager : NetworkBehaviour
public float currentForcePower = 0;
////
///Audio
public AudioSource jumpSound1;
public AudioSource jumpSound2;
public AudioSource jumpSound3;
public AudioSource springJumpSound;
public AudioSource landingSound;
public AudioSource grappleSound;
////
void Awake(){
////Initialize Player Components
@ -387,12 +396,28 @@ public class AerialStateManager : NetworkBehaviour
AddImpact((GetWallJumpDirection()), pStats.JumpPow * 8.5f);
pStats.GravVel = pStats.JumpPow;
curJumpNum = 0;
jumpSound1.Play();
}
else{
pStats.GravVel = pStats.JumpPow;
}
//add check here for spring?
if (curJumpNum == 0)
{
jumpSound1.Play();
}
if (curJumpNum == 1)
{
jumpSound2.Play();
}
if (curJumpNum == 2)
{
jumpSound3.Play();
}
curJumpNum++;
jumpPressed = true;
jumpHeld = true;

4
UserSettings/EditorUserSettings.asset
View File

@ -30,10 +30,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c731f1415016439262f2434
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650