diff --git a/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs b/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs index c76b3387d..79a21abbf 100644 --- a/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs +++ b/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs @@ -35,14 +35,17 @@ namespace BF public void PlayAnimation(string animName, bool loop, bool forceRefresh) { -#if UNITY_EDITOR Spine.Animation animation = skeletonGraphic.skeletonDataAsset.GetAnimationStateData().SkeletonData.FindAnimation(animName); +#if UNITY_EDITOR if(BFLog.LogAssert(animation != null, this.gameObject.name + " not have animation: " + animName + " \n")) { return; } #endif - + if (animation == null) + { + return; + } animationState.SetAnimation(0, animName, loop); if (forceRefresh) { @@ -251,17 +254,20 @@ namespace BF { List times = new List(); var animation = skeletonGraphic.skeletonDataAsset.GetAnimationStateData().SkeletonData.FindAnimation(name); - foreach (var timeline in animation.Timelines) - { - var eventTimeline = timeline as Spine.EventTimeline; - if (eventTimeline != null && eventTimeline.Events.Length > 0) + if (animation != null){ + foreach (var timeline in animation.Timelines) { - foreach (var eventInfo in eventTimeline.Events) + var eventTimeline = timeline as Spine.EventTimeline; + if (eventTimeline != null && eventTimeline.Events.Length > 0) { - times.Add(eventInfo.Time); + foreach (var eventInfo in eventTimeline.Events) + { + times.Add(eventInfo.Time); + } } } } + return times; } diff --git a/Assets/arts/spines/characters/m10063/m10063.skel.bytes b/Assets/arts/spines/characters/m10063/m10063.skel.bytes index 57c4d30fb..a055690e9 100644 Binary files a/Assets/arts/spines/characters/m10063/m10063.skel.bytes and b/Assets/arts/spines/characters/m10063/m10063.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20013/m20013.png b/Assets/arts/spines/characters/m20013/m20013.png index 6173ae91e..9322664df 100644 Binary files a/Assets/arts/spines/characters/m20013/m20013.png and b/Assets/arts/spines/characters/m20013/m20013.png differ diff --git a/Assets/arts/spines/characters/m20013/m20013.skel.bytes b/Assets/arts/spines/characters/m20013/m20013.skel.bytes index 333378073..c93e283be 100644 Binary files a/Assets/arts/spines/characters/m20013/m20013.skel.bytes and b/Assets/arts/spines/characters/m20013/m20013.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20016/m20016.skel.bytes b/Assets/arts/spines/characters/m20016/m20016.skel.bytes index d451dc1f3..0d78297a0 100644 Binary files a/Assets/arts/spines/characters/m20016/m20016.skel.bytes and b/Assets/arts/spines/characters/m20016/m20016.skel.bytes differ diff --git a/Assets/lua/app/bf/unity/character_spine_object.lua.bytes b/Assets/lua/app/bf/unity/character_spine_object.lua.bytes index cf614cb9e..3e48ebcba 100644 Binary files a/Assets/lua/app/bf/unity/character_spine_object.lua.bytes and b/Assets/lua/app/bf/unity/character_spine_object.lua.bytes differ