From 496c3dd2cad91c5ba5795904ed3a233154995eea Mon Sep 17 00:00:00 2001 From: pharan Date: Wed, 25 Apr 2018 09:55:41 +0800 Subject: [PATCH] [unity] Minor cleanup for AnimationReferenceAsset. --- .../spine-unity/Asset Types/AnimationReferenceAsset.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Asset Types/AnimationReferenceAsset.cs b/spine-unity/Assets/spine-unity/Asset Types/AnimationReferenceAsset.cs index b855a0027..e7305cdcd 100644 --- a/spine-unity/Assets/spine-unity/Asset Types/AnimationReferenceAsset.cs +++ b/spine-unity/Assets/spine-unity/Asset Types/AnimationReferenceAsset.cs @@ -34,13 +34,15 @@ using UnityEngine; namespace Spine.Unity { [CreateAssetMenu(menuName = "Spine/Animation Reference Asset")] - public class AnimationReferenceAsset : ScriptableObject { + public class AnimationReferenceAsset : ScriptableObject, IHasSkeletonDataAsset { const bool QuietSkeletonData = true; [SerializeField] protected SkeletonDataAsset skeletonDataAsset; - [SerializeField, SpineAnimation(dataField: "skeletonDataAsset")] protected string animationName; - + [SerializeField, SpineAnimation] protected string animationName; private Animation animation; + + public SkeletonDataAsset SkeletonDataAsset { get { return skeletonDataAsset; } } + public Animation Animation { get { #if AUTOINIT_SPINEREFERENCE @@ -51,7 +53,7 @@ namespace Spine.Unity { return animation; } } - + public void Initialize () { if (skeletonDataAsset == null) return; this.animation = skeletonDataAsset.GetSkeletonData(AnimationReferenceAsset.QuietSkeletonData).FindAnimation(animationName);