From 293def05f43c55fce6e90d6b1907c9d9fc63facc Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 30 May 2021 14:37:08 +0800 Subject: *time --- .../Scripts/Animation/Tween/Editor/PlaybackTimer.cs | 2 +- .../Animation/Tween/Editor/TweenAnimationInspector.cs | 4 ++-- .../Animation/Tween/Editor/TweenAnimationInspector_Drag.cs | 2 +- .../Animation/Tween/Editor/TweenAnimationInspector_Play.cs | 12 +++++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/PlaybackTimer.cs b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/PlaybackTimer.cs index 4890f2b..69b91f7 100644 --- a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/PlaybackTimer.cs +++ b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/PlaybackTimer.cs @@ -6,7 +6,7 @@ namespace TweenAnimation { public class PlaybackTimer { - // 考虑了Pause的playback时间 + // 考虑了Pause的playback时间，没考虑playback limit public float time { get diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs index bd98aa8..9780e8c 100644 --- a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs +++ b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs @@ -443,7 +443,7 @@ namespace TweenAnimation // 绘制playback竖线 if(bRepaint && (m_Play || m_Pause)) { - float time = animation.HandleTime(m_PlaybackTimer.time); + float time = animation.HandleTime(playbackTime); float x = (time / animation.duration) * rulerRect.width + 5; ui.DrawVerticalLineFast(x, yOffBase, yOffBase - (rulerRect.height), Color.red); } @@ -578,7 +578,7 @@ namespace TweenAnimation if (m_Play || m_Pause) { Rect playbackTimeRect = new Rect(100, yOffBase + 23, 90, 20); ; - GUI.Label(playbackTimeRect, "Playback Time: " + m_PlaybackTimer.time.ToString("f1") + "s", styles.text); + GUI.Label(playbackTimeRect, "Playback Time: " + playbackTime.ToString("f1") + "s", styles.text); } } diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Drag.cs b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Drag.cs index b6d9e89..7b1523f 100644 --- a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Drag.cs +++ b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Drag.cs @@ -45,7 +45,7 @@ namespace TweenAnimation { float x = mousePos.x - rulerRect.x; float t = x / rulerRect.width * animation.duration; - float t0 = animation.GetIdentifiedTime(m_PlaybackTimer.time); + float t0 = animation.GetIdentifiedTime(playbackTime); float dt = 0; if (t0 >= 0) dt = t - t0; diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Play.cs b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Play.cs index 0aedd02..647c828 100644 --- a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Play.cs +++ b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector_Play.cs @@ -12,6 +12,16 @@ namespace TweenAnimation { PlaybackTimer m_PlaybackTimer; + float playbackTime + { + get + { + return m_PlaybackTimer.time; + float t = animation.ApplyLimit(m_PlaybackTimer.time); + return t; + } + } + // 编辑器下播放动画 void EditorPlay() { @@ -69,7 +79,7 @@ namespace TweenAnimation void Update() { - animation.UpdateEditor(m_PlaybackTimer.time); + animation.UpdateEditor(playbackTime); // repaint MarkSceneDirty(); -- cgit v1.1-26-g67d0