diff --git a/client/Assets/Game/Scripts/Timeline/TimelineManager.cs b/client/Assets/Game/Scripts/Timeline/TimelineManager.cs index de9f59a..40ee3db 100644 --- a/client/Assets/Game/Scripts/Timeline/TimelineManager.cs +++ b/client/Assets/Game/Scripts/Timeline/TimelineManager.cs @@ -64,14 +64,16 @@ namespace Game foreach (var clip in timeline.Timeline.Clips) { var clipReal = clip.Clip; - if (clipReal.StartTime <= to) + if (clipReal.StartTime <= to && clipReal.EndTime > to) { clipReal.HasRun = false; clipReal.IsAlive = false; } - else if (clipReal.StartTime < from) + + if (clipReal.StartTime > to && clipReal.StartTime < from) { clipReal.HasRun = false; + clipReal.IsAlive = false; } } } diff --git a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable index 82cd79f..c6f385a 100644 --- a/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable +++ b/client/Assets/Resources/Timeline/skill_hero01_long_air_skill02.playable @@ -161,7 +161,7 @@ MonoBehaviour: m_Start: 0.11666666666666667 m_ClipIn: 0 m_Asset: {fileID: -1404710705785846226} - m_Duration: 0.15 + m_Duration: 0.2666666666666666 m_TimeScale: 1 m_ParentTrack: {fileID: -5493165062151283881} m_EaseInDuration: 0 @@ -227,10 +227,10 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: MovestepClip - m_Version: 1 - m_Start: 0.26666666666666666 + m_Start: 0.3833333333333333 m_ClipIn: 0 m_Asset: {fileID: -7368694201472457818} - m_Duration: 0.1333333333333333 + m_Duration: 0.016666666666666663 m_TimeScale: 1 m_ParentTrack: {fileID: -5493165062151283881} m_EaseInDuration: 0 @@ -744,10 +744,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0.11666666666666667 + m_Start: 0.26666666666666666 m_ClipIn: 0 m_Asset: {fileID: -4314092720917250239} - m_Duration: 0.15 + m_Duration: 0.08333333333333331 m_TimeScale: 1 m_ParentTrack: {fileID: -2562766138161925753} m_EaseInDuration: 0