diff options
Diffstat (limited to 'Assets/Scripts')
22 files changed, 317 insertions, 30 deletions
diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs index 067d49a8..a3cda9c9 100644 --- a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs +++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs @@ -12,6 +12,18 @@ public class AttackAbility : AbilityBase /// </summary>
private List<Trigger> m_Triggers = new List<Trigger>();
+ /// <summary>
+ /// 从动画结束开始计时
+ /// </summary>
+ float m_TimeCount;
+ public float ExpireTime
+ {
+ get
+ {
+ return m_TimeCount;
+ }
+ }
+
public AttackAbility(Animator animator, int animation)
{
m_Animator = animator;
@@ -30,11 +42,13 @@ public class AttackAbility : AbilityBase public override void OnEnter()
{
- m_Animator.CrossFade(m_AnimHash, 0);
+ m_TimeCount = 0;
+ m_Animator.CrossFade(m_AnimHash, 0f);
}
public override void OnExit()
{
+ m_TimeCount = 0;
}
public override void OnHit()
@@ -51,6 +65,11 @@ public class AttackAbility : AbilityBase public override void OnUpdate()
{
+ AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0);
+ if(info.shortNameHash == m_AnimHash && info.normalizedTime >= 0.99f)
+ {
+ m_TimeCount += Time.deltaTime;
+ }
foreach (var abilityTrigger in m_Triggers)
{
if (abilityTrigger.Update())
diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs index 8be58188..dfd9478d 100644 --- a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs +++ b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs @@ -23,9 +23,7 @@ public class IdleAbility : AbilityBase public override void OnEnter()
{
- m_Animator.speed = 1;
m_Animator.CrossFade(m_AnimHash, 0.3f);
- m_Animator.speed = 0;
}
public override void OnInit()
diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs index 1c27a487..82b176fd 100644 --- a/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs +++ b/Assets/Scripts/AbilitySystem/Actions/ActionDontUseGravity.cs @@ -2,17 +2,17 @@ using System.Collections.Generic; using UnityEngine; -public class ActionDontUseGravity : MonoBehaviour +public class ActionDontUseGravity : ActionBase { - // Start is called before the first frame update - void Start() - { - - } + PhysicsBody m_Body; - // Update is called once per frame - void Update() - { - - } + public ActionDontUseGravity(PhysicsBody body) + { + m_Body = body; + } + + public override void Execute() + { + m_Body.UseGravity = false; + } } diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs b/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs new file mode 100644 index 00000000..8d888d30 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionTowardLeft : ActionBase +{ + Transform m_Obj; + Vector3 m_Angel = new Vector3(0, -90, 0); + + public ActionTowardLeft(Transform obj) + { + m_Obj = obj; + } + + public override void Execute() + { + m_Obj.rotation = Quaternion.Euler(m_Angel); + } +} diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs.meta new file mode 100644 index 00000000..313b4775 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTowardLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44aaf2eda01524845942fae69a26b5e1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs b/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs new file mode 100644 index 00000000..b7dadf3a --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionTowardRight : ActionBase +{ + Transform m_Obj; + Vector3 m_Angel = new Vector3(0, 90, 0); + + public ActionTowardRight(Transform obj) + { + m_Obj = obj; + } + + public override void Execute() + { + m_Obj.rotation = Quaternion.Euler(m_Angel); + } +} diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs.meta new file mode 100644 index 00000000..1477951b --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTowardRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a2b93c99bf228014392dcff8416c8fe0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs b/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs new file mode 100644 index 00000000..325a3e88 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ActionTurn180 : ActionBase +{ + Transform m_Obj; + Vector3 m_Angel = new Vector3(0, 180, 0); + + public ActionTurn180(Transform obj) + { + m_Obj = obj; + } + + public override void Execute() + { + m_Obj.Rotate(m_Angel); + } +} diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs.meta b/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs.meta new file mode 100644 index 00000000..ee218a48 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Actions/ActionTurn180.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fcc6f64fbe0e7cb48a2db882fe5611c7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs index da83d163..92cf3261 100644 --- a/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs +++ b/Assets/Scripts/AbilitySystem/Actions/ActionUseGravity.cs @@ -4,7 +4,15 @@ using UnityEngine; public class ActionUseGravity : ActionBase { + PhysicsBody m_Body; + + public ActionUseGravity(PhysicsBody body) + { + m_Body = body; + } + public override void Execute() { + m_Body.UseGravity = true; } } diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs new file mode 100644 index 00000000..a3944600 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionAttkExpireTime : ConditionBase +{ + AttackAbility m_Ability; + float m_ExpireTime; + + public ConditionAttkExpireTime(AttackAbility attack, float expireTime) + { + m_Ability = attack; + m_ExpireTime = expireTime; + } + + public override bool Evaluate() + { + return m_Ability.ExpireTime > m_ExpireTime; + } +} + diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs.meta new file mode 100644 index 00000000..80b4d7a7 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAttkExpireTime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 385e621dcc66179459c6f2a2b3b81319 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs index 38889278..73b9b380 100644 --- a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs @@ -16,6 +16,25 @@ public abstract class ConditionBase }
+/// <summary>
+/// 两个condition都达成才会返回真
+/// </summary>
+public sealed class ConditionNot : ConditionBase
+{
+ ConditionBase m_Condition;
+
+
+ public ConditionNot(ConditionBase cond)
+ : base()
+ {
+ m_Condition = cond;
+ }
+
+ public override bool Evaluate()
+ {
+ return !m_Condition.Evaluate();
+ }
+}
/// <summary>
/// 总是满足
diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs new file mode 100644 index 00000000..36cbfd05 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionTowardLeft : ConditionBase +{ + Transform m_Obj; + + public ConditionTowardLeft(Transform obj) + { + m_Obj = obj; + } + + public override bool Evaluate() + { + return Mathf.Approximately(m_Obj.rotation.eulerAngles.y, 270f) + || Mathf.Approximately(m_Obj.rotation.eulerAngles.y, -90f); + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs.meta new file mode 100644 index 00000000..e3a399a6 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e2f90baa8b157234f93cdb949b43cd24 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs new file mode 100644 index 00000000..d26a1fd0 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConditionTowardRight : ConditionBase +{ + Transform m_Obj; + + public ConditionTowardRight(Transform obj) + { + m_Obj = obj; + } + + public override bool Evaluate() + { + return Mathf.Approximately(m_Obj.rotation.eulerAngles.y, 90f); + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs.meta new file mode 100644 index 00000000..901efb57 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionTowardRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab6f3e1b40a1eff4196b069e4fd25469 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/PhysicsBody.cs b/Assets/Scripts/Physics/PhysicsBody.cs index a4ef3aa5..ff5972b4 100644 --- a/Assets/Scripts/Physics/PhysicsBody.cs +++ b/Assets/Scripts/Physics/PhysicsBody.cs @@ -49,6 +49,10 @@ public sealed class PhysicsBody : MonoBehaviour {
return m_UseGravity;
}
+ set
+ {
+ m_UseGravity = value;
+ }
}
[SerializeField]
diff --git a/Assets/Scripts/Physics/PhysicsWorld.cs b/Assets/Scripts/Physics/PhysicsWorld.cs index 444fe392..c2397909 100644 --- a/Assets/Scripts/Physics/PhysicsWorld.cs +++ b/Assets/Scripts/Physics/PhysicsWorld.cs @@ -100,7 +100,7 @@ public class PhysicsWorld : Singleton<PhysicsWorld> {
float deltaTime = 1f / m_UpdateRate;
// animator -> OnAnimatorMove() -> physics
- UpdateAnimator(deltaTime);
+ //UpdateAnimator(deltaTime);
UpdatePrimitives(deltaTime);
}
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs index 871f155f..0ea5f003 100644 --- a/Assets/Scripts/Test/SaionjiScript.cs +++ b/Assets/Scripts/Test/SaionjiScript.cs @@ -20,7 +20,7 @@ public partial class SaionjiScript : MonoBehaviour void Start()
{
animator = GetComponent<Animator>();
- animator.speed = 0;
+ //animator.speed = 0;
PhysicsWorld.Instance.AddAnimator(animator);
Go_PistolL.SetActive(UsePistol);
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 1b248751..375dc631 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -9,6 +9,11 @@ public partial class SaionjiScript : MonoBehaviour /// </summary>
AbilitySystem m_AbilitySystem = new AbilitySystem();
+ ConditionBase Not(ConditionBase cond)
+ {
+ return new ConditionNot(cond);
+ }
+
ConditionBase And(ConditionBase c1, ConditionBase c2)
{
return new ConditionAnd(c1, c2);
@@ -19,18 +24,25 @@ public partial class SaionjiScript : MonoBehaviour return new ConditionOr(c1,c2);
}
- /// <summary>
- /// 设置abilities
- /// </summary>
- void SetupAbilities()
- {
+ /// <summary>
+ /// 设置abilities
+ /// </summary>
+ void SetupAbilities()
+ {
+ // abilities
IdleAbility idle = new IdleAbility(animator, Anim_Idle);
MoveAbility move = new MoveAbility(animator, Anim_Run);
- AttackAbility attk1 = new AttackAbility(animator, Anim_LightAttack1);
- AttackAbility attk2 = new AttackAbility(animator, Anim_LightAttack2);
- AttackAbility attk3 = new AttackAbility(animator, Anim_LightAttack3);
- AttackAbility attk4 = new AttackAbility(animator, Anim_LightAttack4);
- AttackAbility attk5 = new AttackAbility(animator, Anim_LightAttack5);
+ MoveAbility dash = new MoveAbility(animator, Anim_Run);
+ AttackAbility attk1 = new AttackAbility(animator, Anim_LightAttack1);
+ AttackAbility attk2 = new AttackAbility(animator, Anim_LightAttack2);
+ AttackAbility attk3 = new AttackAbility(animator, Anim_LightAttack3);
+ AttackAbility attk4 = new AttackAbility(animator, Anim_LightAttack4);
+ AttackAbility attk5 = new AttackAbility(animator, Anim_LightAttack5);
+
+ // actions
+ ActionTurn180 turn180 = new ActionTurn180(this.transform);
+ ActionTowardLeft towardLeft = new ActionTowardLeft(this.transform);
+ ActionTowardRight towardRight = new ActionTowardRight(this.transform);
ActionSwitchAbility switchToMove = new ActionSwitchAbility(m_AbilitySystem, move);
ActionSwitchAbility switchToIdle = new ActionSwitchAbility(m_AbilitySystem, idle);
@@ -40,41 +52,87 @@ public partial class SaionjiScript : MonoBehaviour ActionSwitchAbility switchToAttk4 = new ActionSwitchAbility(m_AbilitySystem, attk4);
ActionSwitchAbility switchToAttk5 = new ActionSwitchAbility(m_AbilitySystem, attk5);
+ // conditions
+ ConditionCommand condLeftCmd = new ConditionCommand(GamepadButton.Left);
ConditionCommand condRightCmd = new ConditionCommand(GamepadButton.Right);
ConditionNoMoveButtonHold condNoMoveButtonHold = new ConditionNoMoveButtonHold();
+ ConditionButtonHold condRightButtonHold = new ConditionButtonHold(GamepadButton.Right);
+ ConditionButtonHold condLeftButtonHold = new ConditionButtonHold(GamepadButton.Left);
ConditionCommand condCircleCmd = new ConditionCommand(GamepadButton.Circle);
+ ConditionTowardLeft condTowardLeft = new ConditionTowardLeft(this.transform);
+ ConditionTowardRight condTowardRight = new ConditionTowardRight(this.transform);
- Trigger trigger = null;
+ // common triggers
+ Trigger triggerTurnRight = new Trigger(condRightCmd, towardRight);
+ Trigger triggerTurnLeft = new Trigger(condLeftCmd, towardLeft);
- trigger = new Trigger(condRightCmd, switchToMove);
+ Trigger trigger = null;
+
+ // idle ability
+ trigger = new Trigger(condRightCmd, new List<ActionBase> { switchToMove, towardRight});
+ idle.AddTrigger(trigger);
+ trigger = new Trigger(condLeftCmd, new List<ActionBase> { switchToMove, towardLeft});
idle.AddTrigger(trigger);
trigger = new Trigger(condCircleCmd, switchToAttk1);
idle.AddTrigger(trigger);
+ trigger = new Trigger(condLeftCmd, turn180);
+ idle.AddTrigger(trigger);
- trigger = new Trigger(condNoMoveButtonHold, switchToIdle);
+ // move ability
+ trigger = new Trigger(And(condTowardRight, Not(condRightButtonHold)), switchToIdle);
+ move.AddTrigger(trigger);
+ trigger = new Trigger(And(condTowardLeft, Not(condLeftButtonHold)), switchToIdle);
move.AddTrigger(trigger);
trigger = new Trigger(condCircleCmd, switchToAttk1);
move.AddTrigger(trigger);
+ // attack abilities
+ float expireTime = 0.3f;
+
ConditionAnimAtEnd condAttk1AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack1);
trigger = new Trigger(And(condAttk1AtEnd, condCircleCmd), switchToAttk2);
attk1.AddTrigger(trigger);
+ ConditionAttkExpireTime condAttk1ExpireTime = new ConditionAttkExpireTime(attk1, expireTime);
+ trigger = new Trigger(condAttk1ExpireTime, switchToIdle);
+ attk1.AddTrigger(trigger);
+ attk1.AddTrigger(triggerTurnRight);
+ attk1.AddTrigger(triggerTurnLeft);
ConditionAnimAtEnd condAttk2AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack2);
trigger = new Trigger(And(condAttk2AtEnd, condCircleCmd), switchToAttk3);
attk2.AddTrigger(trigger);
+ ConditionAttkExpireTime condAttk2ExpireTime = new ConditionAttkExpireTime(attk2, expireTime);
+ trigger = new Trigger(condAttk2ExpireTime, switchToIdle);
+ attk2.AddTrigger(trigger);
+ attk2.AddTrigger(triggerTurnRight);
+ attk2.AddTrigger(triggerTurnLeft);
ConditionAnimAtEnd condAttk3AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack3);
trigger = new Trigger(And(condAttk3AtEnd, condCircleCmd), switchToAttk4);
attk3.AddTrigger(trigger);
+ ConditionAttkExpireTime condAttk3ExpireTime = new ConditionAttkExpireTime(attk3, expireTime);
+ trigger = new Trigger(condAttk3ExpireTime, switchToIdle);
+ attk3.AddTrigger(trigger);
+ attk3.AddTrigger(triggerTurnRight);
+ attk3.AddTrigger(triggerTurnLeft);
ConditionAnimAtEnd condAttk4AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack4);
trigger = new Trigger(And(condAttk4AtEnd, condCircleCmd), switchToAttk5);
attk4.AddTrigger(trigger);
+ ConditionAttkExpireTime condAttk4ExpireTime = new ConditionAttkExpireTime(attk4, expireTime);
+ trigger = new Trigger(condAttk4ExpireTime, switchToIdle);
+ attk4.AddTrigger(trigger);
+ attk4.AddTrigger(triggerTurnRight);
+ attk4.AddTrigger(triggerTurnLeft);
ConditionAnimAtEnd condAttk5AtEnd = new ConditionAnimAtEnd(animator, Anim_LightAttack5);
trigger = new Trigger(condAttk5AtEnd, switchToIdle);
attk5.AddTrigger(trigger);
+ ConditionAttkExpireTime condAttk5ExpireTime = new ConditionAttkExpireTime(attk5, expireTime);
+ trigger = new Trigger(condAttk5ExpireTime, switchToIdle);
+ attk5.AddTrigger(trigger);
+ attk5.AddTrigger(triggerTurnRight);
+ attk5.AddTrigger(triggerTurnLeft);
m_AbilitySystem.ForceStart(idle);
}
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs index 08322b61..c0ebb95f 100644 --- a/Assets/Scripts/Test/SaionjiScript_Anim.cs +++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs @@ -15,7 +15,7 @@ public partial class SaionjiScript : MonoBehaviour void GetAnimHash() { - Anim_Idle = Animator.StringToHash("Idle_Assassin"); + Anim_Idle = Animator.StringToHash("Idle_Fight"); Anim_Run = Animator.StringToHash("Run_Sword_Fast"); Anim_LightAttack1 = Animator.StringToHash("Light_Attk_1"); |