Merge branch 'fixAnimator' into main

This commit is contained in:
Evan Nydahl
2022-03-07 14:13:20 -06:00
20 changed files with 208 additions and 55 deletions

View File

@@ -26,7 +26,7 @@ public class dDashStateManager : NetworkBehaviour
public dMoveStateManager mSM; // movement state manager
public CoolDown driver; // cooldown driver
//// AnimatorManagerScript
private AnimationManager animationManager;
private dAnimationManager animationManager;
////
////Items Section
@@ -38,7 +38,7 @@ public class dDashStateManager : NetworkBehaviour
////Initialize Player Components
moveController = GetComponent<CharacterController>(); // set Character Controller
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
animationManager = GetComponent<dAnimationManager>();
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
////

View File

@@ -44,7 +44,7 @@ public class dMoveStateManager : NetworkBehaviour
public PlayerStats pStats; // Player Stats
public dAerialStateManager aSM;
//// AnimatorManagerScript
private AnimationManager animationManager;
private dAnimationManager animationManager;
////
////State Transition Variables
@@ -91,7 +91,7 @@ public class dMoveStateManager : NetworkBehaviour
capCol.enabled = true;
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
animationManager = GetComponent<dAnimationManager>();
////
////Initialize Scripts

View File

@@ -32,7 +32,7 @@ public class dNitroStateManager : NetworkBehaviour
public dMoveStateManager mSM; // move state manager
public CoolDown driver; // cooldown driver
//// AnimatorManagerScript
private AnimationManager animationManager;
private dAnimationManager animationManager;
////
////Items Section
@@ -53,7 +53,7 @@ public class dNitroStateManager : NetworkBehaviour
capCol.enabled = true;
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
animationManager = GetComponent<dAnimationManager>();
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
////

View File

@@ -40,7 +40,7 @@ public class dOffenseStateManager : NetworkBehaviour
public dMoveStateManager mSM; // move state manager
public dAerialStateManager aSM; // aerial state manager
//// AnimatorManagerScript
private AnimationManager animationManager;
private dAnimationManager animationManager;
///
void Awake(){
@@ -51,7 +51,7 @@ public class dOffenseStateManager : NetworkBehaviour
capCol = GetComponent<CapsuleCollider>(); // set Capsule Collider
capCol.enabled = true;
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
animationManager = GetComponent<dAnimationManager>();
////
////Initialize Player Objects