Merge branch 'master' into 3.0

XCharts-Team · Mar 19, 2024 · fe867d1 · fe867d1
2 parents 757ccb0 + 113c388
commit fe867d1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Documentation~/en/changelog.md b/Documentation~/en/changelog.md
@@ -2,6 +2,8 @@
 # 更新日志
 
 [master](#master)  
+[v3.10.2](#v3102)  
+[v3.10.1](#v3101)  
 [v3.10.0](#v3100)  
 [v3.9.0](#v390)  
 [v3.8.1](#v381)  
@@ -66,6 +68,13 @@
 
 ## master
 
+## v3.10.2
+
+* (2024.03.11) Release `v3.10.2`
+* (2024.03.11) Fix to `Legend`'s `formatter` showing possible mismatches when setting {d} (#304)
+* (2024.03.11) Fix to `Tooltip` still showing after moving out of coordinate system
+* (2024.03.08) Fixed an issue where `Tooltip`'s title might not appear after upgrading from an older version
+
 ## v3.10.1
 
 * (2024.02.21) Release `v3.10.1`

diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md
@@ -6,6 +6,7 @@ slug: /changelog
 # 更新日志
 
 [master](#master)  
+[v3.10.2](#v3102)  
 [v3.10.1](#v3101)  
 [v3.10.0](#v3100)  
 [v3.9.0](#v390)  
@@ -72,6 +73,9 @@ slug: /changelog
 
 ## master
 
+## v3.10.2
+
+* (2024.03.11) 发布`v3.10.2`版本
 * (2024.03.11) 修复`Legend`的`formatter`在设置`{d}`通配符时显示可能不匹配的问题 (#304)
 * (2024.03.11) 修复`Tooltip`移出坐标系后还显示的问题
 * (2024.03.08) 修复`Tooltip`的`title`从旧版本升级后可能不显示的问题

diff --git 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.10.1";
-        public static readonly int versionDate = 20240221;
+        public static readonly string version = "3.10.2";
+        public static readonly int versionDate = 20240311;
         public static string fullVersion { get { return version + "-" + versionDate; } }
 
         internal static List<BaseChart> chartList = new List<BaseChart>();

diff --git a/package.json b/package.json
@@ -3,9 +3,9 @@
   "displayName": "XCharts",
   "author": "monitor1394",
   "license": "MIT",
-  "version": "3.10.1",
-  "date": "20240201",
-  "checkdate": "20240201",
+  "version": "3.10.2",
+  "date": "20240311",
+  "checkdate": "20240311",
   "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": [