From a831f747cc89bf3e58f4a4f552a1f0abd307ea13 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Wed, 19 Aug 2020 09:11:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Component/Sub/SerieAnimation.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Runtime/Component/Sub/SerieAnimation.cs b/Runtime/Component/Sub/SerieAnimation.cs index 09bde95a..45c2f32c 100644 --- a/Runtime/Component/Sub/SerieAnimation.cs +++ b/Runtime/Component/Sub/SerieAnimation.cs @@ -266,10 +266,12 @@ namespace XCharts isBarEnd = false; return initValue; } - if (!m_DataCurrProgress.ContainsKey(index)) + var c1 = !m_DataCurrProgress.ContainsKey(index); + var c2 = !m_DataDestProgress.ContainsKey(index); + if (c1 || c2) { - m_DataCurrProgress.Add(index, initValue); - m_DataDestProgress.Add(index, destValue); + if (c1) m_DataCurrProgress.Add(index, initValue); + if (c2) m_DataDestProgress.Add(index, destValue); isBarEnd = false; } else @@ -400,15 +402,15 @@ namespace XCharts isBarEnd = false; var initHig = m_FadeOut ? barHig : 0; var destHig = m_FadeOut ? 0 : barHig; - if (IsInDelay() || IsInDataDelay(dataIndex)) - { - return m_FadeOut ? barHig : 0; - } var currHig = GetDataCurrProgress(dataIndex, initHig, destHig, out isBarEnd); - if (isBarEnd || m_IsEnd) + if (isBarEnd || IsFinish()) { return m_FadeOuted ? 0 : barHig; } + else if (IsInDelay() || IsInDataDelay(dataIndex)) + { + return m_FadeOut ? barHig : 0; + } else if (m_IsPause) { return currHig;