+ attk rush

+ kick rush

2 files changed, 41 insertions, 2 deletions

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<ActionBase> { wipeCmdRecord, switchToDash });

 		move.AddTrigger(trigger);

+		trigger = new Trigger(And(condRightButtonHold, condCircleCmd), new List<ActionBase> { towardRight, switchToAttkRush });

+		move.AddTrigger(trigger);

+		trigger = new Trigger(And(condLeftButtonHold, condCircleCmd), new List<ActionBase> { towardLeft, switchToAttkRush });

+		move.AddTrigger(trigger);

+		trigger = new Trigger(And(condRightButtonHold, condCrossCmd), new List<ActionBase> { towardRight, switchToSideKickRush });

+		move.AddTrigger(trigger);

+		trigger = new Trigger(And(condLeftButtonHold, condCrossCmd), new List<ActionBase> { 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<ActionBase> { towardRight, switchToAttkRush });

+		sideKickRush.AddTrigger(trigger);

+		trigger = new Trigger(And(condSideKickRushAnimRange, And(condLeftButtonHold, condCircleCmd)), new List<ActionBase> { towardLeft, switchToAttkRush });

+		sideKickRush.AddTrigger(trigger);

+

 		// super kick combo

 		ConditionAttkExpireTime condSuperKickExpireTime = new ConditionAttkExpireTime(superKick, expireTime);

 		trigger = new Trigger(condSuperKickExpireTime, switchToIdle);

diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
index 1b99ce35..082729f7 100644
--- a/Assets/Scripts/Test/SaionjiScript_Anim.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -12,7 +12,9 @@ public partial class SaionjiScript : MonoBehaviour
 	int Anim_LightAttack3; 
 	int Anim_LightAttack4; 
 	int Anim_LightAttack5;
+	int Anim_LightAttackRush;
 	int Anim_SideKick;
+	int Anim_SideKickRush;
 	int Anim_DashWithSword;
 	int Anim_SuperKick;
 	int Anim_Gun1;
@@ -22,8 +24,9 @@ public partial class SaionjiScript : MonoBehaviour
 
 	void GetAnimHash()
 	{
-		Anim_Idle = Animator.StringToHash("Idle_Gun");
+		//Anim_Idle = Animator.StringToHash("Idle_Gun");
 		//Anim_Idle = Animator.StringToHash("Idle_Fight");
+		Anim_Idle = Animator.StringToHash("Idle_Fight2");
 		Anim_Run = Animator.StringToHash("Run_Sword_Fast");
 
 		Anim_LightAttack1 = Animator.StringToHash("Light_Attk_1");
@@ -31,9 +34,10 @@ public partial class SaionjiScript : MonoBehaviour
 		Anim_LightAttack3 = Animator.StringToHash("Light_Attk_3");
 		Anim_LightAttack4 = Animator.StringToHash("Light_Attk_4");
 		Anim_LightAttack5 = Animator.StringToHash("Light_Attk_5");
+		Anim_LightAttackRush = Animator.StringToHash("Light_Attk_Rush");
 
 		Anim_SideKick = Animator.StringToHash("SideKick");
-
+		Anim_SideKickRush = Animator.StringToHash("SideKickRush");
 		Anim_SuperKick = Animator.StringToHash("SuperKickCombo");
 
 		Anim_DashWithSword = Animator.StringToHash("Dash_With_Sword");