From 8efa8145b19fe255c8aaed63fc8fbf1f370df0ab Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Wed, 25 Aug 2021 13:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=80=E9=80=9F=E5=8A=A8=E7=94=BB=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/Component/Sub/SerieAnimation.cs   | 24 +++++++++++++++++--
 .../Internal/CoordinateChart_DrawLine.cs      | 17 ++++---------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/Assets/XCharts/Runtime/Component/Sub/SerieAnimation.cs b/Assets/XCharts/Runtime/Component/Sub/SerieAnimation.cs
index 959e6048..4479521f 100644
--- a/Assets/XCharts/Runtime/Component/Sub/SerieAnimation.cs
+++ b/Assets/XCharts/Runtime/Component/Sub/SerieAnimation.cs
@@ -128,6 +128,8 @@ namespace XCharts
         [SerializeField] private float m_CurrDetailProgress;
         [SerializeField] private float m_DestDetailProgress;
         private float m_CurrSymbolProgress;
+        private Vector3 m_LinePathLastPos;
+        private float m_LinePathCurrTotalDist = 0f;
 
         public void FadeIn()
         {
@@ -348,11 +350,29 @@ namespace XCharts
             return !IsFinish() && detail > m_CurrDetailProgress;
         }
 
+        public void SetLinePathStartPos(Vector3 pos)
+        {
+            if (m_AlongWithLinePath)
+            {
+                m_LinePathLastPos = pos;
+                m_LinePathCurrTotalDist = 0;
+            }
+        }
+
         public bool CheckDetailBreak(Vector3 pos, bool isYAxis)
         {
             if (IsFinish()) return false;
-            if (isYAxis) return pos.y > m_CurrDetailProgress;
-            else return pos.x > m_CurrDetailProgress;
+            if (m_AlongWithLinePath)
+            {
+                m_LinePathCurrTotalDist += Vector3.Distance(pos, m_LinePathLastPos);
+                m_LinePathLastPos = pos;
+                return CheckDetailBreak(m_LinePathCurrTotalDist);
+            }
+            else
+            {
+                if (isYAxis) return pos.y > m_CurrDetailProgress;
+                else return pos.x > m_CurrDetailProgress;
+            }
         }
 
         public bool NeedAnimation(int dataIndex)
diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs
index cb74767b..90bd9678 100644
--- a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs
+++ b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs
@@ -228,10 +228,10 @@ namespace XCharts
                         tempLp = np;
                     }
                 }
+                serie.animation.SetLinePathStartPos(startPos);
             }
             serie.animation.InitProgress(serie.dataPoints.Count, currDetailProgress, totalDetailProgress);
             serie.animation.SetDataFinish(startIndex);
-            var currLineDist = 0f;
             for (i = startIndex + 1; i < serie.dataPoints.Count; i++)
             {
                 np = serie.dataPoints[i];
@@ -269,7 +269,7 @@ namespace XCharts
                             isIgnoreBreak ? ColorUtil.clearColor32 : lineColor,
                             isIgnoreBreak ? ColorUtil.clearColor32 : areaColor,
                             isIgnoreBreak ? ColorUtil.clearColor32 : areaToColor,
-                            zeroPos, startIndex, currLineDist);
+                            zeroPos, startIndex);
                         break;
                     case LineType.Smooth:
                     case LineType.SmoothDash:
@@ -308,8 +308,6 @@ namespace XCharts
                 if (isFinish) serie.animation.SetDataFinish(i);
                 if (np != Vector3.zero || serie.ignoreLineBreak)
                 {
-                    if (serie.animation.alongWithLinePath)
-                        currLineDist += Vector3.Distance(np, lp);
                     lp = np;
                 }
             }
@@ -663,7 +661,7 @@ namespace XCharts
                     case LineType.Normal:
                         nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
                         isFinish = DrawNormalLine(vh, serie, yAxis, lp, np, nnp, i, lineColor,
-                            areaColor, areaToColor, zeroPos, 0, 0);
+                            areaColor, areaToColor, zeroPos, 0);
                         break;
                     case LineType.Smooth:
                     case LineType.SmoothDash:
@@ -723,7 +721,7 @@ namespace XCharts
         private bool lastIsDown;
         private bool DrawNormalLine(VertexHelper vh, Serie serie, Axis axis, Vector3 lp, Vector3 np, Vector3 nnp,
             int dataIndex, Color32 lineColor, Color32 areaColor, Color32 areaToColor,
-            Vector3 zeroPos, int startIndex, float currLineDist)
+            Vector3 zeroPos, int startIndex)
         {
             var defaultLineColor = lineColor;
             var isSecond = dataIndex == startIndex + 1;
@@ -809,12 +807,7 @@ namespace XCharts
             {
                 var isEndPos = i == segment - 1;
                 var cp = lp + dir1 * (dist * i / segment);
-                if (serie.animation.alongWithLinePath)
-                {
-                    currLineDist += Vector3.Distance(cp, start);
-                    if (serie.animation.CheckDetailBreak(currLineDist)) isBreak = true;
-                }
-                else if (serie.animation.CheckDetailBreak(cp, isYAxis)) isBreak = true;
+                if (serie.animation.CheckDetailBreak(cp, isYAxis)) isBreak = true;
                 var tp1 = cp - dir1v * serie.lineStyle.GetWidth(m_Theme.serie.lineWidth);
                 var tp2 = cp + dir1v * serie.lineStyle.GetWidth(m_Theme.serie.lineWidth);
                 CheckLineGradientColor(cp, serie.lineStyle, axis, defaultLineColor, ref lineColor);