From 71c03c717b189ee0ff0e62d219f02b8ab336c40a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 13 Oct 2020 17:20:14 +0800
Subject: +ability system

---
 Assets/Scripts/Test/PhysicsWorldTest.cs           |  2 ++
 Assets/Scripts/Test/SaionjiScript.cs              | 21 +++++++++++++++++++--
 Assets/Scripts/Test/SaionjiScript_Ability.cs      | 23 +++++++++++++++++++++++
 Assets/Scripts/Test/SaionjiScript_Ability.cs.meta | 11 +++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 Assets/Scripts/Test/SaionjiScript_Ability.cs
 create mode 100644 Assets/Scripts/Test/SaionjiScript_Ability.cs.meta

(limited to 'Assets/Scripts/Test')

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: 
-- 
cgit v1.1-26-g67d0