From b784900fda8349c8b375f042cb8b91d47f8df59d Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 28 Mar 2022 19:28:39 +0800 Subject: [PATCH] 3.0 --- Editor/Charts/BaseChartEditor.cs | 11 ++++++----- README.md | 9 ++++----- Runtime/Internal/BaseChart.Serie.cs | 3 +++ Runtime/Theme/Theme.cs | 1 - 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Editor/Charts/BaseChartEditor.cs b/Editor/Charts/BaseChartEditor.cs index 486205de..68253684 100644 --- a/Editor/Charts/BaseChartEditor.cs +++ b/Editor/Charts/BaseChartEditor.cs @@ -28,6 +28,7 @@ namespace XCharts.Editor private bool m_CheckWarning = false; private int m_LastComponentCount = 0; private int m_LastSerieCount = 0; + private string m_VersionString = ""; private StringBuilder sb = new StringBuilder(); MainComponentListEditor m_ComponentList; SerieListEditor m_SerieList; @@ -51,6 +52,10 @@ namespace XCharts.Editor RefreshSeries(); m_SerieList = new SerieListEditor(this); m_SerieList.Init(m_Chart, serializedObject, m_Series); + + m_VersionString = "v" + XChartsMgr.fullVersion; + if (m_EnableTextMeshPro.boolValue) + m_VersionString += "-tmp"; } public List RefreshComponent() @@ -165,11 +170,7 @@ namespace XCharts.Editor private void ShowVersion() { - sb.Length = 0; - sb.AppendFormat("v{0}", XChartsMgr.fullVersion); - if(m_EnableTextMeshPro.boolValue) - sb.Append("-tmp"); - EditorGUILayout.HelpBox(sb.ToString(), MessageType.None); + EditorGUILayout.HelpBox(m_VersionString, MessageType.None); } private void AddComponent() diff --git a/README.md b/README.md index 001fd90d..4637d678 100644 --- a/README.md +++ b/README.md @@ -96,20 +96,19 @@ - XCharts2.0 进入维护阶段,后续只修复严重bug理论上不再加新功能。 - XCharts 理论上支持Unity 5.6及以上版本,但由于版本测试有限难免疏漏,发现版本兼容问题可提Issue。 - XCharts 内置图表都为常见的图表,可以免费使用;扩展图表大部分为不常使用的图表,有需要的可付费获取,感谢对XCharts的支持。 +- 本仓库只包含XCharts源码,不包含Demo示例部分。需要查看Demo示例请到[XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo) ## 截图 -[XCharts Demo 项目](https://github.com/XCharts-Team/XCharts-Demo) - ![buildinchart](https://github.com/XCharts-Team/XCharts-Demo/blob/master/buildinchart.png) ![extendchart](https://github.com/XCharts-Team/XCharts-Demo/blob/master/extendchart.png) +更多效果请到 [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo) 查看 + ## 使用 -[XCharts教程:5分钟上手教程](Documentation/XChartsTutorial01-ZH.md) - - +[XCharts教程:5分钟上手教程](Documentation/XChartsTutorial01-ZH.md) ## 日志 diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs index 94e441b2..169d6a37 100644 --- a/Runtime/Internal/BaseChart.Serie.cs +++ b/Runtime/Internal/BaseChart.Serie.cs @@ -854,6 +854,9 @@ namespace XCharts.Runtime private void ResetSeriesIndex() { +#if UNITY_EDITOR && UNITY_2019_1_OR_NEWER + UnityEditor.EditorUtility.SetDirty(this); +#endif for (int i = 0; i < m_Series.Count; i++) { m_Series[i].index = i; diff --git a/Runtime/Theme/Theme.cs b/Runtime/Theme/Theme.cs index b4f2be1a..7eb5b066 100644 --- a/Runtime/Theme/Theme.cs +++ b/Runtime/Theme/Theme.cs @@ -353,7 +353,6 @@ namespace XCharts.Runtime subTitle.tmpFont = tmpFont; legend.tmpFont = tmpFont; axis.tmpFont = tmpFont; - gauge.tmpFont = tmpFont; tooltip.tmpFont = tmpFont; dataZoom.tmpFont = tmpFont; visualMap.tmpFont = tmpFont;