diff options
| author | chai <chaifix@163.com> | 2020-10-13 17:20:14 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2020-10-13 17:20:14 +0800 |
| commit | 71c03c717b189ee0ff0e62d219f02b8ab336c40a (patch) | |
| tree | 395ce6c55f1876ca6451c706e38a95d0bcbf70a6 /Assets/Scripts | |
| parent | fc6de82e75310b4c007d80753a5f58e6692f4855 (diff) | |
+ability system
Diffstat (limited to 'Assets/Scripts')
60 files changed, 1062 insertions, 2 deletions
diff --git a/Assets/Scripts/AbilitySystem.meta b/Assets/Scripts/AbilitySystem.meta new file mode 100644 index 00000000..11b04f5f --- /dev/null +++ b/Assets/Scripts/AbilitySystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10a2e913d181351499510c4c95e3eaae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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;
+
+/// <summary>
+/// 同一个角色同一个时间只能有一个ability
+/// </summary>
+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() { }
+
+ /// <summary>
+ /// 进入当前ability的回调
+ /// </summary>
+ public virtual void OnEnter() { }
+
+ /// <summary>
+ /// 退出当前ability的回调
+ /// </summary>
+ public virtual void OnExit() { }
+
+ /// <summary>
+ /// 当前ability的update函数
+ /// </summary>
+ public virtual void OnUpdate() { }
+
+ /// <summary>
+ /// 过渡到下一个ability的回调
+ /// </summary>
+ /// <param name="to"></param>
+ public virtual void OnTranslate(AbilityBase to) { }
+
+ /// <summary>
+ /// 检测到hitbox碰撞时的回调
+ /// </summary>
+ public virtual void OnHit() { }
+
+ /// <summary>
+ /// 检测到hurtbox碰撞时的回调
+ /// </summary>
+ public virtual void OnHurt() { }
+
+ /// <summary>
+ /// 检测到defendbox碰撞时的回调
+ /// </summary>
+ 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;
+
+/// <summary>
+/// 攻击ability
+/// </summary>
+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;
+
+
+/// <summary>
+/// Dodge ability
+/// </summary>
+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
+{
+ /// <summary>
+ /// idle的动画
+ /// </summary>
+ int m_AnimHash;
+
+ /// <summary>
+ /// 在Idle状态时可以切换的ability
+ /// </summary>
+ private List<AbilityTrigger> 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
+{
+
+ /// <summary>
+ /// 在跑动状态时可以切换的ability
+ /// </summary>
+ private List<AbilityTrigger> 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;
+
+/// <summary>
+/// 记录之前的ability序列满足某个序列
+/// combo的时候根据当前序列决定combo
+/// </summary>
+public class ConditionAbilitySeq : ConditionBase
+{
+ List<int> m_TargetAbilitySeq = new List<int>();
+
+ public ConditionAbilitySeq(List<int> 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;
+
+/// <summary>
+/// 动画已经播放完毕
+/// </summary>
+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;
+
+/// <summary>
+/// 某个动画是否播放到了某个时间（归一化了的）范围内
+/// </summary>
+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;
+
+/// <summary>
+/// 触发条件基类
+/// </summary>
+public abstract class ConditionBase
+{
+
+ public ConditionBase()
+ {
+ }
+
+ public abstract bool Evaluate();
+
+}
+
+
+/// <summary>
+/// 总是满足
+/// </summary>
+public sealed class ConditionAlways : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ return true;
+ }
+}
+
+/// <summary>
+/// 总是不满足
+/// </summary>
+public sealed class ConditionAlwaysNot : ConditionBase
+{
+ public override bool Evaluate()
+ {
+ return false;
+ }
+}
+
+/// <summary>
+/// 两个condition都达成才会返回真
+/// </summary>
+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();
+ }
+}
+
+/// <summary>
+/// 两个condition至少一个达成才会返回真
+/// </summary>
+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();
+ }
+}
+
+
+/// <summary>
+/// 两个condition都不达成才会返回真
+/// </summary>
+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;
+
+/// <summary>
+/// 连击操作，综合ConditionAnimRange和ConditionCommand
+/// </summary>
+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;
+
+/// <summary>
+/// 按下某个command
+/// </summary>
+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;
+
+/// <summary>
+/// 一个command序列，一般用来触发连击
+/// </summary>
+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;
+
+/// <summary>
+/// 某个角色是否浮空
+/// </summary>
+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;
+
+/// <summary>
+/// 在ability的某一帧切换到某个ability的trigger
+/// </summary>
+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;
+
+/// <summary>
+/// 不同效果的trigger基础这个基类
+/// </summary>
+
+public abstract class Trigger
+{
+ protected ConditionBase m_Condition;
+
+ public Trigger(ConditionBase condition)
+ {
+ m_Condition = condition;
+ }
+
+ protected bool IsFulfilled()
+ {
+ return m_Condition.Evaluate();
+ }
+
+ /// <summary>
+ /// 如果触发执行了，返回true,否则返回false
+ /// </summary>
+ /// <returns></returns>
+ 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: diff --git a/Assets/Scripts/Input.meta b/Assets/Scripts/Input.meta new file mode 100644 index 00000000..a2be21ee --- /dev/null +++ b/Assets/Scripts/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb96fc16498194f4193cd4430c82574e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Input/CommandType.cs b/Assets/Scripts/Input/CommandType.cs new file mode 100644 index 00000000..3c537383 --- /dev/null +++ b/Assets/Scripts/Input/CommandType.cs @@ -0,0 +1,21 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+public enum Command
+{
+ // 方向键
+ Left,
+ Right,
+ Top,
+ Bottom,
+
+ // 操作键
+ Triangle, // △
+ Cross, // ×
+ Square, // □
+ Circle, // ○
+}
+
+
diff --git a/Assets/Scripts/Input/CommandType.cs.meta b/Assets/Scripts/Input/CommandType.cs.meta new file mode 100644 index 00000000..f2802802 --- /dev/null +++ b/Assets/Scripts/Input/CommandType.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e105d6d96dd08e8499e6a4254d289e99 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Input/InputManager.cs b/Assets/Scripts/Input/InputManager.cs new file mode 100644 index 00000000..098190bc --- /dev/null +++ b/Assets/Scripts/Input/InputManager.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InputManager : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Input/InputManager.cs.meta b/Assets/Scripts/Input/InputManager.cs.meta new file mode 100644 index 00000000..234b6d17 --- /dev/null +++ b/Assets/Scripts/Input/InputManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26195ae7cb9459e498256c387da7273e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics.meta b/Assets/Scripts/Physics.meta new file mode 100644 index 00000000..2296b3f8 --- /dev/null +++ b/Assets/Scripts/Physics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 603d4624aaedd794cb89497954a83f4a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/Box.cs b/Assets/Scripts/Physics/Box.cs new file mode 100644 index 00000000..1f022f51 --- /dev/null +++ b/Assets/Scripts/Physics/Box.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NewBehaviourScript : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/Box.cs.meta b/Assets/Scripts/Physics/Box.cs.meta new file mode 100644 index 00000000..528c7474 --- /dev/null +++ b/Assets/Scripts/Physics/Box.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 637138a0ba30abc498c5c9dcf6bb5d78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/DefendBox.cs b/Assets/Scripts/Physics/DefendBox.cs new file mode 100644 index 00000000..730fe640 --- /dev/null +++ b/Assets/Scripts/Physics/DefendBox.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DefendBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/DefendBox.cs.meta b/Assets/Scripts/Physics/DefendBox.cs.meta new file mode 100644 index 00000000..bc2f10ad --- /dev/null +++ b/Assets/Scripts/Physics/DefendBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cb44b541bd6b6f747bb9079c7249d23f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/HitBox.cs b/Assets/Scripts/Physics/HitBox.cs new file mode 100644 index 00000000..09e1f90a --- /dev/null +++ b/Assets/Scripts/Physics/HitBox.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AttackBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/HitBox.cs.meta b/Assets/Scripts/Physics/HitBox.cs.meta new file mode 100644 index 00000000..f220b38f --- /dev/null +++ b/Assets/Scripts/Physics/HitBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 73d73d5d2dc8d324b8b75ccd818af01d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/HurtBox.cs b/Assets/Scripts/Physics/HurtBox.cs new file mode 100644 index 00000000..c7fd97bd --- /dev/null +++ b/Assets/Scripts/Physics/HurtBox.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HurtBox : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/HurtBox.cs.meta b/Assets/Scripts/Physics/HurtBox.cs.meta new file mode 100644 index 00000000..c74284f1 --- /dev/null +++ b/Assets/Scripts/Physics/HurtBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fdb3c8999ca3f954e81886171ce9517f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Physics/PhysicsUtils.cs b/Assets/Scripts/Physics/PhysicsUtils.cs new file mode 100644 index 00000000..752e15a5 --- /dev/null +++ b/Assets/Scripts/Physics/PhysicsUtils.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PhysicsUtils : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Physics/PhysicsUtils.cs.meta b/Assets/Scripts/Physics/PhysicsUtils.cs.meta new file mode 100644 index 00000000..b47b63fc --- /dev/null +++ b/Assets/Scripts/Physics/PhysicsUtils.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d859c78cbe7a7db4881bfd4d0274a16e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Test/PhysicsWorldTest.cs b/Assets/Scripts/Test/PhysicsWorldTest.cs index 7c177213..d1c240a5 100644 --- a/Assets/Scripts/Test/PhysicsWorldTest.cs +++ b/Assets/Scripts/Test/PhysicsWorldTest.cs @@ -4,6 +4,8 @@ using UnityEngine; public class PhysicsWorldTest : MonoBehaviour
{
+
+
// Start is called before the first frame update
void Start()
{
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs index 67a042bd..84e658de 100644 --- a/Assets/Scripts/Test/SaionjiScript.cs +++ b/Assets/Scripts/Test/SaionjiScript.cs @@ -2,14 +2,19 @@ using System.Collections.Generic;
using UnityEngine;
-public class SaionjiScript : MonoBehaviour
+public partial class SaionjiScript : MonoBehaviour
{
HitBoxTest hitbox;
+ Animator animator;
+
+ int IdleHash;
// Start is called before the first frame update
void Start()
{
-
+ animator = GetComponent<Animator>();
+ // SetupAbilities();
+ IdleHash = Animator.StringToHash("Idle Fight 0");
}
private void OnCollisionEnter(Collision collision)
@@ -22,4 +27,16 @@ public class SaionjiScript : MonoBehaviour Debug.Log("OnTriggerEnter()");
}
+ private void Update()
+ {
+ if(m_CurrentAblity != null)
+ m_CurrentAblity.OnUpdate();
+
+ //AnimatorStateInfo info = animator.GetCurrentAnimatorStateInfo(0);
+ //if(info.normalizedTime > 0.8)
+ //{
+ // animator.CrossFade(IdleHash, 0.11f);
+ //}
+ }
+
}
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs new file mode 100644 index 00000000..81c74fad --- /dev/null +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -0,0 +1,23 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public partial class SaionjiScript : MonoBehaviour
+{
+ /// <summary>
+ /// 当前的ability
+ /// </summary>
+ AbilityBase m_CurrentAblity;
+
+ /// <summary>
+ /// 设置abilities
+ /// </summary>
+ void SetupAbilities()
+ {
+ // 基础ability
+
+
+ }
+
+
+}
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta b/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta new file mode 100644 index 00000000..10e51e09 --- /dev/null +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1421bbd1c6a776d4b9dd2340b37d9a8b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utils/UIDManager.cs b/Assets/Scripts/Utils/UIDManager.cs new file mode 100644 index 00000000..3283de4e --- /dev/null +++ b/Assets/Scripts/Utils/UIDManager.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIDManager
+{
+ static int id = 0;
+
+ /// <summary>
+ /// 拿一个id
+ /// </summary>
+ /// <returns></returns>
+ public static int Acquire()
+ {
+ return ++id;
+ }
+
+}
diff --git a/Assets/Scripts/Utils/UIDManager.cs.meta b/Assets/Scripts/Utils/UIDManager.cs.meta new file mode 100644 index 00000000..4a2a8ee0 --- /dev/null +++ b/Assets/Scripts/Utils/UIDManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 67355920ae292904288feb5dc3f089bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |