From d0f0da9c8368242ba5b5f8276205e33a460b1d80 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Thu, 20 Sep 2018 07:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/BarChart.cs   |   8 ++--
 Scripts/BaseChart.cs  |  66 +++++++++++++++-------------
 Scripts/ChartUtils.cs |  19 +++++---
 Scripts/LineChart.cs  |  58 +++++++++++++++++++-----
 demo.unity            | 100 +++++++++++++++++++++++++-----------------
 5 files changed, 157 insertions(+), 94 deletions(-)

diff --git a/Scripts/BarChart.cs b/Scripts/BarChart.cs
index e2fe1c03..a4884b83 100644
--- a/Scripts/BarChart.cs
+++ b/Scripts/BarChart.cs
@@ -33,7 +33,7 @@ namespace xcharts
             if(yAxis.type == AxisType.category)
             {
                 int seriesCount = seriesList.Count;
-                float scaleWid = coordinateHig / (yAxis.scaleNum - 1);
+                float scaleWid = coordinateHig / (yAxis.splitNumber - 1);
                 float barWid = barData.barWid > 1 ? barData.barWid : scaleWid * barData.barWid;
                 float offset = (scaleWid - barWid * seriesCount - barData.space * (seriesCount - 1)) / 2;
                 float max = GetMaxValue();
@@ -46,7 +46,7 @@ namespace xcharts
                     {
                         SeriesData data = series.dataList[i];
                         float pX = zeroX + coordinate.tickness;
-                        float pY = zeroY + i * coordinateHig / (yAxis.scaleNum - 1);
+                        float pY = zeroY + i * coordinateHig / (yAxis.splitNumber - 1);
                         float barHig = data.value / max * coordinateWid;
                         float space = offset + j * (barWid + barData.space);
                         Vector3 p1 = new Vector3(pX, pY + space + barWid);
@@ -60,7 +60,7 @@ namespace xcharts
             else
             {
                 int seriesCount = seriesList.Count;
-                float scaleWid = coordinateWid / (xAxis.scaleNum - 1);
+                float scaleWid = coordinateWid / (xAxis.splitNumber - 1);
                 float barWid = barData.barWid > 1 ? barData.barWid : scaleWid * barData.barWid;
                 float offset = (scaleWid - barWid * seriesCount - barData.space * (seriesCount - 1)) / 2;
                 float max = GetMaxValue();
@@ -72,7 +72,7 @@ namespace xcharts
                     for (int i = 0; i < series.dataList.Count; i++)
                     {
                         SeriesData data = series.dataList[i];
-                        float pX = zeroX + i * coordinateWid / (xAxis.scaleNum - 1);
+                        float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1);
                         float pY = zeroY + coordinate.tickness;
                         float barHig = data.value / max * coordinateHig;
                         float space = offset + j * (barWid + barData.space);
diff --git a/Scripts/BaseChart.cs b/Scripts/BaseChart.cs
index f812eb83..03594754 100644
--- a/Scripts/BaseChart.cs
+++ b/Scripts/BaseChart.cs
@@ -56,19 +56,23 @@ namespace xcharts
     }
 
     [System.Serializable]
-    public enum Layout
+    public enum Location
     {
         left,
         right,
         top,
-        bottom
+        bottom,
+        start,
+        middle,
+        center,
+        end,
     }
 
     [System.Serializable]
     public class Axis
     {
         public AxisType type;
-        public int scaleNum = 5;
+        public int splitNumber = 5;
         public bool showSplitLine;
         public List<string> data;
     }
@@ -98,7 +102,7 @@ namespace xcharts
     public class Legend
     {
         public bool show;
-        public Layout layout;
+        public Location location;
         public float dataWid;
         public float dataHig;
         public float dataSpace;
@@ -304,8 +308,8 @@ namespace xcharts
             yScaleTextList.Clear();
             if (yAxis.type == AxisType.value)
             {
-                yAxis.scaleNum = DEFAULT_YSACLE_NUM;
-                for (int i = 0; i < yAxis.scaleNum; i++)
+                yAxis.splitNumber = DEFAULT_YSACLE_NUM;
+                for (int i = 0; i < yAxis.splitNumber; i++)
                 {
                     Text txt = ChartUtils.AddTextObject(YSCALE_TEXT_PREFIX + i, transform, font,
                         TextAnchor.MiddleRight, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f),
@@ -317,8 +321,8 @@ namespace xcharts
             }
             else
             {
-                yAxis.scaleNum = yAxis.data.Count + 1;
-                for (int i = 0; i < yAxis.scaleNum - 1; i++)
+                yAxis.splitNumber = yAxis.data.Count + 1;
+                for (int i = 0; i < yAxis.splitNumber - 1; i++)
                 {
                     Text txt = ChartUtils.AddTextObject(YSCALE_TEXT_PREFIX + i, transform, font,
                         TextAnchor.MiddleRight, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f),
@@ -335,9 +339,9 @@ namespace xcharts
             xScaleTextList.Clear();
             if (xAxis.type == AxisType.value)
             {
-                xAxis.scaleNum = DEFAULT_YSACLE_NUM;
-                float scaleWid = coordinateWid / (xAxis.scaleNum - 1);
-                for (int i = 0; i < xAxis.scaleNum; i++)
+                xAxis.splitNumber = DEFAULT_YSACLE_NUM;
+                float scaleWid = coordinateWid / (xAxis.splitNumber - 1);
+                for (int i = 0; i < xAxis.splitNumber; i++)
                 {
                     Text txt = ChartUtils.AddTextObject(XSCALE_TEXT_PREFIX + i, transform, font,
                         TextAnchor.MiddleCenter, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f),
@@ -349,9 +353,9 @@ namespace xcharts
             }
             else
             {
-                xAxis.scaleNum = xAxis.data.Count + 1;
-                float scaleWid = coordinateWid / (xAxis.scaleNum - 1);
-                for (int i = 0; i < xAxis.scaleNum - 1; i++)
+                xAxis.splitNumber = xAxis.data.Count + 1;
+                float scaleWid = coordinateWid / (xAxis.splitNumber - 1);
+                for (int i = 0; i < xAxis.splitNumber - 1; i++)
                 {
                     Text txt = ChartUtils.AddTextObject(XSCALE_TEXT_PREFIX + i, transform, font,
                         TextAnchor.MiddleCenter, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f),
@@ -389,19 +393,19 @@ namespace xcharts
         private Vector3 GetLegendPosition(int i)
         {
             int legendCount = legend.dataList.Count;
-            switch (legend.layout)
+            switch (legend.location)
             {
-                case Layout.bottom:
-                case Layout.top:
+                case Location.bottom:
+                case Location.top:
                     float startX = legend.left;
                     if (startX <= 0)
                     {
                         startX = (chartWid -(legendCount *legend.dataWid - (legendCount-1) * legend.dataSpace)) / 2;
                     }
-                    float posY = legend.layout == Layout.bottom ? legend.bottom : chartHig - legend.top - legend.dataHig;
+                    float posY = legend.location == Location.bottom ? legend.bottom : chartHig - legend.top - legend.dataHig;
                     return new Vector3(startX + i * (legend.dataWid+legend.dataSpace),posY,0);
-                case Layout.left:
-                case Layout.right:
+                case Location.left:
+                case Location.right:
                     float startY =0;
                     if (legend.top > 0)
                     {
@@ -411,7 +415,7 @@ namespace xcharts
                     {
                         startY = chartHig - (chartHig - (legendCount * legend.dataHig - (legendCount - 1) * legend.dataSpace)) / 2 - legend.dataHig;
                     }
-                    float posX = legend.layout == Layout.left ? legend.left : chartWid - legend.right - legend.dataWid;
+                    float posX = legend.location == Location.left ? legend.left : chartWid - legend.right - legend.dataWid;
                     return new Vector3(posX,startY - i * (legend.dataHig + legend.dataSpace), 0);
                 default:break;
             }
@@ -420,7 +424,7 @@ namespace xcharts
 
         private Vector3 GetYScalePosition(int i)
         {
-            float scaleWid = coordinateHig / (yAxis.scaleNum - 1);
+            float scaleWid = coordinateHig / (yAxis.splitNumber - 1);
             if (yAxis.type == AxisType.value)
             {
                 return new Vector3(zeroX - coordinate.scaleLen - 2f,
@@ -435,7 +439,7 @@ namespace xcharts
 
         private Vector3 GetXScalePosition(int i)
         {
-            float scaleWid = coordinateWid / (xAxis.scaleNum - 1);
+            float scaleWid = coordinateWid / (xAxis.splitNumber - 1);
             if (xAxis.type == AxisType.value)
             {
                 return new Vector3(zeroX + (i + 1 - 0.5f) * scaleWid, zeroY - coordinate.scaleLen - 10, 0);
@@ -533,7 +537,7 @@ namespace xcharts
                 checkLegend.right != legend.right ||
                 checkLegend.bottom != legend.bottom ||
                 checkLegend.top != legend.top ||
-                checkLegend.layout != legend.layout ||
+                checkLegend.location != legend.location ||
                 checkLegend.show != legend.show)
             {
                 checkLegend.dataWid = legend.dataWid;
@@ -543,7 +547,7 @@ namespace xcharts
                 checkLegend.right = legend.right;
                 checkLegend.bottom = legend.bottom;
                 checkLegend.top = legend.top;
-                checkLegend.layout = legend.layout;
+                checkLegend.location = legend.location;
                 checkLegend.show = legend.show;
                 OnLegendChanged();
             }
@@ -552,14 +556,14 @@ namespace xcharts
         protected virtual void OnCoordinateSize()
         {
             //update yScale pos
-            for (int i = 0; i < yAxis.scaleNum; i++)
+            for (int i = 0; i < yAxis.splitNumber; i++)
             {
                 if (i < yScaleTextList.Count && yScaleTextList[i])
                 {
                     yScaleTextList[i].transform.localPosition = GetYScalePosition(i);
                 }
             }
-            for (int i = 0; i < xAxis.scaleNum; i++)
+            for (int i = 0; i < xAxis.splitNumber; i++)
             {
                 if (i < xScaleTextList.Count && xScaleTextList[i])
                 {
@@ -643,19 +647,19 @@ namespace xcharts
         {
             if (!coordinate.show) return;
             // draw scale
-            for (int i = 1; i < yAxis.scaleNum; i++)
+            for (int i = 1; i < yAxis.splitNumber; i++)
             {
                 float pX = zeroX - coordinate.scaleLen;
-                float pY = zeroY + i * coordinateHig / (yAxis.scaleNum - 1);
+                float pY = zeroY + i * coordinateHig / (yAxis.splitNumber - 1);
                 ChartUtils.DrawLine(vh, new Vector3(pX, pY), new Vector3(zeroX, pY), coordinate.tickness, Color.white);
                 if (yAxis.showSplitLine)
                 {
                     ChartUtils.DrawLine(vh, new Vector3(zeroX, pY), new Vector3(zeroX + coordinateWid, pY), coordinate.tickness, Color.grey);
                 }
             }
-            for (int i = 1; i < xAxis.scaleNum; i++)
+            for (int i = 1; i < xAxis.splitNumber; i++)
             {
-                float pX = zeroX + i * coordinateWid / (xAxis.scaleNum - 1);
+                float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1);
                 float pY = zeroY - coordinate.scaleLen - 2;
                 ChartUtils.DrawLine(vh, new Vector3(pX, zeroY), new Vector3(pX, pY), coordinate.tickness, Color.white);
                 if (xAxis.showSplitLine)
diff --git a/Scripts/ChartUtils.cs b/Scripts/ChartUtils.cs
index 1942544b..6e7ec30b 100644
--- a/Scripts/ChartUtils.cs
+++ b/Scripts/ChartUtils.cs
@@ -62,8 +62,8 @@ namespace xcharts
                 btnObj.AddComponent<Image>();
                 btnObj.AddComponent<Button>();
 
-                Text txt = AddTextObject("Text", btnObj.transform, font, TextAnchor.MiddleCenter, Vector2.zero,
-                    Vector2.zero, Vector2.zero, sizeDelta);
+                Text txt = AddTextObject("Text", btnObj.transform, font, TextAnchor.MiddleCenter, 
+                    Vector2.zero,Vector2.zero, Vector2.zero, sizeDelta);
                 txt.text = "Text";
             }
             RectTransform rect = btnObj.GetComponent<RectTransform>();
@@ -101,11 +101,17 @@ namespace xcharts
             Vector3 p2 = new Vector3(p.x + size, p.y - size);
             Vector3 p3 = new Vector3(p.x + size, p.y + size);
             Vector3 p4 = new Vector3(p.x - size, p.y + size);
-            DrawPolygon(vh, p1, p2, p3, p4, color);
+            DrawPolygon(vh, p1, p2, p3, p4, color, color);
         }
 
         public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
             Color color)
+        {
+            DrawPolygon(vh, p1, p2, p3, p4, color, color);
+        }
+
+        public static void DrawPolygon(VertexHelper vh, Vector3 p1, Vector3 p2, Vector3 p3, Vector3 p4,
+            Color startColor,Color toColor)
         {
             UIVertex[] vertex = new UIVertex[4];
             vertex[0].position = p1;
@@ -114,7 +120,7 @@ namespace xcharts
             vertex[3].position = p4;
             for (int j = 0; j < 4; j++)
             {
-                vertex[j].color = color;
+                vertex[j].color = j>=2?toColor:startColor;
                 vertex[j].uv0 = Vector2.zero;
             }
             vh.AddUIVertexQuad(vertex);
@@ -180,7 +186,7 @@ namespace xcharts
         }
 
 
-        public static List<Vector3> GetBezierList(Vector3 sp, Vector3 ep, int k = 2)
+        public static List<Vector3> GetBezierList(Vector3 sp, Vector3 ep, float k = 2.0f)
         {
             Vector3 dir = (ep - sp).normalized;
             float dist = Vector3.Distance(sp, ep);
@@ -203,7 +209,8 @@ namespace xcharts
             return list;
         }
 
-        public static List<Vector3> GetBezierList2(Vector3 sp, Vector3 ep, int segment, Vector3 cp, Vector3 cp2)
+        public static List<Vector3> GetBezierList2(Vector3 sp, Vector3 ep, int segment, Vector3 cp,
+            Vector3 cp2)
         {
             List<Vector3> list = new List<Vector3>();
             for (int i = 0; i < segment; i++)
diff --git a/Scripts/LineChart.cs b/Scripts/LineChart.cs
index 290ae15c..f800ad2b 100644
--- a/Scripts/LineChart.cs
+++ b/Scripts/LineChart.cs
@@ -5,13 +5,35 @@ using UnityEngine.UI;
 
 namespace xcharts
 {
+    [System.Serializable]
+    public enum PointType
+    {
+        square,
+        cicle
+    }
+
     [System.Serializable]
     public class LineData
     {
-        public bool smooth = false;
-        public bool area = false;
-        public float pointWid = 1;
+
         public float tickness = 0.8f;
+
+        [Header("Point")]
+        public bool showPoint = true;
+        public PointType pointType = PointType.square;
+        public float pointWid = 1.0f;
+        public Color pointColor = Color.white;
+
+        [Header("Smooth")]
+        public bool smooth = false;
+
+        [Range(1f, 10f)]
+        public float smoothStyle = 2f;
+
+        [Header("Area")]
+        public bool area = false;
+        public Color areaStartColor;
+        public Color areaToColor;
     }
 
     public class LineChart : BaseChart
@@ -34,7 +56,7 @@ namespace xcharts
             base.OnPopulateMesh(vh);
             int seriesCount = seriesList.Count;
             float max = GetMaxValue();
-            float scaleWid = coordinateWid / (xAxis.scaleNum - 1);
+            float scaleWid = coordinateWid / (xAxis.splitNumber - 1);
             for (int j = 0; j < seriesCount; j++)
             {
                 if (!legend.IsShowSeries(j)) continue;
@@ -52,10 +74,10 @@ namespace xcharts
                     {
                         if (lineData.smooth)
                         {
-                            var list = ChartUtils.GetBezierList(lp, np);
+                            var list = ChartUtils.GetBezierList(lp, np, lineData.smoothStyle);
                             Vector3 start, to;
                             start = list[0];
-                            for(int k = 1; k < list.Count; k++)
+                            for (int k = 1; k < list.Count; k++)
                             {
                                 to = list[k];
                                 ChartUtils.DrawLine(vh, start, to, lineData.tickness, color);
@@ -67,20 +89,32 @@ namespace xcharts
                             ChartUtils.DrawLine(vh, lp, np, lineData.tickness, color);
                             if (lineData.area)
                             {
-                                ChartUtils.DrawPolygon(vh, lp, np, new Vector3(np.x, zeroY), new Vector3(lp.x, zeroY), color);
+                                ChartUtils.DrawPolygon(vh, lp, np, new Vector3(np.x, zeroY), new Vector3(lp.x, zeroY), 
+                                    lineData.areaStartColor,lineData.areaToColor);
                             }
                         }
-                        
+
                     }
                     lp = np;
                 }
                 // draw point
-                for (int i = 0; i < series.dataList.Count; i++)
+                if (lineData.showPoint)
                 {
-                    SeriesData data = series.dataList[i];
+                    for (int i = 0; i < series.dataList.Count; i++)
+                    {
+                        SeriesData data = series.dataList[i];
 
-                    Vector3 p = new Vector3(startX + i * scaleWid, zeroY + data.value * coordinateHig / max);
-                    ChartUtils.DrawPolygon(vh, p, lineData.pointWid, Color.white);
+                        Vector3 p = new Vector3(startX + i * scaleWid, zeroY + data.value * coordinateHig / max);
+                        switch (lineData.pointType)
+                        {
+                            case PointType.square:
+                                ChartUtils.DrawPolygon(vh, p, lineData.pointWid, lineData.pointColor);
+                                break;
+                            case PointType.cicle:
+                                ChartUtils.DrawCricle(vh, p, lineData.pointWid, lineData.pointColor, (int)lineData.pointWid * 5);
+                                break;
+                        }
+                    }
                 }
             }
 
diff --git a/demo.unity b/demo.unity
index f7868374..7fd679b7 100644
--- a/demo.unity
+++ b/demo.unity
@@ -1201,7 +1201,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data:
     - "\u661F\u671F\u4E00"
@@ -1213,7 +1213,7 @@ MonoBehaviour:
     - "\u661F\u671F\u65E5"
   yAxis:
     type: 1
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data:
     - "\u6392\u884C\u699C1"
@@ -1222,7 +1222,7 @@ MonoBehaviour:
     - "\u6392\u884C\u699C4"
   legend:
     show: 1
-    layout: 3
+    location: 0
     dataWid: 49.4
     dataHig: 20
     dataSpace: 5
@@ -1917,7 +1917,7 @@ RectTransform:
   - {fileID: 566565924}
   - {fileID: 2054321060}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 1
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1970,7 +1970,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -1980,12 +1980,12 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 1
     data: []
   legend:
     show: 0
-    layout: 0
+    location: 0
     dataWid: 50
     dataHig: 20
     dataSpace: 0
@@ -2343,7 +2343,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.79462, g: 0.7820069, b: 0.8308824, a: 0}
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -3061,7 +3061,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u6298\u7EBF\u56FE(\u5E73\u6ED1)"
+  m_Text: "\u66F2\u7EBF\u56FE"
 --- !u!222 &506873715
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4206,7 +4206,7 @@ RectTransform:
   - {fileID: 12948877}
   - {fileID: 1810081860}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 6
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4253,7 +4253,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -4263,12 +4263,12 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data: []
   legend:
     show: 0
-    layout: 0
+    location: 0
     dataWid: 0
     dataHig: 0
     dataSpace: 0
@@ -4296,10 +4296,16 @@ MonoBehaviour:
     - key: 
       value: 60
   lineData:
-    smooth: 0
-    area: 1
-    pointWid: 4
     tickness: 1
+    showPoint: 1
+    pointType: 0
+    pointWid: 4
+    pointColor: {r: 1, g: 1, b: 1, a: 1}
+    smooth: 0
+    smoothStyle: 2
+    area: 1
+    areaStartColor: {r: 1, g: 0, b: 0, a: 1}
+    areaToColor: {r: 1, g: 0, b: 0, a: 1}
 --- !u!222 &822231473
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4421,7 +4427,7 @@ RectTransform:
   - {fileID: 1562760592}
   - {fileID: 1681493923}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 2
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4468,7 +4474,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 1
     data:
     - "\u5468\u4E00"
@@ -4478,7 +4484,7 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -4488,7 +4494,7 @@ MonoBehaviour:
     - "\u5468\u4E94"
   legend:
     show: 1
-    layout: 1
+    location: 1
     dataWid: 50
     dataHig: 25
     dataSpace: 10
@@ -5358,7 +5364,7 @@ RectTransform:
   - {fileID: 492181722}
   - {fileID: 1294989126}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -5405,7 +5411,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -5415,12 +5421,12 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data: []
   legend:
     show: 0
-    layout: 0
+    location: 0
     dataWid: 0
     dataHig: 0
     dataSpace: 0
@@ -5448,10 +5454,16 @@ MonoBehaviour:
     - key: 
       value: 60
   lineData:
-    smooth: 0
-    area: 0
-    pointWid: 4
     tickness: 1
+    showPoint: 1
+    pointType: 0
+    pointWid: 4
+    pointColor: {r: 1, g: 1, b: 1, a: 1}
+    smooth: 0
+    smoothStyle: 2
+    area: 0
+    areaStartColor: {r: 0, g: 0, b: 0, a: 0}
+    areaToColor: {r: 0, g: 0, b: 0, a: 0}
 --- !u!222 &1297066862
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6238,7 +6250,7 @@ RectTransform:
   - {fileID: 1423602106}
   - {fileID: 2088546449}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 5
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6285,7 +6297,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -6295,12 +6307,12 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 0
     data: []
   legend:
     show: 0
-    layout: 0
+    location: 0
     dataWid: 0
     dataHig: 0
     dataSpace: 0
@@ -6328,10 +6340,16 @@ MonoBehaviour:
     - key: 
       value: 60
   lineData:
-    smooth: 1
-    area: 0
-    pointWid: 4
     tickness: 1
+    showPoint: 1
+    pointType: 1
+    pointWid: 4
+    pointColor: {r: 0.8126462, g: 0.79811853, b: 0.8897059, a: 1}
+    smooth: 1
+    smoothStyle: 4.7
+    area: 0
+    areaStartColor: {r: 0, g: 0, b: 0, a: 0}
+    areaToColor: {r: 0, g: 0, b: 0, a: 0}
 --- !u!222 &1505386464
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -8327,12 +8345,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 301464776}
-  - {fileID: 391300566}
-  - {fileID: 867959890}
-  - {fileID: 2117888107}
   - {fileID: 1297066860}
   - {fileID: 1505386462}
   - {fileID: 822231471}
+  - {fileID: 391300566}
+  - {fileID: 867959890}
+  - {fileID: 2117888107}
   m_Father: {fileID: 505350093}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8917,7 +8935,7 @@ RectTransform:
   - {fileID: 37742856}
   - {fileID: 1660119058}
   m_Father: {fileID: 2051892027}
-  m_RootOrder: 3
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -8964,7 +8982,7 @@ MonoBehaviour:
     scaleLen: 5
   xAxis:
     type: 0
-    scaleNum: 5
+    splitNumber: 5
     showSplitLine: 1
     data:
     - "\u5468\u4E00"
@@ -8974,7 +8992,7 @@ MonoBehaviour:
     - "\u5468\u4E94"
   yAxis:
     type: 1
-    scaleNum: 6
+    splitNumber: 6
     showSplitLine: 0
     data:
     - "\u5468\u4E00"
@@ -8984,7 +9002,7 @@ MonoBehaviour:
     - "\u5468\u4E94"
   legend:
     show: 1
-    layout: 1
+    location: 1
     dataWid: 50
     dataHig: 25
     dataSpace: 10