From 6a9c951e2ccbf768c87ed4226565a7117c8e2747 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 16 Nov 2020 14:36:17 +0800 Subject: *misc --- Assets/Scripts/Test/ArmorSoldierScript_States.cs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'Assets/Scripts/Test/ArmorSoldierScript_States.cs') diff --git a/Assets/Scripts/Test/ArmorSoldierScript_States.cs b/Assets/Scripts/Test/ArmorSoldierScript_States.cs index 67eca581..07a4ce74 100644 --- a/Assets/Scripts/Test/ArmorSoldierScript_States.cs +++ b/Assets/Scripts/Test/ArmorSoldierScript_States.cs @@ -35,15 +35,20 @@ public partial class ArmorSoldierScript : Avatar, IInteractable //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ActionSwitchState switchToIdle = new ActionSwitchState(m_StateSystem, idle); - Trigger trigger = null; - - - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // state setup - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - // air hurt - ConditionMotionAtEnd airAtEnd = new ConditionMotionAtEnd(m_Animator, Anim_AirHurt); + Trigger trigger = null; + + + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // state setup + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + // light hurt + ConditionMotionAtEnd lightHurtAtEnd = new ConditionMotionAtEnd(m_Animator, Anim_LightHurt); + trigger = new Trigger(lightHurtAtEnd, switchToIdle); + lightHurt.AddTrigger(trigger); + + // air hurt + ConditionMotionAtEnd airAtEnd = new ConditionMotionAtEnd(m_Animator, Anim_AirHurt); trigger = new Trigger(And(airAtEnd, Not(condInAir)), switchToIdle); airHurt.AddTrigger(trigger); -- cgit v1.1-26-g67d0