From 64061aee5d7849f348f07b78fc3f96ad7555c147 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 2 Nov 2020 09:00:15 +0800
Subject: *jump

---
 Assets/Scripts/Test/SaionjiCloneScript.cs      | 20 ++++++++++++++
 Assets/Scripts/Test/SaionjiCloneScript.cs.meta | 11 ++++++++
 Assets/Scripts/Test/SaionjiScript_Ability.cs   | 38 ++++++++++++++++++--------
 Assets/Scripts/Test/SaionjiScript_Anim.cs      |  1 -
 4 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 Assets/Scripts/Test/SaionjiCloneScript.cs
 create mode 100644 Assets/Scripts/Test/SaionjiCloneScript.cs.meta

(limited to 'Assets/Scripts/Test')

diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs b/Assets/Scripts/Test/SaionjiCloneScript.cs
new file mode 100644
index 00000000..d6ddba86
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiCloneScript.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SaionjiCloneScript : MonoBehaviour
+{
+	public Animator m_Animator;
+
+	public void OnEnable()
+	{
+		int Anim_Idle;
+		Anim_Idle = Animator.StringToHash("Idle_Fight2");
+		m_Animator.CrossFade(Anim_Idle, 0);
+	}
+
+	public void Update()
+	{
+	}
+
+}
diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs.meta b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta
new file mode 100644
index 00000000..64a58ee0
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 92d46c9d136abdc46bb8fc83c650891f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
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);
 
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
index 9b7bfca5..4cc729b9 100644
--- a/Assets/Scripts/Test/SaionjiScript_Anim.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -52,7 +52,6 @@ public partial class SaionjiScript : Avatar
 		Anim_Gun3 = Animator.StringToHash("Gun03");
 		Anim_Gun4 = Animator.StringToHash("Gun04");
 
-
         Anim_JumpStart = Animator.StringToHash("Jump_Start");
         Anim_JumpUp = Animator.StringToHash("Jump_Up");
         Anim_JumpDown = Animator.StringToHash("Jump_Down");
-- 
cgit v1.1-26-g67d0