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

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;