From 7c762b4455e1605a1192bf34db589cd7fa1d89c9 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 22 Apr 2021 07:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DGauge=E7=9A=84AxisLabel?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E6=97=A0=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=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/Internal/DrawSerieGauge.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs b/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs index f9ad376c..e0d8a7fe 100644 --- a/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs +++ b/Assets/XCharts/Runtime/Internal/DrawSerieGauge.cs @@ -125,16 +125,17 @@ namespace XCharts for (int i = 0; i < chart.series.Count; i++) { var serie = chart.series.list[i]; + if (serie.type != SerieType.Gauge) continue; var serieLabel = serie.gaugeAxis.axisLabel; var count = serie.splitNumber > 36 ? 36 : (serie.splitNumber + 1); var startAngle = serie.startAngle; + var textColor = serieLabel.textStyle.GetColor(chart.theme.gauge.textColor); serie.gaugeAxis.ClearLabelObject(); SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight); for (int j = 0; j < count; j++) { var textName = ChartCached.GetSerieLabelName(s_SerieLabelObjectName, i, j); - var color = Color.grey; - var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serieLabel, color, 100, 100, chart.theme); + var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serieLabel, textColor, 100, 100, chart.theme); var iconImage = labelObj.transform.Find("Icon").GetComponent(); var isAutoSize = serieLabel.backgroundWidth == 0 || serieLabel.backgroundHeight == 0; var item = new ChartLabel(); @@ -181,9 +182,10 @@ namespace XCharts var value = serie.min + j * diffValue; var pos = ChartHelper.GetPosition(serie.runtimeCenterPos, angle, radius); var text = customLabelText != null && j < customLabelText.Count ? customLabelText[j] : - SerieLabelHelper.GetFormatterContent(serie, serieData, value, totalValue, serie.gaugeAxis.axisLabel); + SerieLabelHelper.GetFormatterContent(serie, serieData, value, totalValue, + serie.gaugeAxis.axisLabel, Color.clear); serie.gaugeAxis.SetLabelObjectText(j, text); - serie.gaugeAxis.SetLabelObjectPosition(j, pos); + serie.gaugeAxis.SetLabelObjectPosition(j, pos + serie.gaugeAxis.axisLabel.offset); } }