From fcc1314f17f0f14a63cd13e2f887eb28c6352347 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Wed, 10 Aug 2022 07:22:41 +0800
Subject: [PATCH] [optimize][axis] set chart default layer to UI

---
 CHANGELOG.md                              | 12 ++++++++++++
 Editor/Windows/XChartsEditor.cs           |  1 +
 Runtime/Internal/Utilities/ChartHelper.cs |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc116733..879a8495 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,18 @@
 
 ## master
 
+### 版本要点
+
+* `Serie`支持高亮，淡出和选中三状态配置：`EmphasisStyle`,`BlurStyle`和`SelectStyle`
+* `Axis`支持坐标轴次刻度和次分割线：`MinorTick`和`MinorSplitLine`
+* `Serie`支持不同的取色策略：`colorBy`
+* `Radar`支持平滑曲线：`smooth`
+* `Line`支持当作凸多边形填充：`AreaStyle`的`innerFill`
+* `DataZoom`支持时间轴
+
+### 日志详情
+
+* (2022.08.10) 优化`Chart`的默认`layer`设置为`UI`
 * (2022.08.09) 优化`Axis`的`Time`时间轴的次分割线
 * (2022.08.09) 增加`AreaStyle`的`innerFill`参数支持填充凸多边形
 * (2022.08.08) 优化`Serie`的数据项索引维护，增加检测和修复功能，修复相关问题
diff --git a/Editor/Windows/XChartsEditor.cs b/Editor/Windows/XChartsEditor.cs
index eae7e193..6725ae7b 100644
--- a/Editor/Windows/XChartsEditor.cs
+++ b/Editor/Windows/XChartsEditor.cs
@@ -62,6 +62,7 @@ namespace XCharts.Editor
             XCThemeMgr.CheckReloadTheme();
             var chart = new GameObject();
             chart.name = GetName(parent, chartName);
+            chart.layer = LayerMask.NameToLayer("UI");
             var t = chart.AddComponent<T>();
             chart.transform.SetParent(parent);
             chart.transform.localScale = Vector3.one;
diff --git a/Runtime/Internal/Utilities/ChartHelper.cs b/Runtime/Internal/Utilities/ChartHelper.cs
index 29370827..b60cbeee 100644
--- a/Runtime/Internal/Utilities/ChartHelper.cs
+++ b/Runtime/Internal/Utilities/ChartHelper.cs
@@ -209,6 +209,7 @@ namespace XCharts.Runtime
                 obj.transform.SetParent(parent);
                 obj.transform.localScale = Vector3.one;
                 obj.transform.localPosition = Vector3.zero;
+                obj.layer = parent.gameObject.layer;
             }
             RectTransform rect = GetOrAddComponent<RectTransform>(obj);
             rect.localPosition = Vector3.zero;
@@ -237,6 +238,7 @@ namespace XCharts.Runtime
         {
             GameObject txtObj = AddObject(objectName, parent, anchorMin, anchorMax, pivot, sizeDelta);
             txtObj.transform.localEulerAngles = new Vector3(0, 0, textStyle.rotate);
+            txtObj.layer = parent.gameObject.layer;
             if (chartText == null)
                 chartText = new ChartText();
 #if dUI_TextMeshPro