From 6cfcf84b5d6786062ae8bd7d654babb54accd804 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Sat, 9 Nov 2019 16:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A5=BC=E5=9B=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=97=B6Label=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Runtime/Component/Main/Serie.cs | 1 + Assets/XCharts/Runtime/Internal/BaseChart.cs | 9 ++++++++- Assets/XCharts/Runtime/PieChart.cs | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Assets/XCharts/Runtime/Component/Main/Serie.cs b/Assets/XCharts/Runtime/Component/Main/Serie.cs index fa9f9cd5..1abb89b7 100644 --- a/Assets/XCharts/Runtime/Component/Main/Serie.cs +++ b/Assets/XCharts/Runtime/Component/Main/Serie.cs @@ -461,6 +461,7 @@ namespace XCharts /// 饼图的数据项之和 /// public float runtimePieDataTotal { get; internal set; } + internal int runtimeLastCheckDataCount { get; set; } internal List GetUpSmoothList(int dataIndex, int size = 100) { diff --git a/Assets/XCharts/Runtime/Internal/BaseChart.cs b/Assets/XCharts/Runtime/Internal/BaseChart.cs index d60234e4..0d4db010 100644 --- a/Assets/XCharts/Runtime/Internal/BaseChart.cs +++ b/Assets/XCharts/Runtime/Internal/BaseChart.cs @@ -289,7 +289,6 @@ namespace XCharts { var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); - //ChartHelper.DestroyAllChildren(labelObject.transform); SerieLabelPool.ReleaseAll(labelObject.transform); int count = 0; for (int i = 0; i < m_Series.Count; i++) @@ -484,6 +483,14 @@ namespace XCharts protected void CheckRefreshLabel() { + foreach (var serie in m_Series.list) + { + if (serie.label.show && serie.runtimeLastCheckDataCount != serie.dataCount) + { + m_ReinitLabel = true; + serie.runtimeLastCheckDataCount = serie.dataCount; + } + } if (m_ReinitLabel) { m_ReinitLabel = false; diff --git a/Assets/XCharts/Runtime/PieChart.cs b/Assets/XCharts/Runtime/PieChart.cs index a0226d6d..3c700a5e 100644 --- a/Assets/XCharts/Runtime/PieChart.cs +++ b/Assets/XCharts/Runtime/PieChart.cs @@ -387,6 +387,7 @@ namespace XCharts protected void UpdateLabelPostion(Serie serie, SerieData serieData) { + if (serieData.labelText == null) return; var currAngle = serieData.runtimePieHalfAngle; var currRad = currAngle * Mathf.Deg2Rad; var offsetRadius = serieData.runtimePieOffsetRadius;