foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-28 12:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复一些小问题

Browse Source
This commit is contained in:
monitor1394
2019-10-15 09:50:51 +08:00
parent dd5c6a2ffe
commit 046c809b52
4 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/Editor/PropertyDrawers/SerieDrawer.cs
View File

@@ -127,7 +127,7 @@ namespace XCharts
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
ChartEditorHelper.MakeTwoField(ref drawRect,pos.width,m_Center,"Center"); 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); EditorGUI.PropertyField(drawRect, m_LineStyle);

11
Scripts/UI/Component/Main/Series.cs
View File

@@ -233,10 +233,7 @@ namespace XCharts
/// <returns></returns> /// <returns></returns>
public Serie AddSerie(SerieType type, string serieName, bool show = true) public Serie AddSerie(SerieType type, string serieName, bool show = true)
{ {
var serie = GetSerie(serieName); var serie = new Serie();
if (serie == null)
{
serie = new Serie();
serie.type = type; serie.type = type;
serie.show = show; serie.show = show;
serie.name = serieName; serie.name = serieName;
@@ -258,12 +255,8 @@ namespace XCharts
{ {
serie.symbol.type = SerieSymbolType.None; serie.symbol.type = SerieSymbolType.None;
} }
serie.animation.Reset();
m_Series.Add(serie); m_Series.Add(serie);
}
else
{
serie.show = show;
}
return serie; return serie;
} }

2
Scripts/UI/Component/Main/Title.cs
View File

@@ -39,7 +39,7 @@ namespace XCharts
/// Subtitle text, supporting for \n for newlines. /// Subtitle text, supporting for \n for newlines.
/// 副标题文本，支持使用 \n 换行。 /// 副标题文本，支持使用 \n 换行。
/// </summary> /// </summary>
public string subText { get { return m_SubText; } set { m_Text = value; } } public string subText { get { return m_SubText; } set { m_SubText = value; } }
/// <summary> /// <summary>
/// [default:14] /// [default:14]
/// subtitle font size. /// subtitle font size.

2
Scripts/UI/Internal/BaseChart.cs
View File

@@ -291,7 +291,7 @@ namespace XCharts
for (int j = 0; j < serie.data.Count; j++) for (int j = 0; j < serie.data.Count; j++)
{ {
var serieData = serie.data[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 textName = s_SerieLabelObjectName + "_" + i + "_" + j + "_" + serieData.name;
var color = Color.grey; var color = Color.grey;
if (serie.type == SerieType.Pie) if (serie.type == SerieType.Pie)