Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-21 09:54:28 -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

6
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialFallingState.cs
View File

@@ -6,16 +6,20 @@ public class dAerialFallingState : dAerialBaseState
{
bool shouldGlide;
public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
<<<<<<< HEAD
if(previousState == aSM.JumpingState && aSM.jumpHeld){
shouldGlide = true;
}
else{
shouldGlide = false;
}
=======
aSM.GetComponent<Animator>().SetBool("isFalling", true);
>>>>>>> animations4
}
public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){
aSM.GetComponent<Animator>().SetBool("isFalling", false);
}
public override void UpdateState(dAerialStateManager aSM){

33
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugAerial/dAerialJumpingState.cs
View File

@@ -5,12 +5,24 @@ using UnityEngine;
public class dAerialJumpingState : dAerialBaseState
{
private int previousJumpNum;
public override void EnterState(dAerialStateManager aSM, dAerialBaseState previousState){
previousJumpNum = aSM.curJumpNum;
if (aSM.curJumpNum % 2 == 1)
{
aSM.GetComponent<Animator>().SetBool("isJumpingLeft", true);
}
//if even, do right jump
else if (aSM.curJumpNum % 2 == 0)
{
aSM.GetComponent<Animator>().SetBool("isJumpingRight", true);
}
}
public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){
aSM.GetComponent<Animator>().SetBool("isJumpingLeft", false);
aSM.GetComponent<Animator>().SetBool("isJumpingRight", false);
}
public override void UpdateState(dAerialStateManager aSM){
@@ -45,5 +57,22 @@ public class dAerialJumpingState : dAerialBaseState
if(aSM.pStats.HasGrapple){
aSM.GrappleReleaseForce();
}
if(aSM.curJumpNum != previousJumpNum)
{
previousJumpNum = aSM.curJumpNum;
aSM.GetComponent<Animator>().SetBool("isJumpingLeft", false);
aSM.GetComponent<Animator>().SetBool("isJumpingRight", false);
if (aSM.curJumpNum % 2 == 1)
{
aSM.GetComponent<Animator>().SetBool("isJumpingLeft", true);
}
//if even, do right jump
else if (aSM.curJumpNum % 2 == 0)
{
aSM.GetComponent<Animator>().SetBool("isJumpingRight", true);
}
}
}
}

14
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/DebugWallRun/dAerialWallRunState.cs
View File

@@ -11,10 +11,22 @@ public class dAerialWallRunState : dAerialBaseState
aSM.pStats.GravVel = 0; // on entering reset grav vel
spaceHeld = true; // prevent accidental wall jumping
//if left
if(aSM.CalculateSide() < 0)
{
aSM.GetComponent<Animator>().SetBool("isLEFTWallRunning", true);
}
//if right
else if (aSM.CalculateSide() > 0)
{
aSM.GetComponent<Animator>().SetBool("isRIGHTWallRunning", true);
}
}
public override void ExitState(dAerialStateManager aSM, dAerialBaseState nextState){
aSM.GetComponent<Animator>().SetBool("isLEFTWallRunning", false);
aSM.GetComponent<Animator>().SetBool("isRIGHTWallRunning", false);
}
public override void UpdateState(dAerialStateManager aSM){

5
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugAerialState/dAerialStateManager.cs
View File

@@ -43,6 +43,7 @@ public class dAerialStateManager : NetworkBehaviour
////Scripts Section
public PlayerStats pStats; // Player Stats
public dMoveStateManager mSM;
private dAnimationManager animationManager;
////
////Variables Section
@@ -117,6 +118,7 @@ public class dAerialStateManager : NetworkBehaviour
rB = GetComponent<Rigidbody>(); //set Rigid Body
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<dAnimationManager>();
////
////Initialize Scripts
@@ -201,6 +203,7 @@ public class dAerialStateManager : NetworkBehaviour
//updates current state and calls logic for entering
currentState = state;
animationManager.updateCurrentPriority();
currentState.EnterState(this, previousState);
}
@@ -491,7 +494,7 @@ public class dAerialStateManager : NetworkBehaviour
}
//Calculate wall direction
float CalculateSide(){
public float CalculateSide(){
if(isWallRunning)
{
Vector3 heading = lastWallPosition - transform.position;

4
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugSlide/dMoveCrouchState.cs
View File

@@ -17,6 +17,7 @@ public class dMoveCrouchState : dMoveBaseState
mSM.moveController.center = new Vector3(0,mSM.moveController.center.y - mSM.moveController.height * .5f,0);
//mSM.moveController.Move(new Vector3(0,-mSM.moveController.height * .5f,0));
}
mSM.animator.SetBool("isCrouching", true);
}
public override void ExitState(dMoveStateManager mSM, dMoveBaseState nextState){
@@ -28,7 +29,8 @@ public class dMoveCrouchState : dMoveBaseState
mSM.moveController.height *= 2.0f;
mSM.moveController.center = new Vector3(0,mSM.moveController.center.y + mSM.moveController.height * .25f,0);
}
mSM.animator.SetBool("isCrouching", false);
}
public override void UpdateState(dMoveStateManager mSM){

3
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/DebugSlide/dMoveCrouchWalkState.cs
View File

@@ -5,7 +5,7 @@ using UnityEngine;
public class dMoveCrouchWalkState : dMoveBaseState
{
public override void EnterState(dMoveStateManager mSM, dMoveBaseState previousState){
mSM.animator.SetBool("isCrouchWalking", true);
}
public override void ExitState(dMoveStateManager mSM, dMoveBaseState nextState){
@@ -16,6 +16,7 @@ public class dMoveCrouchWalkState : dMoveBaseState
mSM.moveController.height *= 2.0f;
mSM.moveController.center = new Vector3(0,mSM.moveController.center.y + mSM.moveController.height * .25f,0);
}
mSM.animator.SetBool("isCrouchWalking", false);
}
public override void UpdateState(dMoveStateManager mSM){

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseAirKickState.cs
View File

@@ -17,12 +17,14 @@ public class dOffenseAirKickState : dOffenseBaseState
//start kicking routine
oSM.StartCoroutine(kicking(8f));
oSM.GetComponent<Animator>().SetBool("isAerialKick", true);
}
public override void ExitState(dOffenseStateManager oSM, dOffenseBaseState 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(dOffenseStateManager oSM){

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs
View File

@@ -16,7 +16,7 @@ public class dOffenseKickState : dOffenseBaseState
oSM.animator.SetBool("IsKickingIdle", true);
//start kicking routine
oSM.StartCoroutine(kicking(1f));
oSM.StartCoroutine(kicking(.833f));
}
public override void ExitState(dOffenseStateManager oSM, dOffenseBaseState nextState){