diff options
Diffstat (limited to 'Assets/Scripts/Test')
| -rw-r--r-- | Assets/Scripts/Test/SaionjiScript.cs | 10 | ||||
| -rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Ability.cs | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs index a3216dd5..f10c9b1d 100644 --- a/Assets/Scripts/Test/SaionjiScript.cs +++ b/Assets/Scripts/Test/SaionjiScript.cs @@ -17,16 +17,6 @@ public partial class SaionjiScript : MonoBehaviour IdleHash = Animator.StringToHash("Idle Fight 0");
}
- private void OnCollisionEnter(Collision collision)
- {
- Debug.Log("OnCollisionEnter()");
- }
-
- private void OnTriggerEnter(Collider other)
- {
- Debug.Log("OnTriggerEnter()");
- }
-
private void Update()
{
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index cc6e8caf..59d55630 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -9,6 +9,16 @@ public partial class SaionjiScript : MonoBehaviour /// </summary>
AbilitySystem m_AbilitySystem = new AbilitySystem();
+ ConditionBase And(ConditionBase c1, ConditionBase c2)
+ {
+ return new ConditionAnd(c1, c2);
+ }
+
+ ConditionBase Or(ConditionBase c1, ConditionBase c2)
+ {
+ return new ConditionOr(c1,c2);
+ }
+
/// <summary>
/// 设置abilities
/// </summary>
|