diff options
Diffstat (limited to 'Assets/Scripts/Test/SaionjiScript_Ability.cs')
| -rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Ability.cs | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 32859b8d..8934b5da 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -49,17 +49,24 @@ public partial class SaionjiScript : Avatar MoveAbility move = new MoveAbility(animator, Anim_Run);
MoveAbility dash = new MoveAbility(animator, Anim_DashWithSword);
- JumpAbilityConfig jumpConfig = new JumpAbilityConfig();
- jumpConfig.animator = animator;
- jumpConfig.collider = m_BodyCollider;
- jumpConfig.body = m_Body;
- jumpConfig.neutralJumpSpeedY = 10f;
- jumpConfig.fowardJumpSpeedX = 5f;
- jumpConfig.backwardJumpSpeedX = -5f;
- jumpConfig.animJump = Anim_JumpStart;
- jumpConfig.animJumpEnd = Anim_JumpEnd;
- jumpConfig.animNU = Anim_JumpUp;
- jumpConfig.animND = Anim_JumpDown;
+ JumpAbilityConfig jumpConfig = new JumpAbilityConfig
+ {
+ animator = animator,
+ collider = m_BodyCollider,
+ body = m_Body,
+ neutralJumpSpeedY = 13f,
+ fowardJumpSpeedX = 5f,
+ backwardJumpSpeedX = -5f,
+ animJump = Anim_JumpStart,
+ animJumpEnd = Anim_JumpEnd,
+ animNU = Anim_JumpUp,
+ animND = Anim_JumpDown,
+ animFU = Anim_JumpUp,
+ animFD = Anim_JumpDown,
+ animBU = Anim_JumpUp,
+ animBD = Anim_JumpDown,
+ skipStart = true,
+ };
JumpAbility jump = new JumpAbility(jumpConfig);
AttackAbilityConfig config;
@@ -205,8 +212,17 @@ public partial class SaionjiScript : Avatar move.AddTrigger(trigger);
// jump ability
+ ConditionCheckJumpState condCheckJump = new ConditionCheckJumpState(jump, JumpAbility.State.None, JumpAbility.Direction.Neutral);
+ trigger = new Trigger(And(condRightButtonHold, condCheckJump), new List<ActionBase> { towardRight, new ActionSetVelocityX(m_Body, 4)}, TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
+ trigger = new Trigger(And(condLeftButtonHold, condCheckJump), new List<ActionBase> { towardLeft, new ActionSetVelocityX(m_Body,-4) }, TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
+ trigger = new Trigger(Ands(condCheckJump, Not(condRightButtonHold), Not(condLeftButtonHold)), new ActionSetVelocityX(m_Body, 0), TriggerOnlyOnce.Off, TriggerSwallow.Off);
+ jump.AddTrigger(trigger);
trigger = new Trigger(condJumpOnGround, new ActionSetVelocity(m_Body, Vector3.zero), TriggerOnlyOnce.On, TriggerSwallow.Off);
jump.AddTrigger(trigger);
+ trigger = new Trigger(Ands(new ConditionJumpDone(jump, 0.4f), condJumpOnGround, Or(condRightButtonHold, condLeftButtonHold)), switchToMove);
+ jump.AddTrigger(trigger);
trigger = new Trigger(condJumpDone, switchToIdle);
jump.AddTrigger(trigger);
|