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

Refactored ui code to work with new state base player

Browse Source
This commit is contained in:
Evan Nydahl
2022-03-09 13:52:34 -06:00
parent 7ae4b643a1
commit 51056bc3d5
24 changed files with 1307 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dDash.cs
View File

@@ -54,7 +54,7 @@ public class dDash : NetworkBehaviour{
private IEnumerator startCoolDown(){
Debug.Log("start corotine");
isOnCoolDown = true;
//driver.startUICooldown(dashItem.name);
driver.startUICooldown(dashItem.name);
yield return new WaitForSeconds(dashItem.cooldownM);
isOnCoolDown = false;
Debug.Log("end corotine");

2
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dNitro.cs
View File

@@ -56,7 +56,7 @@ public class dNitro : MonoBehaviour
private IEnumerator startCoolDown(){
Debug.Log("start corotine");
isOnCoolDown = true;
//driver.startUICooldown("Nitro");
driver.startUICooldown("Nitro");
yield return new WaitForSeconds(nitroItem.cooldownM);
isOnCoolDown = false;
tempTimer = 5;

4
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/DebugDash/dDashCooldownState.cs
View File

@@ -8,7 +8,7 @@ public class dDashCooldownState : dDashBaseState
public override void EnterState(dDashStateManager dSM, dDashBaseState previousState){
cooldown = false; // sets cooldown
//dSM.StartCoroutine(startCoolDown(dSM)); // activates cooldown
dSM.StartCoroutine(startCoolDown(dSM)); // activates cooldown
}
public override void ExitState(dDashStateManager dSM, dDashBaseState nextState){
@@ -34,7 +34,7 @@ public class dDashCooldownState : dDashBaseState
//cooldown function
private IEnumerator startCoolDown(dDashStateManager dSM){
//dSM.driver.startUICooldown(dashItem.name);
dSM.driver.startUICooldown("Dash");
yield return new WaitForSeconds(dSM.dashItem.cooldownM);
cooldown = true;
}

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/dDashStateManager.cs
View File

@@ -39,7 +39,7 @@ public class dDashStateManager : NetworkBehaviour
moveController = GetComponent<CharacterController>(); // set Character Controller
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<dAnimationManager>();
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
driver = GameObject.Find("PlayerCanvas").GetComponent<CoolDown>();
////
////Initialize Scripts

5
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroCooldownState.cs
View File

@@ -36,8 +36,11 @@ public class dNitroCooldownState : dNitroBaseState
//cooldown timer
private IEnumerator startCoolDown(dNitroStateManager nSM){
//nSM.driver.startUICooldown("Nitro");
Debug.Log("Hello");
nSM.driver.startUICooldown("Nitro");
Debug.Log("DE");
yield return new WaitForSeconds(nSM.nitroItem.cooldownM);
Debug.Log("Done");
cooldown = true;
}
}

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/dNitroStateManager.cs
View File

@@ -54,7 +54,7 @@ public class dNitroStateManager : NetworkBehaviour
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<dAnimationManager>();
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
driver = GameObject.Find("PlayerCanvas").GetComponent<CoolDown>();
////
////Initialize Scripts

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/Dash/DashCooldownState.cs
View File

@@ -34,7 +34,7 @@ public class DashCooldownState : DashBaseState
//cooldown function
private IEnumerator startCoolDown(DashStateManager dSM){
//dSM.driver.startUICooldown(dashItem.name);
dSM.driver.startUICooldown("Dash");
yield return new WaitForSeconds(dSM.dashItem.cooldownM);
cooldown = true;
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs
View File

@@ -38,7 +38,7 @@ public class DashStateManager : NetworkBehaviour
////Initialize Player Components
moveController = GetComponent<CharacterController>(); // set Character Controller
animator = GetComponent<Animator>(); // set animator
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
driver = GameObject.Find("PlayerCanvas").GetComponent<CoolDown>();
////
////Initialize Scripts

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/Nitro/NitroCooldownState.cs
View File

@@ -36,7 +36,7 @@ public class NitroCooldownState : NitroBaseState
//cooldown timer
private IEnumerator startCoolDown(NitroStateManager nSM){
//nSM.driver.startUICooldown("Nitro");
nSM.driver.startUICooldown("Nitro");
yield return new WaitForSeconds(nSM.nitroItem.cooldownM);
cooldown = true;
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs
View File

@@ -53,7 +53,7 @@ public class NitroStateManager : NetworkBehaviour
parentObj = transform.parent.gameObject; // set parent object
animator = GetComponent<Animator>(); // set animator
animationManager = GetComponent<AnimationManager>();
//driver = GameObject.Find("Canvas").GetComponent<CoolDown>();
driver = GameObject.Find("PlayerCanvas").GetComponent<CoolDown>();
////
////Initialize Scripts

2
Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
View File

@@ -54,7 +54,7 @@ public class Dash : NetworkBehaviour{
private IEnumerator startCoolDown(){
Debug.Log("start corotine");
isOnCoolDown = true;
//driver.startUICooldown(dashItem.name);
driver.startUICooldown(dashItem.name);
yield return new WaitForSeconds(dashItem.cooldownM);
isOnCoolDown = false;
Debug.Log("end corotine");

2
Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs
View File

@@ -56,7 +56,7 @@ public class Nitro : MonoBehaviour
private IEnumerator startCoolDown(){
Debug.Log("start corotine");
isOnCoolDown = true;
//driver.startUICooldown("Nitro");
driver.startUICooldown("Nitro");
yield return new WaitForSeconds(nitroItem.cooldownM);
isOnCoolDown = false;
tempTimer = 5;