summaryrefslogtreecommitdiff
path: root/Assets/Scripts/Unit/Components
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-09 09:39:01 +0800
committerchai <chaifix@163.com>2021-09-09 09:39:01 +0800
commit374b14af851415eb8055bb5251fb064c90f5f271 (patch)
tree20a564db3a37614c374ae5fe27285b166693bded /Assets/Scripts/Unit/Components
parent7163529a1c092e766e26b7d7b7f7b4b71583962b (diff)
*vfx
Diffstat (limited to 'Assets/Scripts/Unit/Components')
-rw-r--r--Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs8
-rw-r--r--Assets/Scripts/Unit/Components/UnitState/PCState.cs9
2 files changed, 11 insertions, 6 deletions
diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
index df074061..cdffc8ed 100644
--- a/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
+++ b/Assets/Scripts/Unit/Components/UnitAnimation/PCAnimation.cs
@@ -57,8 +57,9 @@ public class PCAnimation : UnitAnimation
AirAttack1,
AirAttack2,
AirAttack3,
+ AirAttack4,
- AirDash,
+ AirDash,
LandingGround,
}
@@ -182,10 +183,13 @@ public class PCAnimation : UnitAnimation
if (id == 1) state = EAnimState.AirAttack1;
else if (id == 2) state = EAnimState.AirAttack2;
else if (id == 3) state = EAnimState.AirAttack3;
+ else if (id == 4) state = EAnimState.AirAttack4;
AnimationData data = GetAnimationDataOfGivenState(state.ToString());
Debug.Assert(data != null);
- CrossFade(state, 0.02f, data.GetProperty(EAnimationProperty.ComboTimeOffset, defaultValue: 0));
+ float offset = data.GetProperty(EAnimationProperty.ComboTimeOffset, 0);
+ float duration = data.GetProperty(EAnimationProperty.TransitionInDuration, 0.05f);
+ CrossFade(state, duration, offset);
}
public void AnimAttackToAir(float offset)
diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
index 1d0332cd..b8512d64 100644
--- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs
+++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs
@@ -308,8 +308,9 @@ public class PCState : UnitState
IEnumerator AirAttack(SkillParam param)
{
- int id = 0;
- m_Owner.pcAnimation.AnimAirAttack(id);
+ int total = 5;
+ int id = 0;
+ m_Owner.pcAnimation.AnimAirAttack(id++);
yield return null; // 等待animator更新
while (true)
{
@@ -337,8 +338,8 @@ public class PCState : UnitState
{
TurnAround(true);
}
- ++id;
- m_Owner.pcAnimation.AnimAirAttack(id);
+ m_Owner.pcAnimation.AnimAirAttack(id++);
+ id %= total;
yield return null; // 等待animator更新
yield return new WaitForTransitionDone(m_Owner.pcAnimation);
}