Commit d6a66158 authored by BlckTgr's avatar BlckTgr
Browse files

Dirigent hat jetzt eine funktionierende Skill-Animation

parent 4939294d
......@@ -8,7 +8,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: Dirigent
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: UsingSkill
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -22,7 +28,7 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101240192037599848
--- !u!1101 &1101317123135358862
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -31,7 +37,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102737292030507548}
m_DstState: {fileID: 1102344962622614394}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -66,6 +72,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101558647345775296
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: UsingSkill
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102737292030507548}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1102 &1102344962622614394
AnimatorState:
serializedVersion: 5
......@@ -103,7 +134,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101240192037599848}
- {fileID: 1101317123135358862}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -165,7 +196,8 @@ AnimatorStateMachine:
m_State: {fileID: 1102737292030507548}
m_Position: {x: 144, y: 384, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: 1101558647345775296}
m_EntryTransitions:
- {fileID: 1109527347333021764}
m_StateMachineTransitions: {}
......
......@@ -9,6 +9,12 @@ public class Scr_DirigentAnimation : MonoBehaviour
public void OnSkillUsed()
{
animator.SetBool("UsingSkill", true);
StartCoroutine(stopSkillUsed());
}
IEnumerator stopSkillUsed()
{
yield return new WaitForSeconds(1.4f);
animator.SetBool("UsingSkill", false);
}
......
......@@ -25,6 +25,8 @@ public class Scr_SkillUnlock : MonoBehaviour
public GameObject WaveSpawner;
public UnityEvent OnSkillUsed;
private Color tmp, tmp2, tmp3, tmp4;
void Awake()
......@@ -55,6 +57,7 @@ public class Scr_SkillUnlock : MonoBehaviour
else if (skills.speedup == true)
{
OnSkillUsed.Invoke();
StartCoroutine(SpeedUp());
}
......@@ -76,6 +79,7 @@ public class Scr_SkillUnlock : MonoBehaviour
else if (skills.disharmonie == true)
{
OnSkillUsed.Invoke();
StartCoroutine(Disharmonie());
}
}
......@@ -96,6 +100,7 @@ public class Scr_SkillUnlock : MonoBehaviour
else if (skills.shreak == true)
{
OnSkillUsed.Invoke();
StartCoroutine(Shreak());
}
......@@ -117,6 +122,7 @@ public class Scr_SkillUnlock : MonoBehaviour
else if (skills.bagpipejoker == true)
{
OnSkillUsed.Invoke();
StartCoroutine(Pipebagjoker());
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment