From f88a44bd48aaadf393f8b5f458a75052c30158bd Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Wed, 16 Oct 2019 19:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A5=BC=E5=9B=BE=E5=BD=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8D=E7=A7=B0=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/UI/Component/Main/Serie.cs | 3 +++ Scripts/UI/Component/Main/Series.cs | 2 +- Scripts/UI/PieChart.cs | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Scripts/UI/Component/Main/Serie.cs b/Scripts/UI/Component/Main/Serie.cs index 7856e0d4..9c8a3d7b 100644 --- a/Scripts/UI/Component/Main/Serie.cs +++ b/Scripts/UI/Component/Main/Serie.cs @@ -609,6 +609,7 @@ namespace XCharts } int xValue = m_Data.Count; var serieData = new SerieData() { data = new List() { xValue, value }, name = dataName }; + serieData.index = xValue; m_Data.Add(serieData); return serieData; } @@ -631,6 +632,7 @@ namespace XCharts } } var serieData = new SerieData() { data = new List() { xValue, yValue }, name = dataName }; + serieData.index = m_Data.Count; m_Data.Add(serieData); return serieData; } @@ -665,6 +667,7 @@ namespace XCharts } var serieData = new SerieData(); serieData.name = dataName; + serieData.index = m_Data.Count; for (int i = 0; i < valueList.Count; i++) { serieData.data.Add(valueList[i]); diff --git a/Scripts/UI/Component/Main/Series.cs b/Scripts/UI/Component/Main/Series.cs index baaff888..497d3c77 100644 --- a/Scripts/UI/Component/Main/Series.cs +++ b/Scripts/UI/Component/Main/Series.cs @@ -872,7 +872,7 @@ namespace XCharts int numName = -1; if (int.TryParse(name, out numName)) { - if (numName >= 0 && numName < list.Count) return false; + if (numName >= 0 && numName < 100) return false; } return true; } diff --git a/Scripts/UI/PieChart.cs b/Scripts/UI/PieChart.cs index 6e5b21d7..a19ee0b2 100644 --- a/Scripts/UI/PieChart.cs +++ b/Scripts/UI/PieChart.cs @@ -80,8 +80,9 @@ namespace XCharts for (int n = 0; n < data.Count; n++) { var serieData = data[n]; + serieData.index = n; float value = serieData.data[1]; - serieNameCount = m_LegendRealShowName.IndexOf(serieData.name); + serieNameCount = m_LegendRealShowName.IndexOf(serieData.legendName); Color color = m_ThemeInfo.GetColor(serieNameCount); serieData.pieStartAngle = startDegree; serieData.pieToAngle = startDegree;