From 7afdc099b52be6dbf6f9f8c9e607b3c6cf2b51f7 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 3 Nov 2020 08:47:00 +0800 Subject: +animation --- Assets/Scripts/Avatar/Actions/ActionEffects.meta | 8 -------- Assets/Scripts/Avatar/Actions/ActionJump.cs | 2 +- Assets/Scripts/Props.meta | 8 -------- Assets/Scripts/Test/SaionjiScript_Anim.cs | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 Assets/Scripts/Avatar/Actions/ActionEffects.meta delete mode 100644 Assets/Scripts/Props.meta (limited to 'Assets/Scripts') 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"); -- cgit v1.1-26-g67d0