From 0d221e6c05d59d812d494f05b9916d85650032eb Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 14 Oct 2020 22:05:02 +0800
Subject: +action

---
 Assets/Scripts/Test/SaionjiScript.cs           |  2 --
 Assets/Scripts/Test/SaionjiScript_Ability.cs   | 15 +++++++-------
 Assets/Scripts/Test/SaionjiScript_Anim.cs      | 28 ++++++++++++++++++++++++++
 Assets/Scripts/Test/SaionjiScript_Anim.cs.meta | 11 ++++++++++
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 Assets/Scripts/Test/SaionjiScript_Anim.cs
 create mode 100644 Assets/Scripts/Test/SaionjiScript_Anim.cs.meta

(limited to 'Assets/Scripts/Test')

diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs
index 84e658de..c252645b 100644
--- a/Assets/Scripts/Test/SaionjiScript.cs
+++ b/Assets/Scripts/Test/SaionjiScript.cs
@@ -29,8 +29,6 @@ public partial class SaionjiScript : MonoBehaviour
 
     private void Update()
     {
-        if(m_CurrentAblity != null)
-            m_CurrentAblity.OnUpdate();
 
         //AnimatorStateInfo info = animator.GetCurrentAnimatorStateInfo(0);
         //if(info.normalizedTime > 0.8)
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs
index 81c74fad..cc6e8caf 100644
--- a/Assets/Scripts/Test/SaionjiScript_Ability.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs
@@ -4,20 +4,19 @@ using UnityEngine;
 
 public partial class SaionjiScript : MonoBehaviour
 {
-    /// <summary>
-    /// 当前的ability
-    /// </summary>
-    AbilityBase m_CurrentAblity;
+	/// <summary>
+	/// ability system
+	/// </summary>
+	AbilitySystem m_AbilitySystem = new AbilitySystem(); 
 
     /// <summary>
     /// 设置abilities
     /// </summary>
     void SetupAbilities()
     {
-        // 基础ability
-
+		IdleAbility idleAbility = new IdleAbility(Anim_Idle);
 
+		m_AbilitySystem.AddAbility(idleAbility);
     }
 
-
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
new file mode 100644
index 00000000..08322b61
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public partial class SaionjiScript : MonoBehaviour
+{
+	int Anim_Idle;
+	int Anim_Run;
+	int Anim_RunStop;
+	int Anim_LightAttack1; 
+	int Anim_LightAttack2; 
+	int Anim_LightAttack3; 
+	int Anim_LightAttack4; 
+	int Anim_LightAttack5; 
+
+	void GetAnimHash()
+	{
+		Anim_Idle = Animator.StringToHash("Idle_Assassin");
+		Anim_Run = Animator.StringToHash("Run_Sword_Fast");
+
+		Anim_LightAttack1 = Animator.StringToHash("Light_Attk_1");
+		Anim_LightAttack2 = Animator.StringToHash("Light_Attk_2");
+		Anim_LightAttack3 = Animator.StringToHash("Light_Attk_3");
+		Anim_LightAttack4 = Animator.StringToHash("Light_Attk_4");
+		Anim_LightAttack5 = Animator.StringToHash("Light_Attk_5");
+	}
+	
+}
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs.meta b/Assets/Scripts/Test/SaionjiScript_Anim.cs.meta
new file mode 100644
index 00000000..4b9e51ec
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8f9ceb597e2e03c45a350f0f607c3d59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
-- 
cgit v1.1-26-g67d0