summaryrefslogtreecommitdiff
path: root/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2022-06-22 21:23:46 +0800
committerchai <chaifix@163.com>2022-06-22 21:23:46 +0800
commit11bd605dadecb7459bc60fcda33e2e7d8275ed5d (patch)
tree1b4e52089ef361899f3028d46ce66660d9f22172 /Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
parent75d25b755500b4117e909d50943bd14056a6ccf2 (diff)
- multilayer\old animation solution
Diffstat (limited to 'Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs')
-rw-r--r--Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs80
1 files changed, 66 insertions, 14 deletions
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
index 931e49ab..653564b7 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitAnimation/UnitAnimation.cs
@@ -240,24 +240,23 @@ public class AnimatorLayerInfo
playbackSpeed = 1;
}
-
}
[DisallowMultipleComponent]
public class UnitAnimation : UnitComponent
{
- public AnimatorLayerInfo[] layers { get { return m_LayerInfo; } }
+ protected AnimatorLayerInfo[] layers { get { return m_LayerInfo; } }
protected AnimatorLayerInfo[] m_LayerInfo;
public Animator animator { get { return m_Animator; } }
protected Animator m_Animator;
- public virtual AnimatorLayerInfo baseLayer
+ protected virtual AnimatorLayerInfo baseLayer
{
get { return layers[0]; }
- }
-
- public AnimatorLayerInfo layer
+ }
+
+ protected AnimatorLayerInfo layer
{
get
{
@@ -273,18 +272,71 @@ public class UnitAnimation : UnitComponent
}
}
- public override void OnUpdate()
+ public AnimationData animationData
+ {
+ get
+ {
+ return layer.animationData;
+ }
+ }
+
+ public AnimatorClipInfo[] clipsInfo
+ {
+ get
+ {
+ return layer.clipsInfo;
+ }
+ }
+
+ public AnimatorClipInfo clipInfo
+ {
+ get
+ {
+ return layer.clipInfo;
+ }
+ }
+
+ public float playbackNormalizedTime
+ {
+ get
+ {
+ return layer.playbackNormalizedTime;
+ }
+ }
+
+ public AnimatorStateInfo stateInfo
+ {
+ get
+ {
+ return layer.stateInfo;
+ }
+ }
+
+ public int stateHash
+ {
+ get
+ {
+ return layer.stateHash;
+ }
+ }
+
+ public override void OnUpdate()
{
base.OnUpdate();
}
- /// <summary>
- /// 直接播放动作
- /// </summary>
- /// <param name="animState"></param>
- /// <param name="layerIndex"></param>
- /// <param name="normalizedTime"></param>
- public void Play(string animState, int layerIndex = 0, float normalizedTime = float.NegativeInfinity)
+ public bool IsToggleOpen(EAnimationToogle toggle)
+ {
+ return layer.IsToggleOpen(toggle);
+ }
+
+ /// <summary>
+ /// 直接播放动作
+ /// </summary>
+ /// <param name="animState"></param>
+ /// <param name="layerIndex"></param>
+ /// <param name="normalizedTime"></param>
+ public void Play(string animState, int layerIndex = 0, float normalizedTime = float.NegativeInfinity)
{
AnimatorLayerInfo layer = this.layers[layerIndex];
if (layer == null)