diff --git a/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs b/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs index 1f7038d5f..f00965683 100644 --- a/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs +++ b/Assets/Scripts/Component/Helper/CharacterSpineHelper.cs @@ -247,19 +247,22 @@ namespace BF return animation.Duration; } - public float GetAnimationKeyFrameTime(string name) + public List GetAnimationKeyFrameTime(string name) { - float time = 0.0f; + 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) { - time = eventTimeline.Events[0].Time; + foreach (var eventInfo in eventTimeline.Events) + { + times.Add(eventInfo.Time); + } } } - return time; + return times; } public void SetDefaultMix(float mixDuration) diff --git a/Assets/XLua/Gen/BF_CharacterSpineHelperWrap.cs b/Assets/XLua/Gen/BF_CharacterSpineHelperWrap.cs index e939181dd..16a1c17f6 100644 --- a/Assets/XLua/Gen/BF_CharacterSpineHelperWrap.cs +++ b/Assets/XLua/Gen/BF_CharacterSpineHelperWrap.cs @@ -729,7 +729,7 @@ namespace XLua.CSObjectWrap string _name = LuaAPI.lua_tostring(L, 2); var gen_ret = gen_to_be_invoked.GetAnimationKeyFrameTime( _name ); - LuaAPI.lua_pushnumber(L, gen_ret); + translator.Push(L, gen_ret);