From 57dd2d704ff654098e668b85faa5e5bc57b056ae Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 22 Oct 2019 04:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E6=94=AF=E6=8C=81Package=20Manager=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Demo/Editor.meta | 2 +- .../XCharts/Demo/Editor/ChartModuleDrawer.cs | 9 +- .../Demo/Editor/ChartModuleDrawer.cs.meta | 2 +- Assets/XCharts/Demo/Editor/DemoEditor.cs | 11 +- Assets/XCharts/Demo/Editor/DemoEditor.cs.meta | 2 +- .../Demo/Editor/XCharts.Editor.Demo.asmdef | 17 + .../Editor/XCharts.Editor.Demo.asmdef.meta | 7 + .../Demo/{Scripts.meta => Runtime.meta} | 4 +- Assets/XCharts/Demo/Runtime/Demo.cs | 197 + .../Demo/{Scripts => Runtime}/Demo.cs.meta | 4 +- .../XCharts/Demo/Runtime/Demo00_CheatSheet.cs | 310 + .../Demo00_CheatSheet.cs.meta | 2 +- .../XCharts/Demo/Runtime/Demo10_LineChart.cs | 270 + .../Demo10_LineChart.cs.meta | 2 +- .../Demo/Runtime/Demo11_AddSinCurve.cs | 68 + .../Demo11_AddSinCurve.cs.meta | 2 +- .../Demo/Runtime/Demo12_CustomDrawing.cs | 39 + .../Demo12_CustomDrawing.cs.meta | 2 +- .../XCharts/Demo/Runtime/Demo13_LineSimple.cs | 48 + .../Demo13_LineSimple.cs.meta | 2 +- .../XCharts/Demo/Runtime/Demo20_BarChart.cs | 167 + .../Demo20_BarChart.cs.meta | 2 +- .../XCharts/Demo/Runtime/Demo30_PieChart.cs | 206 + .../Demo30_PieChart.cs.meta | 2 +- Assets/XCharts/Demo/Runtime/Demo50_Scatter.cs | 38 + .../Demo50_Scatter.cs.meta | 2 +- Assets/XCharts/Demo/Runtime/Demo60_Heatmap.cs | 104 + .../Demo60_Heatmap.cs.meta | 2 +- Assets/XCharts/Demo/Runtime/Demo_Dynamic.cs | 71 + .../{Scripts => Runtime}/Demo_Dynamic.cs.meta | 4 +- Assets/XCharts/Demo/Runtime/Demo_LargeData.cs | 55 + .../Demo_LargeData.cs.meta | 4 +- Assets/XCharts/Demo/Runtime/Demo_PieChart.cs | 46 + .../Demo_PieChart.cs.meta | 4 +- Assets/XCharts/Demo/Runtime/Demo_Test.cs | 41 + .../{Scripts => Runtime}/Demo_Test.cs.meta | 2 +- .../Demo/Runtime/XCharts.Demo.Runtime.asmdef | 14 + .../Runtime/XCharts.Demo.Runtime.asmdef.meta | 7 + Assets/XCharts/Demo/Scripts/Demo.cs | 189 - .../XCharts/Demo/Scripts/Demo00_CheatSheet.cs | 301 - .../XCharts/Demo/Scripts/Demo10_LineChart.cs | 264 - .../Demo/Scripts/Demo11_AddSinCurve.cs | 59 - .../Demo/Scripts/Demo12_CustomDrawing.cs | 29 - .../XCharts/Demo/Scripts/Demo13_LineSimple.cs | 39 - .../XCharts/Demo/Scripts/Demo20_BarChart.cs | 163 - .../XCharts/Demo/Scripts/Demo30_PieChart.cs | 197 - Assets/XCharts/Demo/Scripts/Demo50_Scatter.cs | 29 - Assets/XCharts/Demo/Scripts/Demo60_Heatmap.cs | 95 - Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs | 62 - Assets/XCharts/Demo/Scripts/Demo_LargeData.cs | 46 - Assets/XCharts/Demo/Scripts/Demo_PieChart.cs | 37 - Assets/XCharts/Demo/Scripts/Demo_Test.cs | 32 - Assets/XCharts/Demo/demo_xchart.unity | 290902 ++++++++++----- .../XCharts/Scripts/Editor/BarChartEditor.cs | 9 +- .../XCharts/Scripts/Editor/BaseChartEditor.cs | 11 +- .../Scripts/Editor/CoordinateChartEditor.cs | 10 +- .../Scripts/Editor/HeatmapChartEditor.cs | 9 +- .../XCharts/Scripts/Editor/LineChartEditor.cs | 9 +- .../XCharts/Scripts/Editor/PieChartEditor.cs | 9 +- .../Editor/PropertyDrawers/AnimationDrawer.cs | 9 +- .../Editor/PropertyDrawers/AreaStyleDrawer.cs | 9 +- .../Editor/PropertyDrawers/AxisDrawer.cs | 9 +- .../Editor/PropertyDrawers/AxisLabelDrawer.cs | 9 +- .../Editor/PropertyDrawers/AxisLineDrawer.cs | 9 +- .../Editor/PropertyDrawers/AxisNameDrawer.cs | 9 +- .../PropertyDrawers/AxisSplitAreaDrawer.cs | 9 +- .../Editor/PropertyDrawers/AxisTickDrawer.cs | 9 +- .../Editor/PropertyDrawers/DataZoomDrawer.cs | 9 +- .../PropertyDrawers/EmphasisStyleDrawer.cs | 9 +- .../Editor/PropertyDrawers/GridDrawer.cs | 9 +- .../Editor/PropertyDrawers/ItemStyleDrawer.cs | 9 +- .../Editor/PropertyDrawers/LegendDrawer.cs | 9 +- .../Editor/PropertyDrawers/LineArrowDrawer.cs | 9 +- .../Editor/PropertyDrawers/LineStyleDrawer.cs | 9 +- .../Editor/PropertyDrawers/LocationDrawer.cs | 9 +- .../Editor/PropertyDrawers/RadarDrawer.cs | 9 +- .../PropertyDrawers/RadarIndicatorDrawer.cs | 9 +- .../Editor/PropertyDrawers/SerieDrawer.cs | 10 +- .../PropertyDrawers/SerieLabelDrawer.cs | 9 +- .../PropertyDrawers/SerieSymbolDrawer.cs | 9 +- .../Editor/PropertyDrawers/SeriesDrawer.cs | 9 +- .../Editor/PropertyDrawers/SettingsDrawer.cs | 9 +- .../Editor/PropertyDrawers/ThemeInfoDrawer.cs | 9 +- .../Editor/PropertyDrawers/TitleDrawer.cs | 9 +- .../Editor/PropertyDrawers/TooltipDrawer.cs | 9 +- .../Editor/PropertyDrawers/VisualMapDrawer.cs | 13 +- .../Editor/PropertyDrawers/XAxisDrawer.cs | 11 +- .../Editor/PropertyDrawers/YAxisDrawer.cs | 11 +- .../Scripts/Editor/RadarChartEditor.cs | 9 +- .../Scripts/Editor/ScatterChartEditor.cs | 9 +- .../Scripts/Editor/XCharts.Editor.asmdef | 16 + .../Scripts/Editor/XCharts.Editor.asmdef.meta | 7 + .../XCharts/Scripts/{UI.meta => Runtime.meta} | 4 +- .../XCharts/Scripts/{UI => Runtime}/API.meta | 0 .../{UI => Runtime}/API/BaseChart_API.cs | 9 +- .../{UI => Runtime}/API/BaseChart_API.cs.meta | 0 .../API/CoordinateChart_API.cs | 9 +- .../API/CoordinateChart_API.cs.meta | 0 .../Scripts/{UI => Runtime}/BarChart.cs | 9 +- .../Scripts/{UI => Runtime}/BarChart.cs.meta | 0 .../Scripts/{UI => Runtime}/Component.meta | 0 .../Component/ChartComponent.cs | 7 + .../Component/ChartComponent.cs.meta | 0 .../{UI => Runtime}/Component/Main.meta | 0 .../{UI => Runtime}/Component/Main/Axis.cs | 12 +- .../Component/Main/Axis.cs.meta | 0 .../Component/Main/DataZoom.cs | 9 +- .../Component/Main/DataZoom.cs.meta | 0 .../{UI => Runtime}/Component/Main/Grid.cs | 9 +- .../Component/Main/Grid.cs.meta | 0 .../{UI => Runtime}/Component/Main/Legend.cs | 8 +- .../Component/Main/Legend.cs.meta | 0 .../{UI => Runtime}/Component/Main/Radar.cs | 9 +- .../Component/Main/Radar.cs.meta | 0 .../{UI => Runtime}/Component/Main/Serie.cs | 8 +- .../Component/Main/Serie.cs.meta | 0 .../{UI => Runtime}/Component/Main/Series.cs | 9 +- .../Component/Main/Series.cs.meta | 0 .../Component/Main/Settings.cs | 7 + .../Component/Main/Settings.cs.meta | 0 .../{UI => Runtime}/Component/Main/Theme.cs | 9 +- .../Component/Main/Theme.cs.meta | 0 .../{UI => Runtime}/Component/Main/Title.cs | 9 +- .../Component/Main/Title.cs.meta | 0 .../{UI => Runtime}/Component/Main/Tooltip.cs | 10 +- .../Component/Main/Tooltip.cs.meta | 0 .../Component/Main/VisualMap.cs | 9 +- .../Component/Main/VisualMap.cs.meta | 0 .../Runtime/Component/MainComponent.cs | 13 + .../Component/MainComponent.cs.meta | 0 .../{UI => Runtime}/Component/Sub.meta | 0 .../Component/Sub/Animation.cs | 9 +- .../Component/Sub/Animation.cs.meta | 0 .../Component/Sub/AreaStyle.cs | 7 + .../Component/Sub/AreaStyle.cs.meta | 0 .../Component/Sub/AxisLabel.cs | 7 + .../Component/Sub/AxisLabel.cs.meta | 0 .../{UI => Runtime}/Component/Sub/AxisLine.cs | 7 + .../Component/Sub/AxisLine.cs.meta | 0 .../{UI => Runtime}/Component/Sub/AxisName.cs | 7 + .../Component/Sub/AxisName.cs.meta | 0 .../Component/Sub/AxisSplitArea.cs | 7 + .../Component/Sub/AxisSplitArea.cs.meta | 0 .../{UI => Runtime}/Component/Sub/AxisTick.cs | 7 + .../Component/Sub/AxisTick.cs.meta | 0 .../{UI => Runtime}/Component/Sub/Emphasis.cs | 7 + .../Component/Sub/Emphasis.cs.meta | 0 .../Component/Sub/ItemStyle.cs | 7 + .../Component/Sub/ItemStyle.cs.meta | 0 .../Component/Sub/LineArrow.cs | 7 + .../Component/Sub/LineArrow.cs.meta | 0 .../Component/Sub/LineStyle.cs | 7 + .../Component/Sub/LineStyle.cs.meta | 0 .../{UI => Runtime}/Component/Sub/Location.cs | 9 +- .../Component/Sub/Location.cs.meta | 0 .../Component/Sub/SerieData.cs | 9 +- .../Component/Sub/SerieData.cs.meta | 0 .../Component/Sub/SerieLabel.cs | 9 +- .../Component/Sub/SerieLabel.cs.meta | 0 .../Component/Sub/SerieSymbol.cs | 9 +- .../Component/Sub/SerieSymbol.cs.meta | 0 .../Scripts/Runtime/Component/SubComponent.cs | 13 + .../Component/SubComponent.cs.meta | 0 .../Scripts/{UI => Runtime}/HeatmapChart.cs | 10 +- .../{UI => Runtime}/HeatmapChart.cs.meta | 0 .../Scripts/{UI => Runtime}/Helper.meta | 0 .../Scripts/Runtime/Helper/VisualMapHelper.cs | 14 + .../Helper/VisualMapHelper.cs.meta | 0 .../Scripts/{UI => Runtime}/Interface.meta | 0 .../Scripts/Runtime/Interface/IJsonData.cs | 17 + .../Interface/IJsonData.cs.meta | 0 .../Runtime/Interface/IPropertyChanged.cs | 18 + .../Interface/IPropertyChanged.cs.meta | 0 .../Scripts/{UI => Runtime}/Internal.meta | 0 .../{UI => Runtime}/Internal/AxisPool.cs | 8 +- .../{UI => Runtime}/Internal/AxisPool.cs.meta | 0 .../{UI => Runtime}/Internal/BaseChart.cs | 8 +- .../Internal/BaseChart.cs.meta | 0 .../Internal/CoordinateChart.cs | 9 +- .../Internal/CoordinateChart.cs.meta | 0 .../Internal/CoordinateChart_DrawBar.cs | 8 +- .../Internal/CoordinateChart_DrawBar.cs.meta | 0 .../Internal/CoordinateChart_DrawHeatmap.cs | 14 +- .../CoordinateChart_DrawHeatmap.cs.meta | 0 .../Internal/CoordinateChart_DrawLine.cs | 10 +- .../Internal/CoordinateChart_DrawLine.cs.meta | 0 .../Internal/CoordinateChart_DrawScatter.cs | 9 +- .../CoordinateChart_DrawScatter.cs.meta | 0 .../Internal/JsonDataSupport.cs | 9 +- .../Internal/JsonDataSupport.cs.meta | 0 .../{UI => Runtime}/Internal/ListPool.cs | 7 + .../{UI => Runtime}/Internal/ListPool.cs.meta | 0 .../{UI => Runtime}/Internal/ObjectPool.cs | 7 + .../Internal/ObjectPool.cs.meta | 0 .../Scripts/{UI => Runtime}/LineChart.cs | 11 +- .../Scripts/{UI => Runtime}/LineChart.cs.meta | 0 .../Scripts/{UI => Runtime}/PieChart.cs | 10 +- .../Scripts/{UI => Runtime}/PieChart.cs.meta | 0 .../Scripts/{UI => Runtime}/RadarChart.cs | 9 +- .../{UI => Runtime}/RadarChart.cs.meta | 0 .../Scripts/{UI => Runtime}/ScatterChart.cs | 9 +- .../{UI => Runtime}/ScatterChart.cs.meta | 0 .../Scripts/{UI => Runtime}/Utility.meta | 0 .../{UI => Runtime}/Utility/ChartCached.cs | 7 + .../Utility/ChartCached.cs.meta | 0 .../{UI => Runtime}/Utility/ChartDrawer.cs | 7 + .../Utility/ChartDrawer.cs.meta | 0 .../{UI => Runtime}/Utility/ChartHelper.cs | 11 +- .../Utility/ChartHelper.cs.meta | 0 .../Scripts/Runtime/XCharts.Runtime.asmdef | 12 + .../Runtime/XCharts.Runtime.asmdef.meta | 7 + .../Scripts/UI/Component/MainComponent.cs | 6 - .../Scripts/UI/Component/SubComponent.cs | 6 - .../Scripts/UI/Helper/VisualMapHelper.cs | 7 - .../XCharts/Scripts/UI/Interface/IJsonData.cs | 10 - .../Scripts/UI/Interface/IPropertyChanged.cs | 11 - Assets/XCharts/package.json | 14 + Assets/XCharts/package.json.meta | 7 + 218 files changed, 197991 insertions(+), 97171 deletions(-) create mode 100644 Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef create mode 100644 Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef.meta rename Assets/XCharts/Demo/{Scripts.meta => Runtime.meta} (62%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo.cs.meta (71%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo00_CheatSheet.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo00_CheatSheet.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo10_LineChart.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo10_LineChart.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo11_AddSinCurve.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo11_AddSinCurve.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo12_CustomDrawing.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo12_CustomDrawing.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo13_LineSimple.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo13_LineSimple.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo20_BarChart.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo20_BarChart.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo30_PieChart.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo30_PieChart.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo50_Scatter.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo50_Scatter.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo60_Heatmap.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo60_Heatmap.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo_Dynamic.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo_Dynamic.cs.meta (71%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo_LargeData.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo_LargeData.cs.meta (71%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo_PieChart.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo_PieChart.cs.meta (71%) create mode 100644 Assets/XCharts/Demo/Runtime/Demo_Test.cs rename Assets/XCharts/Demo/{Scripts => Runtime}/Demo_Test.cs.meta (83%) create mode 100644 Assets/XCharts/Demo/Runtime/XCharts.Demo.Runtime.asmdef create mode 100644 Assets/XCharts/Demo/Runtime/XCharts.Demo.Runtime.asmdef.meta delete mode 100644 Assets/XCharts/Demo/Scripts/Demo.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo00_CheatSheet.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo10_LineChart.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo11_AddSinCurve.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo12_CustomDrawing.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo13_LineSimple.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo20_BarChart.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo30_PieChart.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo50_Scatter.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo60_Heatmap.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo_LargeData.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo_PieChart.cs delete mode 100644 Assets/XCharts/Demo/Scripts/Demo_Test.cs create mode 100644 Assets/XCharts/Scripts/Editor/XCharts.Editor.asmdef create mode 100644 Assets/XCharts/Scripts/Editor/XCharts.Editor.asmdef.meta rename Assets/XCharts/Scripts/{UI.meta => Runtime.meta} (62%) rename Assets/XCharts/Scripts/{UI => Runtime}/API.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/API/BaseChart_API.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/API/BaseChart_API.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/API/CoordinateChart_API.cs (95%) rename Assets/XCharts/Scripts/{UI => Runtime}/API/CoordinateChart_API.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/BarChart.cs (69%) rename Assets/XCharts/Scripts/{UI => Runtime}/BarChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/ChartComponent.cs (75%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/ChartComponent.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Axis.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Axis.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/DataZoom.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/DataZoom.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Grid.cs (94%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Grid.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Legend.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Legend.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Radar.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Radar.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Serie.cs (99%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Serie.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Series.cs (99%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Series.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Settings.cs (93%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Settings.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Theme.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Theme.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Title.cs (94%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Title.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Tooltip.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/Tooltip.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/VisualMap.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Main/VisualMap.cs.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/Component/MainComponent.cs rename Assets/XCharts/Scripts/{UI => Runtime}/Component/MainComponent.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Animation.cs (95%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Animation.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AreaStyle.cs (93%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AreaStyle.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisLabel.cs (95%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisLabel.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisLine.cs (91%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisLine.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisName.cs (93%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisName.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisSplitArea.cs (86%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisSplitArea.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisTick.cs (87%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/AxisTick.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Emphasis.cs (75%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Emphasis.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/ItemStyle.cs (87%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/ItemStyle.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/LineArrow.cs (87%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/LineArrow.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/LineStyle.cs (89%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/LineStyle.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Location.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/Location.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieData.cs (96%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieData.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieLabel.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieLabel.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieSymbol.cs (96%) rename Assets/XCharts/Scripts/{UI => Runtime}/Component/Sub/SerieSymbol.cs.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/Component/SubComponent.cs rename Assets/XCharts/Scripts/{UI => Runtime}/Component/SubComponent.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/HeatmapChart.cs (94%) rename Assets/XCharts/Scripts/{UI => Runtime}/HeatmapChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Helper.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/Helper/VisualMapHelper.cs rename Assets/XCharts/Scripts/{UI => Runtime}/Helper/VisualMapHelper.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Interface.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/Interface/IJsonData.cs rename Assets/XCharts/Scripts/{UI => Runtime}/Interface/IJsonData.cs.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/Interface/IPropertyChanged.cs rename Assets/XCharts/Scripts/{UI => Runtime}/Interface/IPropertyChanged.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/AxisPool.cs (72%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/AxisPool.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/BaseChart.cs (99%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/BaseChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart.cs (99%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawBar.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawBar.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawHeatmap.cs (97%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawHeatmap.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawLine.cs (99%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawLine.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawScatter.cs (91%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/CoordinateChart_DrawScatter.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/JsonDataSupport.cs (76%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/JsonDataSupport.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/ListPool.cs (63%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/ListPool.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/ObjectPool.cs (84%) rename Assets/XCharts/Scripts/{UI => Runtime}/Internal/ObjectPool.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/LineChart.cs (71%) rename Assets/XCharts/Scripts/{UI => Runtime}/LineChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/PieChart.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/PieChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/RadarChart.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/RadarChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/ScatterChart.cs (87%) rename Assets/XCharts/Scripts/{UI => Runtime}/ScatterChart.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartCached.cs (88%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartCached.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartDrawer.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartDrawer.cs.meta (100%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartHelper.cs (98%) rename Assets/XCharts/Scripts/{UI => Runtime}/Utility/ChartHelper.cs.meta (100%) create mode 100644 Assets/XCharts/Scripts/Runtime/XCharts.Runtime.asmdef create mode 100644 Assets/XCharts/Scripts/Runtime/XCharts.Runtime.asmdef.meta delete mode 100644 Assets/XCharts/Scripts/UI/Component/MainComponent.cs delete mode 100644 Assets/XCharts/Scripts/UI/Component/SubComponent.cs delete mode 100644 Assets/XCharts/Scripts/UI/Helper/VisualMapHelper.cs delete mode 100644 Assets/XCharts/Scripts/UI/Interface/IJsonData.cs delete mode 100644 Assets/XCharts/Scripts/UI/Interface/IPropertyChanged.cs create mode 100644 Assets/XCharts/package.json create mode 100644 Assets/XCharts/package.json.meta diff --git a/Assets/XCharts/Demo/Editor.meta b/Assets/XCharts/Demo/Editor.meta index dcffc9b7..1896fb2f 100644 --- a/Assets/XCharts/Demo/Editor.meta +++ b/Assets/XCharts/Demo/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc28a4ebefb884f6ab7132e3910b7461 +guid: 05b7d15b7a92f4c1eb56dbf47522bf6c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs b/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs index b8cfbf88..1a609b4a 100644 --- a/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs +++ b/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs @@ -1,4 +1,11 @@ -using UnityEditor; +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using UnityEditor; using UnityEngine; namespace XCharts diff --git a/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs.meta b/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs.meta index 02bf09b5..df5c8c51 100644 --- a/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs.meta +++ b/Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97c0f1cf754c54fd1913ec5b4129c6e5 +guid: 2fbbaed3e670f478c844c1bdfc73d433 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/XCharts/Demo/Editor/DemoEditor.cs b/Assets/XCharts/Demo/Editor/DemoEditor.cs index 62d5fb30..f2928fc5 100644 --- a/Assets/XCharts/Demo/Editor/DemoEditor.cs +++ b/Assets/XCharts/Demo/Editor/DemoEditor.cs @@ -1,5 +1,12 @@ -using UnityEditor; -using UnityEngine; + +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using UnityEditor; namespace XCharts { diff --git a/Assets/XCharts/Demo/Editor/DemoEditor.cs.meta b/Assets/XCharts/Demo/Editor/DemoEditor.cs.meta index 207a1834..0e512df0 100644 --- a/Assets/XCharts/Demo/Editor/DemoEditor.cs.meta +++ b/Assets/XCharts/Demo/Editor/DemoEditor.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc37c9f35cd6b4f0f936526a63fb19a5 +guid: 90c1787bea03849c8b6d19be625b7e17 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef b/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef new file mode 100644 index 00000000..ebf6f8e5 --- /dev/null +++ b/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef @@ -0,0 +1,17 @@ +{ + "name": "XCharts.Editor.Demo", + "references": [ + "XCharts.Demo.Runtime", + "XCharts.Runtime" + ], + "optionalUnityReferences": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [] +} \ No newline at end of file diff --git a/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef.meta b/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef.meta new file mode 100644 index 00000000..67d354f5 --- /dev/null +++ b/Assets/XCharts/Demo/Editor/XCharts.Editor.Demo.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d3606aaaf73f468984f4615b496f408 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XCharts/Demo/Scripts.meta b/Assets/XCharts/Demo/Runtime.meta similarity index 62% rename from Assets/XCharts/Demo/Scripts.meta rename to Assets/XCharts/Demo/Runtime.meta index 1aaf0b4d..0e44740f 100644 --- a/Assets/XCharts/Demo/Scripts.meta +++ b/Assets/XCharts/Demo/Runtime.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: 2fa21c3b32aa26a49ababb5a99f12222 +guid: f67670c9ee0e64262950aaf07562454e folderAsset: yes -timeCreated: 1555731519 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/XCharts/Demo/Runtime/Demo.cs b/Assets/XCharts/Demo/Runtime/Demo.cs new file mode 100644 index 00000000..270650d9 --- /dev/null +++ b/Assets/XCharts/Demo/Runtime/Demo.cs @@ -0,0 +1,197 @@ +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace XCharts +{ + [System.Serializable] + public class ChartModule + { + [SerializeField] private string m_Name; + [SerializeField] private string m_Title; + [SerializeField] private bool m_Selected; + [SerializeField] private GameObject m_Panel; + + public string name { get { return m_Name; } set { m_Name = value; } } + public string title { get { return m_Title; } set { m_Title = value; } } + public bool select { get { return m_Selected; } set { m_Selected = value; } } + public GameObject panel { get { return m_Panel; } set { m_Panel = value; } } + public Button button { get; set; } + } + + [DisallowMultipleComponent] + [ExecuteInEditMode] + public class Demo : MonoBehaviour + { + [SerializeField] private Color m_ButtonNormalColor; + [SerializeField] private Color m_ButtonSelectedColor; + [SerializeField] private Color m_ButtonHighlightColor; + [SerializeField] private List m_ChartModule; + + private GameObject m_BtnClone; + private Theme m_SelectedTheme; + private int m_LastSelectedModuleIndex; + + private Button m_DefaultThemeButton; + private Button m_LightThemeButton; + private Button m_DarkThemeButton; + + private Text m_Title; + + private ScrollRect m_ScrollRect; + private Mask m_Mark; + + void Awake() + { + m_SelectedTheme = Theme.Default; + + m_ButtonNormalColor = ChartHelper.GetColor("#293C55FF"); + m_ButtonSelectedColor = ChartHelper.GetColor("#e43c59ff"); + m_ButtonHighlightColor = ChartHelper.GetColor("#0E151FFF"); + + m_ScrollRect = transform.Find("chart_detail").GetComponent(); + m_Mark = transform.Find("chart_detail/Viewport").GetComponent(); + m_Mark.enabled = true; + m_Title = transform.Find("chart_title/Text").GetComponent(); + + InitThemeButton(); + InitModuleButton(); + } + + void Update() + { +#if UNITY_EDITOR + if (m_ChartModule.Count <= 0) return; + int selectedModuleIndex = -1; + for (int i = 0; i < m_ChartModule.Count; i++) + { + if (selectedModuleIndex >= 0 && i > selectedModuleIndex) + { + m_ChartModule[i].select = false; + } + else if (m_ChartModule[i].select) + { + selectedModuleIndex = i; + } + } + if (selectedModuleIndex < 0) selectedModuleIndex = 0; + if (selectedModuleIndex != m_LastSelectedModuleIndex) + { + InitModuleButton(); + } + if (!Application.isPlaying) m_Mark.enabled = false; +#endif + } + + void InitModuleButton() + { + var btnPanel = transform.Find("chart_list"); + m_BtnClone = transform.Find("btn_clone").gameObject; + m_BtnClone.SetActive(false); + ChartHelper.DestoryAllChilds(btnPanel); + foreach (var module in m_ChartModule) + { + var btnName = "btn_" + module.name; + GameObject btn; + if (btnPanel.Find(btnName)) + { + btn = btnPanel.Find(btnName).gameObject; + btn.SetActive(true); + } + else + { + btn = GameObject.Instantiate(m_BtnClone); + btn.SetActive(true); + btn.name = btnName; + btn.transform.SetParent(btnPanel); + btn.transform.localPosition = Vector3.zero; + } + btn.transform.localScale = Vector3.one; + module.button = btn.GetComponent