diff --git a/Assets/XCharts/Scripts/UI/Component/Series.cs b/Assets/XCharts/Scripts/UI/Component/Series.cs index 6f9f8343..11823f5f 100644 --- a/Assets/XCharts/Scripts/UI/Component/Series.cs +++ b/Assets/XCharts/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/Assets/XCharts/Scripts/UI/Internal/Animation.cs b/Assets/XCharts/Scripts/UI/Internal/Animation.cs index 5dc3b3d4..120b9696 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Animation.cs +++ b/Assets/XCharts/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/Assets/XCharts/Scripts/UI/Internal/BaseChart_API.cs b/Assets/XCharts/Scripts/UI/Internal/BaseChart_API.cs index 039b7ff7..0bf35794 100644 --- a/Assets/XCharts/Scripts/UI/Internal/BaseChart_API.cs +++ b/Assets/XCharts/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/Assets/XCharts/Scripts/UI/LineChart.cs b/Assets/XCharts/Scripts/UI/LineChart.cs index 88ca7b31..395572a5 100644 --- a/Assets/XCharts/Scripts/UI/LineChart.cs +++ b/Assets/XCharts/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); diff --git a/README.md b/README.md index da8fafff..4e0a7136 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ QQ交流群:XCharts交流群(202030963) ## 更新日志 +* (2019.09.26)增加`AnimationReset()`重置初始化动画接口 * (2019.09.26)优化`LineChart`的密集数据的曲线效果 * (2019.09.25)优化`SerieData`的自定义图标不与`SerieLabel`关联,可单独控制是否显示 * (2019.09.24)增加`SerieData`的自定义图标相关配置支持