diff options
Diffstat (limited to 'Assets/Scripts/Test/SaionjiScript_States.cs')
| -rw-r--r-- | Assets/Scripts/Test/SaionjiScript_States.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Assets/Scripts/Test/SaionjiScript_States.cs b/Assets/Scripts/Test/SaionjiScript_States.cs index ce9fb8a6..0ed8eef2 100644 --- a/Assets/Scripts/Test/SaionjiScript_States.cs +++ b/Assets/Scripts/Test/SaionjiScript_States.cs @@ -145,7 +145,9 @@ public partial class SaionjiScript : Avatar ConditionCommandSeq condRight2Cmd = new ConditionCommandSeq(new List<GamepadButton>{GamepadButton.Right, GamepadButton.Right }, 0.8f); ConditionCommandSeq condLeft2Cmd = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Left, GamepadButton.Left }, 0.8f); ConditionCommandSeq condDRC = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Down, GamepadButton.Right, GamepadButton.Circle}, 1f); - ConditionCommandSeq condDLC = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Down, GamepadButton.Left, GamepadButton.Circle}, 1f); + ConditionCommandSeq condDLC = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Down, GamepadButton.Left, GamepadButton.Circle }, 1f);
+ ConditionCommandSeq condDR = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Down, GamepadButton.Right}, 1f); + ConditionCommandSeq condDL = new ConditionCommandSeq(new List<GamepadButton> { GamepadButton.Down, GamepadButton.Left}, 1f);
ConditionHit condIsHit = new ConditionHit(this); @@ -177,9 +179,9 @@ public partial class SaionjiScript : Avatar idle.AddTrigger(trigger); trigger = new Trigger(And(condTowardLeft, And(condLeftCmd, condLeft2Cmd)), new List<ActionBase> { wipeCmdRecord , switchToDash }); idle.AddTrigger(trigger); - trigger = new Trigger(condRightButtonHold, new List<ActionBase> { switchToMove, towardRight }); + trigger = new Trigger(And(condRightButtonHold, Not(condDR)), new List<ActionBase> { switchToMove, towardRight }); idle.AddTrigger(trigger); - trigger = new Trigger(condLeftButtonHold, new List<ActionBase> { switchToMove, towardLeft }); + trigger = new Trigger(And(condLeftButtonHold, Not(condDL)), new List<ActionBase> { switchToMove, towardLeft }); idle.AddTrigger(trigger); trigger = new Trigger(condCircleCmd, switchToAttk1); idle.AddTrigger(trigger); @@ -329,11 +331,14 @@ public partial class SaionjiScript : Avatar trigger = new Trigger(And(condSideKickRushMotionRange, And(condRightButtonHold, condCircleCmd)), new List<ActionBase> { towardRight, switchToAttkRush }); sideKickRush.AddTrigger(trigger); trigger = new Trigger(And(condSideKickRushMotionRange, And(condLeftButtonHold, condCircleCmd)), new List<ActionBase> { towardLeft, switchToAttkRush }); - sideKickRush.AddTrigger(trigger); - - // super kick combo + sideKickRush.AddTrigger(trigger);
+
+ // super kick combo
+ ConditionMotionRange condSuperKickComboBegin = new ConditionMotionRange(animator, 0f, 1f); + trigger = new Trigger(condSuperKickComboBegin, new ActionDontUseGravity(m_Body)); + superKick.AddTrigger(trigger); ConditionAttkExpireTime condSuperKickExpireTime = new ConditionAttkExpireTime(superKick, expireTime); - trigger = new Trigger(condSuperKickExpireTime, switchToIdle); + trigger = new Trigger(condSuperKickExpireTime, new List < ActionBase >() { switchToIdle , new ActionUseGravity(m_Body) }); superKick.AddTrigger(trigger); // gun normal |