diff --git a/Documentation~/en/api.md b/Documentation~/en/api.md index f7964d7a..30e48d6a 100644 --- a/Documentation~/en/api.md +++ b/Documentation~/en/api.md @@ -1480,6 +1480,7 @@ The edge of graph. |public method|since|description| |--|--|--| |GraphEdge()||public GraphEdge(GraphNode node1, GraphNode node2, double value)| +|IsPointInEdge()||public bool IsPointInEdge(Vector2 point)| ## GraphNode diff --git a/Documentation~/en/changelog.md b/Documentation~/en/changelog.md index ea0198da..f4f3f44c 100644 --- a/Documentation~/en/changelog.md +++ b/Documentation~/en/changelog.md @@ -2,6 +2,7 @@ # 更新日志 [master](#master) +[v3.11.0](#v3110) [v3.10.2](#v3102) [v3.10.1](#v3101) [v3.10.0](#v3100) @@ -68,6 +69,41 @@ ## master +## v3.11.0 + +Release Highlights: + +* Added `Line3DChart` for 3D line charts +* Added `GraphChart` for relationship graphs +* Added support for 3D coordinate systems +* Added `triggerOn` setting for `Tooltip` to define trigger conditions +* Various bug fixes and optimizations + +Changelog Details: + +* (2024.06.16) Released version `v3.11.0` +* (2024.06.15) Added buttons for adding, deleting, and moving data up and down under `Editor` +* (2024.06.11) Fixed issue where `Axis`'s `IndicatorLabel` might overlap with `Tooltip` +* (2024.06.11) Fixed issue where `Tooltip`'s `Axis` `IndicatorLabel` might not display when in `Cross` mode (#315) +* (2024.06.10) Renamed `Tooltip`'s `Corss` to `Cross` +* (2024.06.09) Added `minCategorySpacing` setting for `Axis` to define the default minimum category spacing +* (2024.06.09) Fixed inaccurate indicator position of `Tooltip`'s `Cross` when `Axis` is a category axis and `DataZoom` is enabled +* (2024.06.06) Fixed animation issue when `Serie` is cloned (#320) +* (2024.06.04) Fixed issue where `Serie`'s `state` does not refresh when set dynamically via code +* (2024.05.29) Adjusted the right-click menu of `XCharts` in the `Hierarchy` view to `UI/XCharts` +* (2024.05.29) Added support for 3D coordinate systems to category axes +* (2024.05.19) Optimized editing performance in `Editor` +* (2024.05.09) Added utility class `JsonUtil` +* (2024.04.23) Fixed chart exception issue after multiple calls to `ConvertXYAxis()` +* (2024.04.22) Fixed potential incorrect retrieval of `GridCoord` when `DataZoom` controls multiple axes (#317) +* (2024.04.22) Added 3D coordinate system +* (2024.04.15) Optimized `DateTimeUtil` for timezone issues when converting timestamps to `DateTime` +* (2024.04.15) Optimized `GridCoord` to display `Left` `Right` `Top` `Bottom` parameters even when `GridLayout` is enabled (#316) +* (2024.04.14) Fixed incorrect label position of `Tooltip`'s `Cross` when `DataZoom` is enabled (#315) +* (2024.04.12) Fixed incorrect effect of `Candlesticks` (#313) +* (2024.03.20) Added `triggerOn` setting for `Tooltip` to define trigger conditions +* (2024.03.19) Fixed color issue when setting `opacity` in `Pie`'s `ItemStyle` (#309) + ## v3.10.2 * (2024.03.11) Release `v3.10.2` diff --git a/Documentation~/zh/api.md b/Documentation~/zh/api.md index 111f3836..7c2352d4 100644 --- a/Documentation~/zh/api.md +++ b/Documentation~/zh/api.md @@ -1480,6 +1480,7 @@ DataZoom 组件 用于区域缩放，从而能自由关注细节的数据信息 |API|版本|描述| |--|--|--| |GraphEdge()||public GraphEdge(GraphNode node1, GraphNode node2, double value)| +|IsPointInEdge()||public bool IsPointInEdge(Vector2 point)| ## GraphNode diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md index acc046fa..5e4132a5 100644 --- a/Documentation~/zh/changelog.md +++ b/Documentation~/zh/changelog.md @@ -6,6 +6,7 @@ slug: /changelog # 更新日志 [master](#master) +[v3.11.0](#v3110) [v3.10.2](#v3102) [v3.10.1](#v3101) [v3.10.0](#v3100) @@ -73,6 +74,19 @@ slug: /changelog ## master +## v3.11.0 + +版本要点： + +* 增加`Line3DChart`3D折线图 +* 增加`GraphChart`关系图 +* 增加`3D`坐标系支持 +* 增加`Tooltip`的`triggerOn`设置触发条件 +* 其他问题修复和优化 + +日志详情： + +* (2024.06.16) 发布`v3.11.0`版本 * (2024.06.15) 增加`Editor`下`Data`的添加、删除、上下移动操作按钮 * (2024.06.11) 修复`Axis`的`IndicatorLabel`可能会遮挡住`Tooltip`的问题 * (2024.06.11) 修复`Tooltip`在`Cross`时`Axis`的`IndicatorLabel`可能不显示的问题 (#315) diff --git a/Documentation~/zh/support.md b/Documentation~/zh/support.md index 1133eff1..4297f4e7 100644 --- a/Documentation~/zh/support.md +++ b/Documentation~/zh/support.md @@ -79,11 +79,14 @@ slug: /support | 102 | [漏斗图](https://xcharts-team.github.io/docs/funnel) |FunnelChart | 98¥ | | 103 | [3D金字塔](https://xcharts-team.github.io/docs/pyramid) |PyramidChart | 98¥ | | 104 | [树形矩图](https://xcharts-team.github.io/docs/treemap) |TreemapChart | 98¥ | +| 105 | [桑基图](https://xcharts-team.github.io/docs/sankey) |SankeyChart | 98¥ | | 201 | [3D柱图](https://xcharts-team.github.io/docs/bar3d) |Bar3DChart | 198¥ | | 202 | [3D饼图](https://xcharts-team.github.io/docs/pie3d) |Pie3DChart | 198¥ | | 203 | [甘特图](https://xcharts-team.github.io/docs/gantt) |GanttChart | 198¥ | | 204 | [仪表盘](https://xcharts-team.github.io/docs/gauge) |GaugeChart | 198¥ | | 205 | [水位图](https://xcharts-team.github.io/docs/liquid) |LiquidChart | 198¥ | +| 206 | [3D折线图](https://xcharts-team.github.io/docs/line3d) |Line3DChart | 198¥ | +| 207 | [关系图](https://xcharts-team.github.io/docs/graph) |GraphChart | 198¥ | 扩展图表的在线效果图也可以查看[WebGL在线Demo](https://xcharts-team.github.io/examples/) diff --git a/Documentation~/zh/tutorial01.md b/Documentation~/zh/tutorial01.md index 4cdd5105..0c2b382e 100644 --- a/Documentation~/zh/tutorial01.md +++ b/Documentation~/zh/tutorial01.md @@ -44,7 +44,7 @@ XCharts可通过以下任意一种方式导入到项目： ## 添加一个简单图表 -在`Hierarchy`视图下右键或菜单栏`GameObject`下拉选择`XCharts->LineChart`，即可快速创建一个默认的折线图出来： +在`Hierarchy`视图下右键`UI->XCharts->LineChart`或菜单栏`GameObject`下拉选择`XCharts->LineChart`，即可快速创建一个默认的折线图出来： ![linechart1](img/tutorial01_linechart1.png) diff --git a/README-en.md b/README-en.md index bf6ac6cb..6149b131 100644 --- a/README-en.md +++ b/README-en.md @@ -45,38 +45,35 @@ ![XCharts](Documentation~/zh/img/xcharts.png) -A powerful and easy-to-use data visualization library for Unity. It supports more than ten built-in charts, including line, bar, pie, radar, scatter, heatmap, ring, candlestick, polar, parallel coordinates, as well as extended charts such as 3d pie, 3d bar, 3d pyramid, funnel, gauge, liquid, pictorialbar, gantt, and treemap. - -[XCharts3.0 Homepage](https://xcharts-team.github.io) - -[XCharts3.0 Tutorial](Documentation~/en/tutorial01.md) -[XCharts3.0 API](Documentation~/en/api.md) -[XCharts3.0 FAQ](Documentation~/en/faq.md) -[XCharts3.0 Configurate](Documentation~/en/configuration.md) -[XCharts3.0 Changelog](Documentation~/en/changelog.md) -[XCharts3.0 Support](Documentation~/en/support.md) - -## Features - -* __Pure code rendering__: The chart is completely rendered with pure code, without the need for additional texture or shader resources. -* __Visual configuration__: Visual configuration of parameters with real-time preview of the effect, and support for dynamic modification of configuration and data during runtime. -* __High customizability__: Supports arbitrary adjustments from theme and configuration parameters; supports custom drawing, callback functions, and custom implementations of charts. -* __Multiple built-in charts__: Supports various built-in charts such as line charts, bar charts, pie charts, radar charts, scatter plots, heat maps, polar charts, K-line charts, parallel coordinates, etc. -* __Multiple extended charts__: Supports extended charts such as 3D column charts, 3D pie charts, funnel charts, pyramids, dashboards, water level charts, iconic bar charts, Gantt charts, and tree maps. -* __Multiple extended features__: Supports extended UI components such as tables and statistical values. -* __Multiple chart combinations__: Supports arbitrary combinations of built-in charts, with multiple same or different types of charts displayed simultaneously in the same chart. -* __Various coordinate systems__: Supports coordinate systems such as Cartesian coordinates, polar coordinates, and single axes. -* __Rich components__: Supports common components such as titles, legends, tooltips, markings, marking areas, data area zooming, and visual mapping. -* __Rich line charts__: Supports various line charts such as straight line charts, curved line charts, dashed line charts, area charts, step line charts, etc. -* __Rich bar charts__: Supports various bar charts such as stacked bar charts, stacked percentage bar charts, zebra bar charts, and capsule bar charts. -* __Rich pie charts__: Supports various pie charts such as ring charts, rose charts, ring rose charts, etc. -* __Rich lines__: Supports various lines such as solid lines, curves, step lines, dashed lines, dot lines, dotted lines, and double dot-dashed lines. -* __Custom drawing__: Supports custom chart content drawing with powerful drawing APIs for drawing points, lines, and other graphics. -* __Large data rendering__: Supports rendering of tens of thousands of data points; supports sampling rendering; special simplified charts support better performance. -* __Custom themes__: Supports theme customization and import/export; includes both light and dark default themes. -* __Animations and interactions__: Supports various animations such as fade-in animation, fade-out animation, change animation, addition animation, and * interactive animation; supports interactive operations such as data filtering, view zooming, and detailed display on multiple platforms. -* __Third-party extensions__: Supports integration with TexMeshPro and New Input System. -* __Version and compatibility__: Supports all Unity versions above 5.6 and runs on all platforms. +## Overview + +A powerful and easy-to-use data visualization library for Unity. It supports more than ten built-in charts, including line, bar, pie, radar, scatter, heatmap, ring, candlestick, polar, parallel coordinates, as well as extended charts such as 3d pie, 3d bar, 3d pyramid, funnel, gauge, liquid, pictorialbar, gantt, treemap, sankey, line3d and graph chart. + +## Key Features + +- __Pure Code Rendering__: Charts are rendered with pure code, eliminating the need for extra texture or shader resources. +- __Visual Configuration__: Configure parameters visually with real-time preview and support for dynamic configuration and data adjustments at runtime. +- __High Customizability__: Themes and configuration parameters can be adjusted as needed, with support for custom drawing and callbacks. +- __Built-in and Extended Charts__: Supports a variety of chart types, including 3D charts and special chart types like gauges and treemaps. +- __Multiple Chart Combinations__: Combine multiple charts of the same or different types within a single instance. +- __Various Coordinate Systems__: Supports different coordinate systems such as Cartesian, polar, and single axes. +- __Rich Components__: Includes titles, legends, tooltips, and more. +- __Custom Drawing__: Utilize a powerful API for custom drawing of points, lines, and other graphics. +- __Large Data Rendering__: Capable of rendering tens of thousands of data points with support for sampling rendering. +- __Custom Themes__: Customize themes and use the included light and dark default themes. +- __Animations and Interactions__: Supports various animations and interactions for a dynamic user experience. +- __Third-Party Extensions__: Integrates with TextMeshPro and the New Input System. +- __Version and Compatibility__: Compatible with all Unity versions above 5.6 and runs on all platforms. + +## Documentation + +- [XCharts3.0 Homepage](https://xcharts-team.github.io) +- [XCharts3.0 Tutorial](Documentation~/en/tutorial01.md) +- [XCharts3.0 API](Documentation~/en/api.md) +- [XCharts3.0 FAQ](Documentation~/en/faq.md) +- [XCharts3.0 Configurate](Documentation~/en/configuration.md) +- [XCharts3.0 Changelog](Documentation~/en/changelog.md) +- [XCharts3.0 Support](Documentation~/en/support.md) ## Screenshots @@ -84,55 +81,43 @@ A powerful and easy-to-use data visualization library for Unity. It supports mo ![extendchart](Documentation~/en/img/readme_extendchart.png) -## Attention +## Important Notes -* `XCharts3.0` is not fully compatible with `XCharts2.0` version, upgrading `3.0` may require some code adjustments, and some chart configurations need to be readjusting. It is recommended that old projects can continue to use `XCharts2.0`, and new projects are recommended to use `XCharts3.0`. -* `XCharts2.0` enters the maintenance phase, and only serious `bugs` will be fixed later, in principle, no more new features will be added. -* `XCharts` theoretically supports `Unity 5.6` and above, but due to limited version testing, it is inevitable to slip up, and version compatibility issues can be raised. -* This repository only contains `XCharts` source code, does not contain `Demo` sample section. Need to look at ` Demo ` please go to the sample source code [XCharts - Demo](https://github.com/XCharts-Team/XCharts-Demo) repo. You can also view the running effect of `WebGL` in your browser [Online Demo](https://xcharts-team.github.io/examples/). +- `XCharts3.0` is not fully compatible with `XCharts2.0`. Upgrading to 3.0 may require code adjustments and reconfiguration of some charts. +- `XCharts2.0` is in the maintenance phase with only critical bug fixes applied. +- While XCharts supports Unity 5.6 and above, compatibility issues may arise due to limited testing. +- This repository contains only the `XCharts` source code. For demos, visit the [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo) repo or the [Online Demo](https://xcharts-team.github.io/examples/). -## Use +## Getting Started -* Import `XCharts` unitypackage or source code into the project. -* Right-click `Hierarchy` view and choose `XCharts->LineChart` to create a default LineChart. -* You can adjust the parameters of each component in `Inspector` and see the real-time effects in `Game` view. -* For more details, see [[XCharts Tutorial: 5-minute tutorial]](Documentation~/en/tutorial01.md) -* For the first time, it is recommended to read the tutorial carefully. +1. Import the `XCharts` unitypackage or source code into your Unity project. +2. Create a chart by right-clicking in the `Hierarchy` view and selecting `UI->XCharts->LineChart`. +3. Adjust component parameters in the `Inspector` to see real-time effects in the `Game` view. +4. For more details, refer to the [5-minute tutorial](Documentation~/en/tutorial01.md). -## Branch +## Branch Information -* `master` : indicates the development branch. The latest changes and new features are first committed to the `master` branch, and after some time from the `master` branch `merge` to the `3.0` branch, and the `release` version. -* `3.0` : Stable branch of XCharts 3.0. It is generally updated once a month, with the latest changes from the `master` branch `merge`, and the `release` version is released. -* `2.0` : A stable branch of XCharts 2.0. With Demo, currently no longer maintenance, only to modify serious bugs. -* `2.0-upm` : Stable UMP branch of XCharts 2.0. Only the Package part is included without Demo. It is dedicated to the UMP and is not maintained. -* `1.0` : Stable branch of XCharts 1.0. With Demo, no maintenance. -* `1.0-upm` : stable UMP branch of XCharts 1.0. No Demo, no maintenance. +- __master__ indicates the development branch. The latest changes and new features are first committed to the `master` branch, and after some time from the `master` branch `merge` to the `3.0` branch, and the `release` version. +- __3.0__ Stable branch of XCharts 3.0. It is generally updated once a month, with the latest changes from the `master` branch `merge`, and the `release` version is released. +- __2.0__ A stable branch of XCharts 2.0. With Demo, currently no longer maintenance, only to modify serious bugs. +- __2.0-upm__ Stable UMP branch of XCharts 2.0. Only the Package part is included without Demo. It is dedicated to the UMP and is not maintained. +- __1.0__ Stable branch of XCharts 1.0. With Demo, no maintenance. +- __1.0-upm__ stable UMP branch of XCharts 1.0. No Demo, no maintenance. ## FAQ -* Is `XCharts` free to use? -A: `XCharts` uses the `MIT` licence and is free to use. You can also subscribe to `VIP` to enjoy more value-added services. - -* Does `XCharts` support code to dynamically add and modify data? Does it support getting data from `Excel` or a database? -A: Support code to dynamically add and modify data, but data needs to be parsed or retrieved by itself, and then added to `XCharts` by calling the public interface of `XCharts`. - -* Does this plugin work on other platforms (e.g. Winform or WPF) besides Unity? -A: It is currently only supported on Unity. Theoretically any version of Unity that supports `UGUI` can run `XCharts`. - -* What about the jags? What magnitude of data is supported? -A: XCharts is based on UGUI implementation, so the problems encountered in UGUI will also exist in XCharts. For example, the sawtooth problem, such as the number of vertices in `Mesh` exceeds `65535`. Solutions to these two problems can be found in [Q&A 16](Documentation~/en/faq.md) and [Q&A 27](Documentation~/en/faq.md). -Due to the `Mesh` of the `65535` vertex limit, the current `XCharts` single `Line` supports about `20,000` of data, of course, open sampling can support more data to draw, but at the same time it will consume more CPU. +- __Is XCharts free to use?__ Yes, XCharts is free under the MIT license and includes value-added VIP services. +- __Does XCharts support dynamic data addition and modification?__ Yes, but data must be parsed or retrieved by the user. +- __Does this plugin work on platforms other than Unity?__ No, it is designed for Unity only. ## Changelog -* [Changelog](Documentation~/en/changelog.md) +- [Changelog](Documentation~/en/changelog.md) ## Licenses -* [MIT License](https://github.com/XCharts-Team/XCharts/blob/master/LICENSE.md) -* Free commercial, secondary development -* The extended charts and advanced features sections require a separate purchase license +- XCharts is released under the [MIT License](https://github.com/XCharts-Team/XCharts/blob/master/LICENSE.md). -## Other +## Contact -email: `monitor1394@gmail.com` +- For more information or support, contact us at `monitor1394@gmail.com`. diff --git a/README.md b/README.md index d308a27d..b5c6d50f 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ ![XCharts](Documentation~/zh/img/xcharts.png) -一款基于`UGUI`的功能强大、简单易用的数据可视化图表插件。支持`折线图`、`柱状图`、`饼图`、`雷达图`、`散点图`、`热力图`、`环形图`、`K线图`、`极坐标`、`平行坐标`等十多种内置图表，以及`3D饼图`、`3D柱图`、`3D金字塔`、`漏斗图`、`仪表盘`、`水位图`、`象形柱图`、`甘特图`、`矩形树图`、`桑基图`等多种扩展图表。 +一款基于`UGUI`的功能强大的简单易用的`Unity`数据可视化图表插件。支持`折线图`、`柱状图`、`饼图`、`雷达图`、`散点图`、`热力图`、`环形图`、`K线图`、`极坐标`、`平行坐标`等十几种内置图表，以及`3D饼图`、`3D柱图`、`3D金字塔`、`漏斗图`、`仪表盘`、`水位图`、`象形柱图`、`甘特图`、`矩形树图`、`桑基图`、`3D折线图`、`关系图`等十几种扩展图表。 [XCharts 官方主页](https://xcharts-team.github.io) [XCharts 在线示例](https://xcharts-team.github.io/examples) @@ -63,7 +63,7 @@ - __可视化配置__：参数可视化配置，效果实时预览，支持运行时代码动态修改配置和数据。 - __高自由定制__：支持从主题和配置参数上任意调整；支持代码自定义绘制，自定义回调以及自定义实现图表。 - __多内置图表__：支持线图、柱状图、饼图、雷达图、散点图、热力图、环形图、K线图、极坐标、平行坐标等多种内置图表。 -- __多扩展图表__：支持3D柱图、3D饼图、漏斗图、金字塔、仪表盘、水位图、象形柱图、甘特图、矩形树图、桑基图等多种扩展图表。 +- __多扩展图表__：支持3D柱图、3D饼图、漏斗图、金字塔、仪表盘、水位图、象形柱图、甘特图、矩形树图、桑基图、3D折线图、关系图等多种扩展图表。 - __多扩展组件__：支持表格、统计数值等多种扩展UI组件。 - __多图表组合__：支持内置图表的任意组合，同一图中可同时显示多个相同或不同类型的图表。 - __多种坐标系__：支持直角坐标系、极坐标系、单轴等多种坐标系。 @@ -87,42 +87,33 @@ ## 仓库 -| 相关仓库 | 仓库介绍 | -| -- | --| -| [XCharts](https://github.com/XCharts-Team/XCharts) | XCharts核心功能，完全免费。 | -| [XCharts-Daemon](https://github.com/XCharts-Team/XCharts-Daemon) | XCharts的守护程序，用于确保XCharts更新时的编译正常。非必须，但建议使用。 | -| [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo) | XCharts的官方示例，不包含扩展图表部分。订阅VIP的用户购买扩展图表后，可加入对应图表的示例。 | -| [XCharts-Pro](https://github.com/XCharts-Team/XCharts-Pro) | XCharts完全版，包含所有扩展图表和扩展组件。订阅SVIP后可访问使用。 | -| [XCharts-Pro-Demo](https://github.com/XCharts-Team/XCharts-Pro-Demo) | XCharts完全版官方示例，包含所有扩展图表和扩展组件的示例。订阅SVIP后可访问使用。 | -| [XCharts-UI](https://github.com/XCharts-Team/XCharts-UI) | XCharts的扩展UI组件。订阅VIP后可访问使用。 | -| [XCharts-Bar3DChart](https://github.com/XCharts-Team/XCharts-Bar3DChart) | XCharts扩展图表：3D柱图。订阅购买后可访问使用。 | -| [XCharts-FunnelChart](https://github.com/XCharts-Team/XCharts-FunnelChart) | XCharts扩展图表：漏斗图。订阅购买后可访问使用。 | -| [XCharts-GanttChart](https://github.com/XCharts-Team/XCharts-GanttChart) | XCharts扩展图表：甘特图。订阅购买后可访问使用。 | -| [XCharts-GaugeChart](https://github.com/XCharts-Team/XCharts-GaugeChart) | XCharts扩展图表：仪表盘。订阅购买后可访问使用。 | -| [XCharts-LiquidChart](https://github.com/XCharts-Team/XCharts-LiquidChart) | XCharts扩展图表：水位图。订阅购买后可访问使用。 | -| [XCharts-PictorialBarChart](https://github.com/XCharts-Team/XCharts-PictorialBarChart) | XCharts扩展图表：象形住图。订阅购买后可访问使用。 | -| [XCharts-Pie3DChart](https://github.com/XCharts-Team/XCharts-Pie3DChart) | XCharts扩展图表：3D饼图。订阅购买后可访问使用。 | -| [XCharts-PyramidChart](https://github.com/XCharts-Team/XCharts-PyramidChart) | XCharts扩展图表：3D金字塔。订阅购买后可访问使用。 | -| [XCharts-TreemapChart](https://github.com/XCharts-Team/XCharts-TreemapChart) | XCharts扩展图表：矩形树图。订阅购买后可访问使用。 | -| [XCharts-SankeyChart](https://github.com/XCharts-Team/XCharts-SankeyChart) | XCharts扩展图表：桑基图。订阅购买后可访问使用。 | +- __[XCharts](https://github.com/XCharts-Team/XCharts)__ XCharts核心功能，完全免费。 +- __[XCharts-Daemon](https://github.com/XCharts-Team/XCharts-Daemon)__ XCharts守护程序，用于确保XCharts更新时的编译正常。非必须，但建议使用。 +- __[XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo)__ XCharts官方示例，不包含扩展图表部分。订阅购买扩展图表后可导入示例。 +- __[XCharts-Pro](https://github.com/XCharts-Team/XCharts-Pro)__ XCharts专业版，包含所有扩展图表和扩展组件。订阅SVIP后可访问使用。 +- __[XCharts-Pro-Demo](https://github.com/XCharts-Team/XCharts-Pro-Demo)__ XCharts专业版官方示例，包含所有扩展图表和扩展组件的示例。订阅SVIP后可访问使用。 +- __[XCharts-UI](https://github.com/XCharts-Team/XCharts-UI)__ XCharts的扩展UI组件。订阅VIP后可访问使用。 +- __[XCharts-Bar3DChart](https://github.com/XCharts-Team/XCharts-Bar3DChart)__ XCharts扩展图表：3D柱图。订阅购买后可访问使用。 +- __[XCharts-FunnelChart](https://github.com/XCharts-Team/XCharts-FunnelChart)__ XCharts扩展图表：漏斗图。订阅购买后可访问使用。 +- __[XCharts-GanttChart](https://github.com/XCharts-Team/XCharts-GanttChart)__ XCharts扩展图表：甘特图。订阅购买后可访问使用。 +- __[XCharts-GaugeChart](https://github.com/XCharts-Team/XCharts-GaugeChart)__ XCharts扩展图表：仪表盘。订阅购买后可访问使用。 +- __[XCharts-LiquidChart](https://github.com/XCharts-Team/XCharts-LiquidChart)__ XCharts扩展图表：水位图。订阅购买后可访问使用。 +- __[XCharts-PictorialBarChart](https://github.com/XCharts-Team/XCharts-PictorialBarChart)__ XCharts扩展图表：象形住图。订阅购买后可访问使用。 +- __[XCharts-Pie3DChart](https://github.com/XCharts-Team/XCharts-Pie3DChart)__ XCharts扩展图表：3D饼图。订阅购买后可访问使用。 +- __[XCharts-PyramidChart](https://github.com/XCharts-Team/XCharts-PyramidChart)__ XCharts扩展图表：3D金字塔。订阅购买后可访问使用。 +- __[XCharts-TreemapChart](https://github.com/XCharts-Team/XCharts-TreemapChart)__ XCharts扩展图表：矩形树图。订阅购买后可访问使用。 +- __[XCharts-SankeyChart](https://github.com/XCharts-Team/XCharts-SankeyChart)__ XCharts扩展图表：桑基图。订阅购买后可访问使用。 +- __[XCharts-Line3DChart](https://github.com/XCharts-Team/XCharts-Line3DChart)__ XCharts扩展图表：3D折线图。订阅购买后可访问使用。 +- __[XCharts-GraphChart](https://github.com/XCharts-Team/XCharts-GraphChart)__ XCharts扩展图表：关系图。订阅购买后可访问使用。 ## 分支 -| 分支 | 分支介绍 | -|--|--| -| [master](https://github.com/XCharts-Team/XCharts/tree/master) | XCharts3.0的开发分支。最新的修改和功能都先提交到`master`分支，稳定后后再从`master`分支`merge`到`3.0`分支，并发布`release`版本。| -| [3.0](https://github.com/XCharts-Team/XCharts/tree/3.0) | XCharts3.0的稳定分支。一般一个月一发布，`master`分支稳定后，`merge`到`3.0`分支，并发布`release`版本。| -| [2.0](https://github.com/XCharts-Team/XCharts/tree/2.0) | XCharts2.0的稳定分支。带Demo，目前基本不再维护，仅修改严重bug。| -| [2.0-upm](https://github.com/XCharts-Team/XCharts/tree/2.0-upm) | XCharts2.0的稳定UMP分支。不带Demo，只包含Package部分，不再维护。| -| [1.0](https://github.com/XCharts-Team/XCharts/tree/1.0) | XCharts1.0的稳定分支。带Demo，不再维护。| -| [1.0-upm](https://github.com/XCharts-Team/XCharts/tree/1.0-upm) | XCharts1.0的稳定UMP分支。不带Demo，不再维护。| - -## 注意 - -- `XCharts3.0` 不完全兼容 `XCharts2.0` 版本，升级`3.0`时，部分代码和配置可能需要重新调整。建议旧项目可以继续使用`XCharts2.0`，新项目推荐使用`XCharts3.0`。 -- `XCharts2.0` 进入维护阶段，后续只修复严重`bug`，原则上不再加新功能。 -- `XCharts` 理论上支持`Unity 5.6`及以上版本，但由于版本测试有限难免疏漏，发现问题可提`Issue`。 -- 本仓库只包含`XCharts`源码，不包含`Demo`示例部分。需要查看`Demo`示例源码请到[XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo)仓库。也可以在浏览器查看`WebGL`下的运行效果 [在线Demo](https://xcharts-team.github.io/examples/) 。 +- __[master](https://github.com/XCharts-Team/XCharts/tree/master)__ XCharts3.0的开发分支。最新的修改和功能都先提交到`master`分支，稳定后再发布`release`版本。 +- __[3.0](https://github.com/XCharts-Team/XCharts/tree/3.0)__ XCharts3.0的稳定分支。一般一个月一发布，`master`分支稳定后，`merge`到`3.0`分支，并发布`release`版本。 +- __[2.0](https://github.com/XCharts-Team/XCharts/tree/2.0)__ XCharts2.0的稳定分支。带Demo，目前基本不再维护，仅修改严重bug。 +- __[2.0-upm](https://github.com/XCharts-Team/XCharts/tree/2.0-upm)__ XCharts2.0的稳定UMP分支。不带Demo，只包含Package部分，不再维护。 +- __[1.0](https://github.com/XCharts-Team/XCharts/tree/1.0)__ XCharts1.0的稳定分支。带Demo，不再维护。 +- __[1.0-upm](https://github.com/XCharts-Team/XCharts/tree/1.0-upm)__ XCharts1.0的稳定UMP分支。不带Demo，不再维护。 ## 使用 @@ -133,24 +124,31 @@ - 更多细节，请看[【XCharts教程：5分钟上手教程】](Documentation~/zh/tutorial01.md)。 - 首次使用，建议先认真看一遍教程。 +## 注意 + +- __XCharts3.0不完全兼容XCharts2.0版本。__ 升级`3.0`时，部分代码和配置可能需要重新调整。建议旧项目可以继续使用`XCharts2.0`，新项目推荐使用`XCharts3.0`。 +- __XCharts2.0只维护不加新功能。__ `2.0`只修复严重`bug`，原则上不再加新功能。 +- __XCharts支持Unity 5.6及以上版本。__ 但由于版本测试有限难免疏漏，发现问题可提`Issue`。 +- __本仓库只包含XCharts源码，不包含Demo示例部分。__ 需要查看`Demo`示例源码请到[XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo)仓库。也可以在浏览器查看运行效果 [在线Demo](https://xcharts-team.github.io/examples/) 。 + ## FAQ -- `XCharts`可以免费使用吗？ - 答：`XCharts`使用`MIT`协议，可以免费使用。也可以订阅`VIP`享受更多增值服务。 +- __XCharts可以免费使用吗？__ +`XCharts`使用`MIT`协议，可以免费使用。也可以订阅`VIP`享受更多增值服务。 -- `XCharts`支持代码动态添加和修改数据吗？支持从`Excel`或数据库中获取数据吗？ - 答：`XCharts`提供了各种数据操作的接口，支持代码动态修改配置，添加和修改数据，但数据来源需要自己解析和获取，再调用`XCharts`的接口添加到图表。 +- __XCharts支持代码动态添加和修改数据吗？支持从`Excel`或数据库中获取数据吗？__ +`XCharts`提供了各种数据操作的接口，支持代码动态修改配置，添加和修改数据，但数据来源需要自己解析和获取，再调用`XCharts`的接口添加到图表。 -- `XCharts`除了用在`Unity`平台，还能用在`Winform`或`WPF`等平台吗？ - 答：`XCharts`只支持在`Unity`平台使用。理论上任何支持`UGUI`的`Unity`版本都能运行`XCharts`。 +- __XCharts除了用在Unity平台，还能用在Winform或WPF等平台吗？__ +`XCharts`只支持在`Unity`平台使用。理论上任何支持`UGUI`的`Unity`版本都能运行`XCharts`。 -- 锯齿怎么解决？支持多大量级的数据？ - 答：`XCharts`是基于`UGUI`实现的，所以`UGUI`中碰到的问题，在`XCharts`中也会存在。比如锯齿问题，比如`Mesh`顶点数超`65535`的问题。这两个问题的解决可参考[问答16](Documentation~/zh/faq.md)和[问答27](Documentation~/zh/faq.md)。 - 由于`Mesh`的`65535`顶点数的限制，目前`XCharts`的单条`Line`支持约`2万`的数据量，当然开启采样可以支持更多数据的绘制，但同时也会更消耗CPU。 +- __锯齿怎么解决？支持多大量级的数据？__ +`XCharts`是基于`UGUI`实现的，所以`UGUI`中碰到的问题，在`XCharts`中也会存在。比如锯齿问题，比如`Mesh`顶点数超`65535`的问题。这两个问题的解决可参考[问答16](Documentation~/zh/faq.md)和[问答27](Documentation~/zh/faq.md)。 +由于`Mesh`的`65535`顶点数的限制，目前`XCharts`的单条`Line`支持约`2万`的数据量，当然开启采样可以支持更多数据的绘制，但同时也会更消耗CPU。 ## 日志 -- [更新日志](Documentation~/zh/changelog.md) +- 各版本的详细更新日志请查看 [更新日志](Documentation~/zh/changelog.md) ## Licenses diff --git a/Runtime/Internal/XChartsMgr.cs b/Runtime/Internal/XChartsMgr.cs index 0e2f8b15..5fccb8ae 100644 --- a/Runtime/Internal/XChartsMgr.cs +++ b/Runtime/Internal/XChartsMgr.cs @@ -21,8 +21,8 @@ class XChartsVersion [ExecuteInEditMode] public static class XChartsMgr { - public static readonly string version = "3.11.0-preview2"; - public static readonly int versionDate = 20240611; + public static readonly string version = "3.11.0"; + public static readonly int versionDate = 20240616; public static string fullVersion { get { return version + "-" + versionDate; } } internal static List chartList = new List(); diff --git a/package.json b/package.json index 677fbe90..b71ac975 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "displayName": "XCharts", "author": "monitor1394", "license": "MIT", - "version": "3.11.0-preview2", - "date": "20240611", - "checkdate": "20240611", + "version": "3.11.0", + "date": "20240616", + "checkdate": "20240616", "unity": "2018.3", "description": "A charting and data visualization library for Unity. Support line chart, bar chart, pie chart, radar chart, scatter chart, heatmap chart, ring chart, candlestick chart, polar chart and parallel coordinates.", "keywords": [