diff --git a/Assets/XCharts/Editor/PropertyDrawers/ThemeDrawer.cs b/Assets/XCharts/Editor/PropertyDrawers/ThemeDrawer.cs index 5b28035b..7cc4fdff 100644 --- a/Assets/XCharts/Editor/PropertyDrawers/ThemeDrawer.cs +++ b/Assets/XCharts/Editor/PropertyDrawers/ThemeDrawer.cs @@ -17,7 +17,6 @@ namespace XCharts [CustomPropertyDrawer(typeof(ChartTheme), true)] public class ThemeDrawer : BasePropertyDrawer { - private bool m_ThemeModuleToggle = false; public override string ClassName { get { return "Theme"; } } public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label) { diff --git a/Assets/XCharts/Examples/Runtime/Example100_Gantt_Category.cs b/Assets/XCharts/Examples/Runtime/Example100_Gantt_Category.cs index 6b5d666b..183d0113 100644 --- a/Assets/XCharts/Examples/Runtime/Example100_Gantt_Category.cs +++ b/Assets/XCharts/Examples/Runtime/Example100_Gantt_Category.cs @@ -41,7 +41,6 @@ namespace XCharts.Examples { for (int i = 0; i < taskCount; i++) { - var taskName = "task-" + (i + 1); var startIndex = Random.Range(0, (int)(dayCount * 2.0f / 3)); var endIndex = Random.Range(startIndex, dayCount); chart.UpdateData(0, i, 0, startIndex); @@ -67,7 +66,7 @@ namespace XCharts.Examples chart.AddXAxisData("day" + (i + 1)); } - var serie = chart.AddSerie(SerieType.Gantt, "任务进度表"); + chart.AddSerie(SerieType.Gantt, "任务进度表"); for (int i = 0; i < taskCount; i++) { var taskName = "task-" + (i + 1); diff --git a/Assets/XCharts/Examples/Runtime/Example101_Gantt_Time.cs b/Assets/XCharts/Examples/Runtime/Example101_Gantt_Time.cs index ebe47aa8..b100d28b 100644 --- a/Assets/XCharts/Examples/Runtime/Example101_Gantt_Time.cs +++ b/Assets/XCharts/Examples/Runtime/Example101_Gantt_Time.cs @@ -47,7 +47,7 @@ namespace XCharts.Examples var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24; chart.AddData(0, startTimestamp, endTimestamp, taskName); } - var serie2 = chart.AddSerie(SerieType.Gantt, "李四"); + chart.AddSerie(SerieType.Gantt, "李四"); for (int i = 0; i < taskCount; i++) { var taskName = "李四-任务-" + (i + 1); @@ -85,7 +85,7 @@ namespace XCharts.Examples var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24; chart.AddData(0, startTimestamp, endTimestamp, taskName); } - var serie2 = chart.AddSerie(SerieType.Gantt, "李四"); + chart.AddSerie(SerieType.Gantt, "李四"); for (int i = 0; i < taskCount; i++) { var taskName = "李四-任务-" + (i + 1); diff --git a/Assets/XCharts/Examples/Runtime/Example90_Candlestick.cs b/Assets/XCharts/Examples/Runtime/Example90_Candlestick.cs index 1ab23d78..f7b12b55 100644 --- a/Assets/XCharts/Examples/Runtime/Example90_Candlestick.cs +++ b/Assets/XCharts/Examples/Runtime/Example90_Candlestick.cs @@ -61,7 +61,7 @@ namespace XCharts.Examples if(openIdx == closeIdx){ closeIdx ++; } - var volumn = boxVals[3]*(1000+Random.Range(0f,1f) * 500); + //var volumn = boxVals[3]*(1000+Random.Range(0f,1f) * 500); var open = boxVals[openIdx]; var close = boxVals[closeIdx]; var lowest = boxVals[0]; diff --git a/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs b/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs index c18799b3..5c32bd1f 100644 --- a/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs +++ b/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs @@ -510,37 +510,5 @@ namespace XCharts { return base.GetHashCode(); } - - internal virtual void SetVerticesDirty() - { - m_VertsDirty = true; - } - - internal virtual void ClearVerticesDirty() - { - m_VertsDirty = false; - } - - internal virtual void SetComponentDirty() - { - m_ComponentDirty = true; - } - - internal virtual void ClearComponentDirty() - { - m_ComponentDirty = false; - } - - public virtual void ClearDirty() - { - ClearVerticesDirty(); - ClearComponentDirty(); - } - - public virtual void SetAllDirty() - { - SetVerticesDirty(); - SetComponentDirty(); - } } } \ No newline at end of file diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs index eeed14f7..6ce8235c 100644 --- a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs +++ b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs @@ -389,7 +389,6 @@ namespace XCharts } UpdateSerieGridIndex(); RefreshSeriePainterByGridIndex(grid.index); - var category = tempAxis.GetData(index, dataZoom); var content = TooltipHelper.GetFormatterContent(tooltip, index, this, dataZoom, isCartesian); TooltipHelper.SetContentAndPosition(tooltip, content, chartRect); tooltip.SetActive(true); @@ -645,7 +644,6 @@ namespace XCharts { if (axis.type != Axis.AxisType.Category) return; if (axis.data.Count > 0) return; - var isYAxis = axis is YAxis; if (this is GanttChart) { axis.runtimeData.Clear(); diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawCandlestick.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawCandlestick.cs index b66cc30a..0ce5c8f4 100644 --- a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawCandlestick.cs +++ b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawCandlestick.cs @@ -25,7 +25,6 @@ namespace XCharts float barGap = GetBarGap(); float barWidth = serie.GetBarWidth(categoryWidth); float space = (categoryWidth - barWidth) / 2; - float barGapWidth = barWidth + barWidth * barGap; int maxCount = serie.maxShow > 0 ? (serie.maxShow > showData.Count ? showData.Count : serie.maxShow) : showData.Count; diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawGantt.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawGantt.cs index 0b885de9..6c43e5d6 100644 --- a/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawGantt.cs +++ b/Assets/XCharts/Runtime/Internal/CoordinateChart_DrawGantt.cs @@ -23,7 +23,6 @@ namespace XCharts var grid = GetSerieGridOrDefault(serie); var xCategoryWidth = AxisHelper.GetDataWidth(xAxis, grid.runtimeWidth, showData.Count, dataZoom); var yCategoryWidth = AxisHelper.GetDataWidth(yAxis, grid.runtimeHeight, showData.Count, dataZoom); - var barGap = GetBarGap(); var barWidth = serie.GetBarWidth(yCategoryWidth); var space = (yCategoryWidth - barWidth) / 2; var dataChanging = false; diff --git a/Assets/XCharts/Runtime/Template/SerieTemplate.cs b/Assets/XCharts/Runtime/Template/SerieTemplate.cs index 3e2aeff4..f93a43c2 100644 --- a/Assets/XCharts/Runtime/Template/SerieTemplate.cs +++ b/Assets/XCharts/Runtime/Template/SerieTemplate.cs @@ -205,7 +205,6 @@ namespace XCharts serie.showDataName = true; serie.showDataDimension = 2; var timestamp = DateTimeUtil.GetTimestamp(); - var now = DateTimeUtil.GetDateTime(timestamp); for (int i = 0; i < dataCount; i++) { var start = timestamp + Random.Range(1, 6) * 3600 * 24; diff --git a/Assets/XCharts/Runtime/XChartsMgr.cs b/Assets/XCharts/Runtime/XChartsMgr.cs index c0ef1b47..80ee0f88 100644 --- a/Assets/XCharts/Runtime/XChartsMgr.cs +++ b/Assets/XCharts/Runtime/XChartsMgr.cs @@ -386,7 +386,7 @@ namespace XCharts { #if UNITY_2018_1_OR_NEWER - foreach (var assembly in CompilationPipeline.GetAssemblies(AssembliesType.Player)) + foreach (var assembly in UnityEditor.Compilation.CompilationPipeline.GetAssemblies(UnityEditor.Compilation.AssembliesType.Player)) { if (assembly.name.Equals("Unity.TextMeshPro")) return true; } @@ -414,7 +414,6 @@ namespace XCharts Debug.LogError("AddTMPRefence ERROR: can't find: " + asmdefPath); return false; } - var oldText = File.ReadAllText(asmdefPath); try { var dest = new List();