From 63166e5cd167e1c24a2ae1d5cfae93f9564186f5 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 26 May 2022 21:33:05 +0800 Subject: [PATCH] 3.0 --- README-EN.md => Documentation/README-EN.md | 0 README-EN.md.meta => Documentation/README-EN.md.meta | 2 +- Documentation/XChartsTutorial01-ZH.md | 8 +++++--- Runtime/Component/Mark/MarkLineHandler.cs | 2 +- Runtime/Internal/BaseChart.Serie.cs | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) rename README-EN.md => Documentation/README-EN.md (100%) rename README-EN.md.meta => Documentation/README-EN.md.meta (75%) diff --git a/README-EN.md b/Documentation/README-EN.md similarity index 100% rename from README-EN.md rename to Documentation/README-EN.md diff --git a/README-EN.md.meta b/Documentation/README-EN.md.meta similarity index 75% rename from README-EN.md.meta rename to Documentation/README-EN.md.meta index eca53158..9f886566 100644 --- a/README-EN.md.meta +++ b/Documentation/README-EN.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 16271fd54c185499f9e4a915583d43e5 +guid: 29f30ecf23bb44bc5b0820dc5ee7a23e TextScriptImporter: externalObjects: {} userData: diff --git a/Documentation/XChartsTutorial01-ZH.md b/Documentation/XChartsTutorial01-ZH.md index fbd181b7..216e3e89 100644 --- a/Documentation/XChartsTutorial01-ZH.md +++ b/Documentation/XChartsTutorial01-ZH.md @@ -7,15 +7,17 @@ ## 获取和导入 XCharts -1. 直接将XCharts源码到项目 +XCharts可通过以下任意一种方式导入到项目: + +- 直接将XCharts源码到项目 下载好XCharts源码后,直接将XCharts目录拷贝到Unity项目工程的Assets目录下。 -2. 通过`Assets/Import Package`导入XCharts +- 通过`Assets/Import Package`导入XCharts 下载好XCharts的.unitypackage文件后,打开Unity,菜单栏 Assets-->Import Package-->选中.unitypackage导入即可开始使用XCharts。 -3. 通过`Package Manager`导入XCharts +- 通过`Package Manager`导入XCharts 对于Unity 2018.3以上版本,可通过 Package Manager来导入XCharts,打开Package Manager后,通过 `Add package form git URL...`,输入XCharts3.0的GitHub URL: `https://github.com/XCharts-Team/XCharts.git#3.0` 稍等片刻后即可使用XCharts。 diff --git a/Runtime/Component/Mark/MarkLineHandler.cs b/Runtime/Component/Mark/MarkLineHandler.cs index e0471fb4..5be581fc 100644 --- a/Runtime/Component/Mark/MarkLineHandler.cs +++ b/Runtime/Component/Mark/MarkLineHandler.cs @@ -92,7 +92,7 @@ namespace XCharts.Runtime if (!serie.show || !markLine.show) return; if (markLine.data.Count == 0) return; var yAxis = chart.GetChartComponent(serie.yAxisIndex); - var xAxis = chart.GetChartComponent(serie.yAxisIndex); + var xAxis = chart.GetChartComponent(serie.xAxisIndex); var grid = chart.GetChartComponent(xAxis.gridIndex); var dataZoom = chart.GetDataZoomOfAxis(xAxis); var animation = markLine.animation; diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs index 4fa95acf..d5c28b8b 100644 --- a/Runtime/Internal/BaseChart.Serie.cs +++ b/Runtime/Internal/BaseChart.Serie.cs @@ -800,10 +800,10 @@ namespace XCharts.Runtime public float GetSerieTotalGap(float categoryWidth, float gap, int index) where T : Serie { if (index <= 0) return 0; - float total = 0; - barStackSet.Clear(); + var total = 0f; var count = 0; var totalRealBarCount = GetSerieBarRealCount(); + barStackSet.Clear(); for (int i = 0; i < m_Series.Count; i++) { var serie = m_Series[i];