From 82cc23548d0e6bd417b7605f0f0d8bfcc145629d Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 26 Sep 2019 19:10:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AnimationReset()=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=A8=E7=94=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/UI/Component/Series.cs | 11 +++++++++++ Scripts/UI/Internal/Animation.cs | 6 ++++++ Scripts/UI/Internal/BaseChart_API.cs | 11 +++++++++++ Scripts/UI/LineChart.cs | 1 - 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Scripts/UI/Component/Series.cs b/Scripts/UI/Component/Series.cs index 6f9f8343..11823f5f 100644 --- a/Scripts/UI/Component/Series.cs +++ b/Scripts/UI/Component/Series.cs @@ -831,6 +831,17 @@ namespace XCharts } } + /// + /// 重置初始动画 + /// + public void AnimationReset() + { + foreach (var serie in m_Series) + { + if (serie.animation.enable) serie.animation.Reset(); + } + } + /// /// 从json中解析数据 /// diff --git a/Scripts/UI/Internal/Animation.cs b/Scripts/UI/Internal/Animation.cs index 5dc3b3d4..120b9696 100644 --- a/Scripts/UI/Internal/Animation.cs +++ b/Scripts/UI/Internal/Animation.cs @@ -100,6 +100,12 @@ namespace XCharts m_IsEnd = true; } + public void Reset() + { + Stop(); + Start(); + } + public void InitProgress(int data, float curr, float dest) { if (!m_Inited && !m_IsEnd) diff --git a/Scripts/UI/Internal/BaseChart_API.cs b/Scripts/UI/Internal/BaseChart_API.cs index 039b7ff7..0bf35794 100644 --- a/Scripts/UI/Internal/BaseChart_API.cs +++ b/Scripts/UI/Internal/BaseChart_API.cs @@ -451,5 +451,16 @@ namespace XCharts m_CheckAnimation = false; m_Series.AnimationStop(); } + + /// + /// Reset animation to play. + /// 重置初始动画,重新播放。 + /// + public void AnimationReset() + { + m_CheckAnimation = false; + m_Series.AnimationReset(); + RefreshChart(); + } } } diff --git a/Scripts/UI/LineChart.cs b/Scripts/UI/LineChart.cs index 88ca7b31..395572a5 100644 --- a/Scripts/UI/LineChart.cs +++ b/Scripts/UI/LineChart.cs @@ -238,7 +238,6 @@ namespace XCharts { float duration = serie.animation.duration > 0 ? (float)serie.animation.duration / 1000 : 1; float speed = totalDetailProgress / duration; - Debug.LogError("speed:"+speed); float symbolSpeed = serie.symbol.size / duration; serie.animation.CheckProgress(Time.deltaTime * speed); serie.animation.CheckSymbol(Time.deltaTime * symbolSpeed, serie.symbol.size);