diff --git a/Scripts/Editor/PropertyDrawers/SerieDrawer.cs b/Scripts/Editor/PropertyDrawers/SerieDrawer.cs index 14efc1a0..c7f459c5 100644 --- a/Scripts/Editor/PropertyDrawers/SerieDrawer.cs +++ b/Scripts/Editor/PropertyDrawers/SerieDrawer.cs @@ -127,7 +127,7 @@ namespace XCharts drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; ChartEditorHelper.MakeTwoField(ref drawRect,pos.width,m_Center,"Center"); - ChartEditorHelper.MakeTwoField(ref drawRect,pos.width,m_Center,"Radius"); + ChartEditorHelper.MakeTwoField(ref drawRect,pos.width,m_Radius,"Radius"); } EditorGUI.PropertyField(drawRect, m_LineStyle); diff --git a/Scripts/UI/Component/Main/Series.cs b/Scripts/UI/Component/Main/Series.cs index 3cff0b6d..2bef42b5 100644 --- a/Scripts/UI/Component/Main/Series.cs +++ b/Scripts/UI/Component/Main/Series.cs @@ -233,37 +233,30 @@ namespace XCharts /// public Serie AddSerie(SerieType type, string serieName, bool show = true) { - var serie = GetSerie(serieName); - if (serie == null) - { - serie = new Serie(); - serie.type = type; - serie.show = show; - serie.name = serieName; - serie.index = m_Series.Count; + var serie = new Serie(); + serie.type = type; + serie.show = show; + serie.name = serieName; + serie.index = m_Series.Count; - if (type == SerieType.Scatter) - { - serie.symbol.type = SerieSymbolType.Circle; - serie.symbol.size = 20f; - serie.symbol.selectedSize = 30f; - } - else if (type == SerieType.Line) - { - serie.symbol.type = SerieSymbolType.EmptyCircle; - serie.symbol.size = 2.5f; - serie.symbol.selectedSize = 5f; - } - else - { - serie.symbol.type = SerieSymbolType.None; - } - m_Series.Add(serie); + if (type == SerieType.Scatter) + { + serie.symbol.type = SerieSymbolType.Circle; + serie.symbol.size = 20f; + serie.symbol.selectedSize = 30f; + } + else if (type == SerieType.Line) + { + serie.symbol.type = SerieSymbolType.EmptyCircle; + serie.symbol.size = 2.5f; + serie.symbol.selectedSize = 5f; } else { - serie.show = show; + serie.symbol.type = SerieSymbolType.None; } + serie.animation.Reset(); + m_Series.Add(serie); return serie; } diff --git a/Scripts/UI/Component/Main/Title.cs b/Scripts/UI/Component/Main/Title.cs index 6c79d35c..55e8add9 100644 --- a/Scripts/UI/Component/Main/Title.cs +++ b/Scripts/UI/Component/Main/Title.cs @@ -39,7 +39,7 @@ namespace XCharts /// Subtitle text, supporting for \n for newlines. /// 副标题文本,支持使用 \n 换行。 /// - public string subText { get { return m_SubText; } set { m_Text = value; } } + public string subText { get { return m_SubText; } set { m_SubText = value; } } /// /// [default:14] /// subtitle font size. diff --git a/Scripts/UI/Internal/BaseChart.cs b/Scripts/UI/Internal/BaseChart.cs index 0a3ecf25..eb31fa39 100644 --- a/Scripts/UI/Internal/BaseChart.cs +++ b/Scripts/UI/Internal/BaseChart.cs @@ -291,7 +291,7 @@ namespace XCharts for (int j = 0; j < serie.data.Count; j++) { var serieData = serie.data[j]; - if (!serie.label.show && !serieData.showIcon) continue; + //if (!serie.label.show && !serieData.showIcon) continue; var textName = s_SerieLabelObjectName + "_" + i + "_" + j + "_" + serieData.name; var color = Color.grey; if (serie.type == SerieType.Pie)