diff options
Diffstat (limited to 'Assets/Scripts/Unit')
7 files changed, 49 insertions, 15 deletions
diff --git a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs index 1a990252..a9c50ac3 100644 --- a/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs +++ b/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs @@ -216,22 +216,20 @@ public class AnimatorLayerInfo public void OnCrossFade(string animState, float normalizedTransitionDuration, float normalizedTimeOffset, float normalizedTransitionTime ) { - m_CurrentState = animState; - m_Animator.CrossFade(animState.ToString(), normalizedTransitionDuration, layerIndex, normalizedTimeOffset, normalizedTransitionTime); - } - - public void OnPlay(string animState, float normalizedTime) + m_CurrentState = animState;
+ m_Animator.CrossFade(animState.ToString(), normalizedTransitionDuration, layerIndex, normalizedTimeOffset, normalizedTransitionTime);
+ m_TimelineEventProxy.ResetPrevAnimationData();
+ }
+
+ public void OnPlay(string animState, float normalizedTime) { m_CurrentState = animState; - m_Animator.Play(animState, layerIndex, normalizedTime); - } + m_Animator.Play(animState, layerIndex, normalizedTime); + m_TimelineEventProxy.ResetPrevAnimationData();
+ } } -// 控制动画播放、执行动作timeline(包括执行事件和碰撞盒) -// 每个layer同时只会有一个动画在播放，在执行transition时，current animation依然是 -// 这个动作，只有完全过渡完成后才会切到下一个动作 -// 当前是什么动作以ainmator的GetCurrentAnimatorStateInfo为准 [DisallowMultipleComponent] public class UnitAnimation : UnitComponent { diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs index 6bd6fa78..54a48cc2 100644 --- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs +++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs @@ -208,7 +208,7 @@ public class PCState : UnitState IEnumerator Attack(SkillParam param) { - const int total = 3; + const int total = 4; int id = 0; m_Owner.pcAnimation.AnimAttack(id++); yield return null; diff --git a/Assets/Scripts/Unit/Components/UnitState/UnitState.cs b/Assets/Scripts/Unit/Components/UnitState/UnitState.cs index 4896e255..aff1e0f3 100644 --- a/Assets/Scripts/Unit/Components/UnitState/UnitState.cs +++ b/Assets/Scripts/Unit/Components/UnitState/UnitState.cs @@ -9,4 +9,5 @@ using UnityEngine; public class UnitState : UnitComponent { + }
\ No newline at end of file diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs index 9b3ef6e5..63202f29 100644 --- a/Assets/Scripts/Unit/Controller/UnitController.cs +++ b/Assets/Scripts/Unit/Controller/UnitController.cs @@ -45,7 +45,7 @@ public class UnitController : MonoBehaviour/*, Interactable*/ {
get
{
- return transform.rotation.eulerAngles.y == 0 ? true : false;
+ return transform.rotation.eulerAngles.y == 0;
}
}
diff --git a/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs b/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs new file mode 100644 index 00000000..df393a6b --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs @@ -0,0 +1,12 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventGame_TimeScale : AnimationEventBase
+{
+ public override TimelineEventProxy.EEventType type { get { return TimelineEventProxy.EEventType.EventGame_TimeScale; } }
+ public override string shortName { get { return "T"; } }
+
+ public AnimationCurve curve;
+
+}
\ No newline at end of file diff --git a/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta b/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta new file mode 100644 index 00000000..8b5d5745 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventGame_TimeScale.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 227b9bc615c7c8044be9c4547dee5fcf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index e56f590a..de067455 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -16,7 +16,11 @@ public partial class TimelineEventProxy get
{
if (m_Root_Particles == null)
- m_Root_Particles = new GameObject("Root_Particles");
+ {
+ m_Root_Particles = GameObject.Find("Root_Particles");
+ if(m_Root_Particles == null)
+ m_Root_Particles = new GameObject("Root_Particles");
+ }
return m_Root_Particles;
}
}
@@ -25,6 +29,7 @@ public partial class TimelineEventProxy {
get
{
+ m_Root_Projectiles = GameObject.Find("Root_Projectiles");
if (m_Root_Projectiles == null)
m_Root_Projectiles = new GameObject("Root_Projectiles");
return m_Root_Projectiles;
@@ -41,7 +46,9 @@ public partial class TimelineEventProxy #endif public enum EEventType - { + {
+ EventGame_TimeScale, // 缩放时间 + EventCamera_Zoom, // 相机聚焦 EventCamera_Shake, // 相机晃动 EventCamera_Blur, // 相机模糊 @@ -91,6 +98,11 @@ public partial class TimelineEventProxy return type; } + public void ResetPrevAnimationData()
+ {
+ m_PrevAnimationData = null;
+ } + public void ExecuteAnimationEvents(AnimationData animData, float animFrame) { if (animData == null) |