Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-09-10 11:25:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'animations4' into main

Browse Source
This commit is contained in:
Evan Nydahl
2022-04-27 18:52:05 -05:00
parent 33a20e03bb 6856a88702
commit 2907c3f3eb
53 changed files with 178396 additions and 23202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseAirKickState.cs
View File

@@ -17,12 +17,14 @@ public class OffenseAirKickState : OffenseBaseState
//start kicking routine
oSM.StartCoroutine(kicking(8f));
oSM.GetComponent<Animator>().SetBool("isAerialKick", true);
}
public override void ExitState(OffenseStateManager oSM, OffenseBaseState nextState){
legRotation = 0; // reset leg angle
oSM.leg.transform.eulerAngles = new Vector3(legRotation, oSM.leg.transform.eulerAngles.y, oSM.leg.transform.eulerAngles.z); // rotate leg
oSM.leg.SetActive(false); // reset leg angle
oSM.GetComponent<Animator>().SetBool("isAerialKick", false);
}
public override void UpdateState(OffenseStateManager oSM){

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs
View File

@@ -15,7 +15,7 @@ public class OffenseKickState : OffenseBaseState
kicked = false; // haven't kicked
oSM.animator.SetBool("IsKickingIdle", true);
//start kicking routine
oSM.StartCoroutine(kicking(1f));
oSM.StartCoroutine(kicking(.833f));
}
public override void ExitState(OffenseStateManager oSM, OffenseBaseState nextState){