From d94c73f535949b4f2eed41b1f6d0ced605664a08 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 20 Oct 2020 08:59:12 +0800 Subject: + attk rush + kick rush --- Assets/Scripts/Test/SaionjiScript_Ability.cs | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'Assets/Scripts/Test/SaionjiScript_Ability.cs') diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 18cc93dd..c1baca66 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -40,7 +40,9 @@ public partial class SaionjiScript : MonoBehaviour AttackAbility attk3 = new AttackAbility(animator, Anim_LightAttack3); AttackAbility attk4 = new AttackAbility(animator, Anim_LightAttack4); AttackAbility attk5 = new AttackAbility(animator, Anim_LightAttack5); + AttackAbility attkRush = new AttackAbility(animator, Anim_LightAttackRush); AttackAbility sideKick = new AttackAbility(animator, Anim_SideKick); + AttackAbility sideKickRush = new AttackAbility(animator, Anim_SideKickRush); AttackAbility superKick = new AttackAbility(animator, Anim_SuperKick); AttackAbility gun1 = new AttackAbility(animator, Anim_Gun1); AttackAbility gun2 = new AttackAbility(animator, Anim_Gun2); @@ -61,7 +63,9 @@ public partial class SaionjiScript : MonoBehaviour ActionSwitchAbility switchToAttk3 = new ActionSwitchAbility(m_AbilitySystem, attk3); ActionSwitchAbility switchToAttk4 = new ActionSwitchAbility(m_AbilitySystem, attk4); ActionSwitchAbility switchToAttk5 = new ActionSwitchAbility(m_AbilitySystem, attk5); + ActionSwitchAbility switchToAttkRush = new ActionSwitchAbility(m_AbilitySystem, attkRush); ActionSwitchAbility switchToSideKick = new ActionSwitchAbility(m_AbilitySystem, sideKick); + ActionSwitchAbility switchToSideKickRush = new ActionSwitchAbility(m_AbilitySystem, sideKickRush); ActionSwitchAbility switchToDash = new ActionSwitchAbility(m_AbilitySystem, dash); ActionSwitchAbility switchToSuperKick = new ActionSwitchAbility(m_AbilitySystem, superKick); ActionSwitchAbility switchToGun1 = new ActionSwitchAbility(m_AbilitySystem, gun1); @@ -128,6 +132,14 @@ public partial class SaionjiScript : MonoBehaviour move.AddTrigger(trigger); trigger = new Trigger(And(condTowardLeft, And(condLeftCmd, condLeft2Cmd)), new List { wipeCmdRecord, switchToDash }); move.AddTrigger(trigger); + trigger = new Trigger(And(condRightButtonHold, condCircleCmd), new List { towardRight, switchToAttkRush }); + move.AddTrigger(trigger); + trigger = new Trigger(And(condLeftButtonHold, condCircleCmd), new List { towardLeft, switchToAttkRush }); + move.AddTrigger(trigger); + trigger = new Trigger(And(condRightButtonHold, condCrossCmd), new List { towardRight, switchToSideKickRush }); + move.AddTrigger(trigger); + trigger = new Trigger(And(condLeftButtonHold, condCrossCmd), new List { towardLeft, switchToSideKickRush }); + move.AddTrigger(trigger); trigger = new Trigger(And(condTowardRight, Not(condRightButtonHold)), switchToIdle); move.AddTrigger(trigger); trigger = new Trigger(And(condTowardLeft, Not(condLeftButtonHold)), switchToIdle); @@ -156,6 +168,19 @@ public partial class SaionjiScript : MonoBehaviour attk1.AddTrigger(triggerTurnRight); attk1.AddTrigger(triggerTurnLeft); + ConditionAnimRange condAttkRushAtRange = new ConditionAnimRange(animator, 0.5f, 1f); + trigger = new Trigger(And(condAttkRushAtRange, condCircleCmd), switchToAttk2); + attkRush.AddTrigger(trigger); + //trigger = new Trigger(And(And(condAttkRushAtRange, condTowardRight), condRightCmd), switchToAttkRush); + //attkRush.AddTrigger(trigger); + //trigger = new Trigger(And(And(condAttkRushAtRange, condTowardLeft), condLeftCmd), switchToAttkRush); + //attkRush.AddTrigger(trigger); + ConditionAttkExpireTime condAttkRushExpireTime = new ConditionAttkExpireTime(attkRush, expireTime); + trigger = new Trigger(condAttkRushExpireTime, switchToIdle); + attkRush.AddTrigger(trigger); + attkRush.AddTrigger(triggerTurnRight); + attkRush.AddTrigger(triggerTurnLeft); + ConditionAnimAtEnd condAttk2AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack2); trigger = new Trigger(And(condAttk2AtEnd, condCircleCmd), switchToAttk3); attk2.AddTrigger(trigger); @@ -197,6 +222,16 @@ public partial class SaionjiScript : MonoBehaviour trigger = new Trigger(condSideKickExpireTime, switchToIdle); sideKick.AddTrigger(trigger); + // side kick rush + ConditionAttkExpireTime condSideKickRushExpireTime = new ConditionAttkExpireTime(sideKickRush, expireTime); + trigger = new Trigger(condSideKickRushExpireTime, switchToIdle); + sideKickRush.AddTrigger(trigger); + ConditionAnimRange condSideKickRushAnimRange = new ConditionAnimRange(animator, 0.5f, 10f); + trigger = new Trigger(And(condSideKickRushAnimRange, And(condRightButtonHold, condCircleCmd)), new List { towardRight, switchToAttkRush }); + sideKickRush.AddTrigger(trigger); + trigger = new Trigger(And(condSideKickRushAnimRange, And(condLeftButtonHold, condCircleCmd)), new List { towardLeft, switchToAttkRush }); + sideKickRush.AddTrigger(trigger); + // super kick combo ConditionAttkExpireTime condSuperKickExpireTime = new ConditionAttkExpireTime(superKick, expireTime); trigger = new Trigger(condSuperKickExpireTime, switchToIdle); -- cgit v1.1-26-g67d0