+animation

4 files changed, 2 insertions, 18 deletions

diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects.meta b/Assets/Scripts/Avatar/Actions/ActionEffects.meta
deleted file mode 100644
index 17a426dd..00000000
--- a/Assets/Scripts/Avatar/Actions/ActionEffects.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0b5ccfefc2e6b104a8566f4da9a16c5f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Avatar/Actions/ActionJump.cs b/Assets/Scripts/Avatar/Actions/ActionJump.cs
index cb3da106..c90e73f4 100644
--- a/Assets/Scripts/Avatar/Actions/ActionJump.cs
+++ b/Assets/Scripts/Avatar/Actions/ActionJump.cs
@@ -16,6 +16,6 @@ public class ActionJump : ActionSwitchAbility
     public override void Execute()

     {

         m_JumpAbility.SetDir(JumpAbility.Direction.Neutral);

-        base.Execute(); // switch to jump ability 

+        base.Execute();

     }

 }

diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
index 4cc729b9..023d5d39 100644
--- a/Assets/Scripts/Test/SaionjiScript_Anim.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -39,7 +39,7 @@ public partial class SaionjiScript : Avatar
 		Anim_LightAttack3 = Animator.StringToHash("Light_Attk_3");
 		Anim_LightAttack4 = Animator.StringToHash("Light_Attk_4");
 		Anim_LightAttack5 = Animator.StringToHash("Light_Attk_5");
-		Anim_LightAttackRush = Animator.StringToHash("Light_Attk_Rush");
+		Anim_LightAttackRush = Animator.StringToHash("Heavy_Attk_Rush_Third");
 
 		Anim_SideKick = Animator.StringToHash("SideKick");
 		Anim_SideKickRush = Animator.StringToHash("SideKickRush");