From 71c03c717b189ee0ff0e62d219f02b8ab336c40a Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 13 Oct 2020 17:20:14 +0800 Subject: +ability system --- Assets/Scripts/AbilitySystem/Abilities.meta | 8 ++ .../Scripts/AbilitySystem/Abilities/AbilityBase.cs | 61 ++++++++++++ .../AbilitySystem/Abilities/AbilityBase.cs.meta | 11 +++ .../AbilitySystem/Abilities/AttackAbility.cs | 13 +++ .../AbilitySystem/Abilities/AttackAbility.cs.meta | 11 +++ .../Scripts/AbilitySystem/Abilities/DashAbility.cs | 18 ++++ .../AbilitySystem/Abilities/DashAbility.cs.meta | 11 +++ .../AbilitySystem/Abilities/DodgeAbility.cs | 16 ++++ .../AbilitySystem/Abilities/DodgeAbility.cs.meta | 11 +++ .../Scripts/AbilitySystem/Abilities/HurtAbility.cs | 18 ++++ .../AbilitySystem/Abilities/HurtAbility.cs.meta | 11 +++ .../Scripts/AbilitySystem/Abilities/IdleAbility.cs | 40 ++++++++ .../AbilitySystem/Abilities/IdleAbility.cs.meta | 11 +++ .../Scripts/AbilitySystem/Abilities/MoveAbility.cs | 54 +++++++++++ .../AbilitySystem/Abilities/MoveAbility.cs.meta | 11 +++ Assets/Scripts/AbilitySystem/Conditions.meta | 8 ++ .../Conditions/ConditionAbilitySeq.cs | 26 +++++ .../Conditions/ConditionAbilitySeq.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionAnimAtEnd.cs | 31 ++++++ .../Conditions/ConditionAnimAtEnd.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionAnimRange.cs | 23 +++++ .../Conditions/ConditionAnimRange.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionBase.cs | 105 +++++++++++++++++++++ .../AbilitySystem/Conditions/ConditionBase.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionCombo.cs | 14 +++ .../Conditions/ConditionCombo.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionCommand.cs | 22 +++++ .../Conditions/ConditionCommand.cs.meta | 11 +++ .../Conditions/ConditionCommandSeq.cs | 21 +++++ .../Conditions/ConditionCommandSeq.cs.meta | 11 +++ .../AbilitySystem/Conditions/ConditionInair.cs | 14 +++ .../Conditions/ConditionInair.cs.meta | 11 +++ Assets/Scripts/AbilitySystem/Triggers.meta | 8 ++ .../AbilitySystem/Triggers/AbilityTrigger.cs | 29 ++++++ .../AbilitySystem/Triggers/AbilityTrigger.cs.meta | 11 +++ Assets/Scripts/AbilitySystem/Triggers/Trigger.cs | 32 +++++++ .../Scripts/AbilitySystem/Triggers/Trigger.cs.meta | 11 +++ 37 files changed, 748 insertions(+) create mode 100644 Assets/Scripts/AbilitySystem/Abilities.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs create mode 100644 Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs create mode 100644 Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Triggers.meta create mode 100644 Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs create mode 100644 Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta create mode 100644 Assets/Scripts/AbilitySystem/Triggers/Trigger.cs create mode 100644 Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta (limited to 'Assets/Scripts/AbilitySystem') diff --git a/Assets/Scripts/AbilitySystem/Abilities.meta b/Assets/Scripts/AbilitySystem/Abilities.meta new file mode 100644 index 00000000..4b958769 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 962b8b798c2077c4db88f3828ba14d55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs new file mode 100644 index 00000000..330850e2 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 同一个角色同一个时间只能有一个ability +/// +public abstract class AbilityBase +{ + protected int m_AbilityID; + public int ID + { + get + { + return m_AbilityID; + } + } + + public AbilityBase() + { + m_AbilityID = UIDManager.Acquire(); + } + + public virtual void OnInit() { } + + /// + /// 进入当前ability的回调 + /// + public virtual void OnEnter() { } + + /// + /// 退出当前ability的回调 + /// + public virtual void OnExit() { } + + /// + /// 当前ability的update函数 + /// + public virtual void OnUpdate() { } + + /// + /// 过渡到下一个ability的回调 + /// + /// + public virtual void OnTranslate(AbilityBase to) { } + + /// + /// 检测到hitbox碰撞时的回调 + /// + public virtual void OnHit() { } + + /// + /// 检测到hurtbox碰撞时的回调 + /// + public virtual void OnHurt() { } + + /// + /// 检测到defendbox碰撞时的回调 + /// + public virtual void OnDefend() { } +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta new file mode 100644 index 00000000..79a6b7eb --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/AbilityBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3b3cfab4bd1dd74bb539687535b58f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs new file mode 100644 index 00000000..39298b6f --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 攻击ability +/// +public class AttackAbilityBase : AbilityBase +{ + // 攻击ability默认都会回到idle + + +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta new file mode 100644 index 00000000..4159d2bc --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/AttackAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eefcc728a2660c0459b0d79230cc4dec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs new file mode 100644 index 00000000..b9a479b5 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DashAbility : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta new file mode 100644 index 00000000..c246c665 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/DashAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d5a31f4a65fbba429d0a2ff3b3a49a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs new file mode 100644 index 00000000..79e8fc61 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +/// +/// Dodge ability +/// +public class DodgeAbility : AbilityBase +{ + public DodgeAbility() + { + + } + +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta new file mode 100644 index 00000000..e7297a88 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/DodgeAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 838e30895704e13479bfb0f5c06229e5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs new file mode 100644 index 00000000..7a5c00df --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HurtAbility : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta new file mode 100644 index 00000000..0e70d0be --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/HurtAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6984a899f4c7f574a8dbffe0372c6c2e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs new file mode 100644 index 00000000..c323d99e --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public class IdleAbility : AbilityBase +{ + /// + /// idle的动画 + /// + int m_AnimHash; + + /// + /// 在Idle状态时可以切换的ability + /// + private List m_AbilityTriggers; + + public IdleAbility(int hash) + : base() + { + m_AnimHash = hash; + } + + public override void OnInit() + { + base.OnInit(); + } + + public override void OnUpdate() + { + foreach(var trigger in m_AbilityTriggers) + { + if (trigger.Update()) + break; + } + + base.OnUpdate(); + } + +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta new file mode 100644 index 00000000..07d0c292 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/IdleAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 367ca0f7efe3fe14baf88eb3ce60a78b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs new file mode 100644 index 00000000..b2d7356b --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs @@ -0,0 +1,54 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MoveAbility : AbilityBase +{ + + /// + /// 在跑动状态时可以切换的ability + /// + private List m_AbilityTriggers; + + public override void OnInit() + { + + } + + public override void OnDefend() + { + throw new System.NotImplementedException(); + } + + public override void OnEnter() + { + + } + + public override void OnExit() + { + } + + public override void OnHit() + { + throw new System.NotImplementedException(); + } + + public override void OnHurt() + { + } + + public override void OnTranslate(AbilityBase to) + { + throw new System.NotImplementedException(); + } + + public override void OnUpdate() + { + foreach (var trigger in m_AbilityTriggers) + { + if (trigger.Update()) + break; + } + } +} diff --git a/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta new file mode 100644 index 00000000..08b2954c --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Abilities/MoveAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4581355020e27084f869d6001787e11e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions.meta b/Assets/Scripts/AbilitySystem/Conditions.meta new file mode 100644 index 00000000..0bfa1b8d --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d3b745adf374e14b9f4e095c52ef3d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs new file mode 100644 index 00000000..b55cacb8 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 记录之前的ability序列满足某个序列 +/// combo的时候根据当前序列决定combo +/// +public class ConditionAbilitySeq : ConditionBase +{ + List m_TargetAbilitySeq = new List(); + + public ConditionAbilitySeq(List commandSeq) + : base() + { + m_TargetAbilitySeq = commandSeq; + } + + public override bool Evaluate() + { + // 验证记录的abilitySeq是否满足 + + + throw new System.NotImplementedException(); + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta new file mode 100644 index 00000000..5070f1cc --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAbilitySeq.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7bbf0480c45c29843b8ba41229bb29b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs new file mode 100644 index 00000000..019c16a9 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 动画已经播放完毕 +/// +public class ConditionAnimAtEnd : ConditionBase +{ + Animator m_Animator; + int m_AnimationHash; + + public ConditionAnimAtEnd(Animator animator, int animationHash) + : base() + { + m_Animator = animator; + m_AnimationHash = animationHash; + } + + public override bool Evaluate() + { + AnimatorStateInfo info = m_Animator.GetCurrentAnimatorStateInfo(0); + if(info.fullPathHash == m_AnimationHash) + { + float t = info.normalizedTime; + if (t >= 0.99f) + return true; + } + return false; + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta new file mode 100644 index 00000000..1688dd68 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimAtEnd.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5cbdf2ebe12b5d46afa21a62609d15c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs new file mode 100644 index 00000000..c41e17e1 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 某个动画是否播放到了某个时间（归一化了的）范围内 +/// +public sealed class ConditionAnimRange : ConditionBase +{ + Vector2 m_TimeRange = new Vector2(); + + public ConditionAnimRange(float start, float end) + { + m_TimeRange.Set(start, end); + + } + + public override bool Evaluate() + { + return false; + } + +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta new file mode 100644 index 00000000..926a8560 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionAnimRange.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 56b6b5bfaf0d4e147a2f0f1809e7739b +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 new file mode 100644 index 00000000..c14624ad --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs @@ -0,0 +1,105 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 触发条件基类 +/// +public abstract class ConditionBase +{ + + public ConditionBase() + { + } + + public abstract bool Evaluate(); + +} + + +/// +/// 总是满足 +/// +public sealed class ConditionAlways : ConditionBase +{ + public override bool Evaluate() + { + return true; + } +} + +/// +/// 总是不满足 +/// +public sealed class ConditionAlwaysNot : ConditionBase +{ + public override bool Evaluate() + { + return false; + } +} + +/// +/// 两个condition都达成才会返回真 +/// +public sealed class ConditionAnd : ConditionBase +{ + ConditionBase m_FirstCondition, m_LastCondition; + + + public ConditionAnd(ConditionBase first, ConditionBase last) + : base() + { + m_FirstCondition = first; + m_LastCondition = last; + } + + public override bool Evaluate() + { + return m_FirstCondition.Evaluate() && m_LastCondition.Evaluate(); + } +} + +/// +/// 两个condition至少一个达成才会返回真 +/// +public sealed class ConditionOr : ConditionBase +{ + ConditionBase m_FirstCondition, m_LastCondition; + + + public ConditionOr(ConditionBase first, ConditionBase last) + : base() + { + m_FirstCondition = first; + m_LastCondition = last; + } + + public override bool Evaluate() + { + return m_FirstCondition.Evaluate() || m_LastCondition.Evaluate(); + } +} + + +/// +/// 两个condition都不达成才会返回真 +/// +public sealed class ConditionNone : ConditionBase +{ + ConditionBase m_FirstCondition, m_LastCondition; + + public ConditionNone(ConditionBase first, ConditionBase last) + : base() + { + m_FirstCondition = first; + m_LastCondition = last; + } + + public override bool Evaluate() + { + return !m_FirstCondition.Evaluate() && !m_LastCondition.Evaluate(); + } +} + + diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta new file mode 100644 index 00000000..4c321ffd --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21029775aaf8cdd4a868a45725313c3a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs new file mode 100644 index 00000000..7664a891 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 连击操作，综合ConditionAnimRange和ConditionCommand +/// +public class ConditionCombo : ConditionBase +{ + public override bool Evaluate() + { + throw new System.NotImplementedException(); + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta new file mode 100644 index 00000000..45582943 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCombo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 015528a2fbc923f45b1e25c11a6ade2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs new file mode 100644 index 00000000..420fecc5 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 按下某个command +/// +public class ConditionCommand : ConditionBase +{ + Command m_TargetCommand; + + public ConditionCommand(Command command) + { + m_TargetCommand = command; + } + + public override bool Evaluate() + { + return false; + } + +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta new file mode 100644 index 00000000..100638e6 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6334908b568b7c046bbeb3f526f95841 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs new file mode 100644 index 00000000..69570487 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 一个command序列，一般用来触发连击 +/// +public class ConditionCommandSeq : ConditionBase +{ + + + public ConditionCommandSeq() + { + + } + + public override bool Evaluate() + { + throw new System.NotImplementedException(); + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta new file mode 100644 index 00000000..fc77bd3c --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionCommandSeq.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7316354e3f99412419c866e0fc3906c6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs new file mode 100644 index 00000000..c047b50c --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 某个角色是否浮空 +/// +public class ConditionInair : ConditionBase +{ + public override bool Evaluate() + { + return false; + } +} diff --git a/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta new file mode 100644 index 00000000..8bbf610f --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Conditions/ConditionInair.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8855eebdb67a2cc4baeb2a21e5b40ed4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Triggers.meta b/Assets/Scripts/AbilitySystem/Triggers.meta new file mode 100644 index 00000000..e21c195a --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Triggers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12ea28314544c614e915aa9b791d8611 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs new file mode 100644 index 00000000..34dda3b2 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 在ability的某一帧切换到某个ability的trigger +/// +public class AbilityTrigger : Trigger +{ + AbilityBase m_TargetAbility; + + public AbilityTrigger(ConditionBase condition, AbilityBase target) + : base(condition) + { + m_TargetAbility = target; + } + + public override bool Update() + { + // 如果满足条件，切换到下一个ability + if (IsFulfilled()) + { + + return true; + } + return base.Update(); + } + +} diff --git a/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta new file mode 100644 index 00000000..826e50cf --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Triggers/AbilityTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e69d951b4141e5646984e501aae2cbff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs new file mode 100644 index 00000000..178932fd --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 不同效果的trigger基础这个基类 +/// + +public abstract class Trigger +{ + protected ConditionBase m_Condition; + + public Trigger(ConditionBase condition) + { + m_Condition = condition; + } + + protected bool IsFulfilled() + { + return m_Condition.Evaluate(); + } + + /// + /// 如果触发执行了，返回true,否则返回false + /// + /// + public virtual bool Update() + { + return false; + } + +} diff --git a/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta new file mode 100644 index 00000000..91d7d1b8 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/Triggers/Trigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8c2bda4ac997ddc4e8e9e38c7c718882 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0