From b1561809939430bcd1f2f483e16dd888cbeece18 Mon Sep 17 00:00:00 2001 From: Jacob Rapoport Date: Sat, 26 Oct 2019 17:36:12 -0700 Subject: [PATCH 01/23] add UpdateThemeInfo API --- Runtime/API/BaseChart_API.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Runtime/API/BaseChart_API.cs b/Runtime/API/BaseChart_API.cs index 6ece0e4f..d9f2af90 100644 --- a/Runtime/API/BaseChart_API.cs +++ b/Runtime/API/BaseChart_API.cs @@ -416,6 +416,17 @@ namespace XCharts RefreshChart(); } + /// + /// Update chart theme info. + /// + /// info + public void UpdateThemeInfo(ThemeInfo info) + { + m_ThemeInfo = info; + UpdateTheme(m_ThemeInfo.theme); + } + + /// /// Whether series animation enabel. /// 启用或关闭起始动画。 From 54ee3d43f5633761053e87f560e9c95b2ac22343 Mon Sep 17 00:00:00 2001 From: Jacob Rapoport Date: Sat, 26 Oct 2019 17:46:47 -0700 Subject: [PATCH 02/23] add themeInfo property --- Runtime/API/BaseChart_API.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Runtime/API/BaseChart_API.cs b/Runtime/API/BaseChart_API.cs index d9f2af90..4c54f6f8 100644 --- a/Runtime/API/BaseChart_API.cs +++ b/Runtime/API/BaseChart_API.cs @@ -18,6 +18,10 @@ namespace XCharts /// public partial class BaseChart { + /// + /// The theme info. + /// + public ThemeInfo themeInfo { get { return m_ThemeInfo; } } /// /// The title setting of chart. /// 标题组件 From 16c8d26e2a9ef730e2c48227a9e122420632b524 Mon Sep 17 00:00:00 2001 From: Jacob Rapoport Date: Sun, 27 Oct 2019 09:05:50 -0700 Subject: [PATCH 03/23] fix destroying a gameobject inside a prefab --- Demo/Runtime/Demo.cs | 2 +- Runtime/Internal/BaseChart.cs | 4 ++-- Runtime/Utility/ChartHelper.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Demo/Runtime/Demo.cs b/Demo/Runtime/Demo.cs index 270650d9..57ffdc46 100644 --- a/Demo/Runtime/Demo.cs +++ b/Demo/Runtime/Demo.cs @@ -96,7 +96,7 @@ namespace XCharts var btnPanel = transform.Find("chart_list"); m_BtnClone = transform.Find("btn_clone").gameObject; m_BtnClone.SetActive(false); - ChartHelper.DestoryAllChilds(btnPanel); + //ChartHelper.DestroyAllChildren(btnPanel); foreach (var module in m_ChartModule) { var btnName = "btn_" + module.name; diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 104811b4..1f5ab2c5 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -213,7 +213,7 @@ namespace XCharts totalLegend++; } m_Legend.RemoveButton(); - ChartHelper.DestoryAllChilds(legendObject.transform); + ChartHelper.DestroyAllChildren(legendObject.transform); if (!m_Legend.show) return; for (int i = 0; i < datas.Count; i++) { @@ -289,7 +289,7 @@ namespace XCharts { var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); - ChartHelper.DestoryAllChilds(labelObject.transform); + // ChartHelper.DestroyAllChildren(labelObject.transform); int count = 0; for (int i = 0; i < m_Series.Count; i++) { diff --git a/Runtime/Utility/ChartHelper.cs b/Runtime/Utility/ChartHelper.cs index b23f1595..f7a30862 100644 --- a/Runtime/Utility/ChartHelper.cs +++ b/Runtime/Utility/ChartHelper.cs @@ -72,12 +72,12 @@ namespace XCharts } } - public static void DestoryAllChilds(Transform parent) + public static void DestroyAllChildren(Transform parent) { while (parent.childCount > 0) { var go = parent.GetChild(0); - if (go.childCount > 0) DestoryAllChilds(go); + if (go.childCount > 0) DestroyAllChildren(go); else GameObject.DestroyImmediate(go.gameObject); } } From 2dc3c2f759d012802b7f8c581fdfed80f335ce8b Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 31 Oct 2019 09:40:12 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=96=E5=87=BA?= =?UTF-8?q?=E5=88=B6=E4=BD=9C=E9=A2=84=E8=AE=BE=E6=97=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/Runtime/Demo.cs | 2 +- Runtime/Internal/BaseChart.cs | 2 +- Runtime/Utility/ChartHelper.cs | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Demo/Runtime/Demo.cs b/Demo/Runtime/Demo.cs index 57ffdc46..d2777332 100644 --- a/Demo/Runtime/Demo.cs +++ b/Demo/Runtime/Demo.cs @@ -96,7 +96,7 @@ namespace XCharts var btnPanel = transform.Find("chart_list"); m_BtnClone = transform.Find("btn_clone").gameObject; m_BtnClone.SetActive(false); - //ChartHelper.DestroyAllChildren(btnPanel); + ChartHelper.DestroyAllChildren(btnPanel); foreach (var module in m_ChartModule) { var btnName = "btn_" + module.name; diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 1f5ab2c5..08066464 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -289,7 +289,7 @@ namespace XCharts { var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); - // ChartHelper.DestroyAllChildren(labelObject.transform); + ChartHelper.DestroyAllChildren(labelObject.transform); int count = 0; for (int i = 0; i < m_Series.Count; i++) { diff --git a/Runtime/Utility/ChartHelper.cs b/Runtime/Utility/ChartHelper.cs index f7a30862..8d287ca2 100644 --- a/Runtime/Utility/ChartHelper.cs +++ b/Runtime/Utility/ChartHelper.cs @@ -12,6 +12,9 @@ using System.Text.RegularExpressions; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +#if UNITY_EDITOR +using UnityEditor; +#endif namespace XCharts { @@ -74,6 +77,13 @@ namespace XCharts public static void DestroyAllChildren(Transform parent) { + if(parent == null) return; +#if UNITY_EDITOR + if (PrefabUtility.IsPartOfAnyPrefab(parent.gameObject)) + { + return; + } +#endif while (parent.childCount > 0) { var go = parent.GetChild(0); From 2aef62be9826f6bc85e11945e23884515524a11a Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 31 Oct 2019 09:46:18 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E4=BC=98=E5=8C=96DestroyAllChildren?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Utility/ChartHelper.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Runtime/Utility/ChartHelper.cs b/Runtime/Utility/ChartHelper.cs index 8d287ca2..4fb650a5 100644 --- a/Runtime/Utility/ChartHelper.cs +++ b/Runtime/Utility/ChartHelper.cs @@ -77,7 +77,7 @@ namespace XCharts public static void DestroyAllChildren(Transform parent) { - if(parent == null) return; + if (parent == null) return; #if UNITY_EDITOR if (PrefabUtility.IsPartOfAnyPrefab(parent.gameObject)) { @@ -87,8 +87,10 @@ namespace XCharts while (parent.childCount > 0) { var go = parent.GetChild(0); - if (go.childCount > 0) DestroyAllChildren(go); - else GameObject.DestroyImmediate(go.gameObject); + if (go != null) + { + GameObject.DestroyImmediate(go.gameObject); + } } } From 5885f6253097ea7cbd7cff4a8c1c798cba09dfcd Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 31 Oct 2019 09:49:08 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E5=8F=91=E5=B8=831.0.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 + Demo/demo_xchart.unity | 7210 +++++++++++++++++---------------- Documentation/XChartsAPI.md | 1 + Runtime/Utility/XChartsMgr.cs | 4 +- 4 files changed, 3797 insertions(+), 3420 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 034ea517..b13343a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # 更新日志 +* (2019.10.31) 修复`prefab`预设制作报错的问题 +* (2019.10.31) 增加访问主题组件API：`BaseChart.themeInfo` * (2019.10.26) 发布`v1.0.1`版本 * (2019.10.26) 修复版本检查功能在非运行时异常的问题 * (2019.10.26) 增加科学计数法显示数值的支持（查阅`forceENotation`参数） diff --git a/Demo/demo_xchart.unity b/Demo/demo_xchart.unity index 61c4763c..4df1e5a7 100644 --- a/Demo/demo_xchart.unity +++ b/Demo/demo_xchart.unity @@ -6530,6 +6530,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -6624,6 +6625,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -6682,6 +6684,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -6890,6 +6893,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -6948,6 +6952,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -7156,6 +7161,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -7214,6 +7220,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -7422,6 +7429,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -7480,6 +7488,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -7681,6 +7690,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -7748,6 +7758,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -7811,6 +7822,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -7873,6 +7885,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -12025,7 +12038,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &51059474 MonoBehaviour: @@ -12420,7 +12433,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &51563438 MonoBehaviour: @@ -20094,6 +20107,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -20188,6 +20202,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -20246,6 +20261,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -20447,6 +20463,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -20514,6 +20531,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -20577,6 +20595,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -20639,6 +20658,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -27283,6 +27303,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -27392,6 +27413,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -27450,6 +27472,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -28199,6 +28222,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -28257,6 +28281,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -29022,6 +29047,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -29080,6 +29106,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -30407,6 +30434,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 16 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -30469,6 +30497,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -30532,6 +30561,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 16 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -30594,6 +30624,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -33397,6 +33428,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -33491,6 +33523,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -33549,6 +33582,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -33757,6 +33791,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -33815,6 +33850,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -34023,6 +34059,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -34081,6 +34118,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -34289,6 +34327,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -34347,6 +34386,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -34555,6 +34595,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -34613,6 +34654,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -34814,6 +34856,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -34881,6 +34924,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -34944,6 +34988,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -35006,6 +35051,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -35612,9 +35658,9 @@ RectTransform: m_Father: {fileID: 472702066} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &127589501 @@ -37962,6 +38008,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -38056,6 +38103,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -38114,6 +38162,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -38307,6 +38356,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -38365,6 +38415,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -38544,6 +38595,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -38611,6 +38663,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -38680,6 +38733,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -38742,6 +38796,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -39248,6 +39303,157 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 138914064} m_CullTransparentMesh: 0 +--- !u!1 &139057104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 139057105} + - component: {fileID: 139057109} + - component: {fileID: 139057108} + - component: {fileID: 139057107} + - component: {fileID: 139057106} + m_Layer: 0 + m_Name: "legend_2_\u8054\u76DF\u5E7F\u544A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &139057105 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139057104} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1828037684} + m_Father: {fileID: 637823618} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &139057106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139057104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &139057107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139057104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 139057108} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &139057108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139057104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.38039216, g: 0.627451, b: 0.65882355, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &139057109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139057104} + m_CullTransparentMesh: 0 --- !u!1 &139278994 GameObject: m_ObjectHideFlags: 0 @@ -39867,85 +40073,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 141287047} m_CullTransparentMesh: 0 ---- !u!1 &141421218 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 141421219} - - component: {fileID: 141421221} - - component: {fileID: 141421220} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &141421219 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141421218} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 432456061} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &141421220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141421218} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u67F1\u72B6\u56FE" ---- !u!222 &141421221 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141421218} - m_CullTransparentMesh: 0 --- !u!1 &141542570 GameObject: m_ObjectHideFlags: 0 @@ -41215,6 +41342,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -41309,6 +41437,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -41367,6 +41496,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -41568,6 +41698,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -41635,6 +41766,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -41698,6 +41830,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -41760,6 +41893,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -43348,6 +43482,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155978594} m_CullTransparentMesh: 0 +--- !u!1 &156225521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 156225522} + - component: {fileID: 156225524} + - component: {fileID: 156225523} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &156225522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 156225521} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1108362480} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &156225523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 156225521} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u76F4\u63A5\u8BBF\u95EE" +--- !u!222 &156225524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 156225521} + m_CullTransparentMesh: 0 --- !u!1 &156643303 GameObject: m_ObjectHideFlags: 0 @@ -48781,7 +48994,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 109.35089, y: 90.04639} + m_AnchoredPosition: {x: 108.911194, y: 90.04639} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &180737281 @@ -52868,6 +53081,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199251371} m_CullTransparentMesh: 0 +--- !u!1 &199735715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199735716} + - component: {fileID: 199735718} + - component: {fileID: 199735717} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &199735716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199735715} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1732158165} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &199735717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199735715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u90AE\u4EF6\u8425\u9500" +--- !u!222 &199735718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199735715} + m_CullTransparentMesh: 0 --- !u!1 &199738697 GameObject: m_ObjectHideFlags: 0 @@ -54237,85 +54529,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 208165367} m_CullTransparentMesh: 0 ---- !u!1 &208256328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 208256329} - - component: {fileID: 208256331} - - component: {fileID: 208256330} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &208256329 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208256328} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1662089696} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &208256330 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208256328} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5176\u4ED6" ---- !u!222 &208256331 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 208256328} - m_CullTransparentMesh: 0 --- !u!1 &208406676 GameObject: m_ObjectHideFlags: 0 @@ -56770,145 +56983,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 218926990} m_CullTransparentMesh: 0 ---- !u!1 &219226355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 219226356} - - component: {fileID: 219226360} - - component: {fileID: 219226359} - - component: {fileID: 219226358} - - component: {fileID: 219226357} - m_Layer: 5 - m_Name: "btn_\u96F7\u8FBE\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &219226356 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219226355} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1815721692} - m_Father: {fileID: 1984073382} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &219226357 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219226355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &219226358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219226355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 219226359} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &219226359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219226355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &219226360 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 219226355} - m_CullTransparentMesh: 0 --- !u!1 &219663640 GameObject: m_ObjectHideFlags: 0 @@ -66605,7 +66679,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &257665950 MonoBehaviour: @@ -67942,6 +68016,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -68036,6 +68111,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -68094,6 +68170,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -68287,6 +68364,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -68345,6 +68423,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -68524,6 +68603,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -68591,6 +68671,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -68660,6 +68741,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -68722,6 +68804,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -69727,157 +69810,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 264382296} m_CullTransparentMesh: 0 ---- !u!1 &264803039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 264803040} - - component: {fileID: 264803044} - - component: {fileID: 264803043} - - component: {fileID: 264803042} - - component: {fileID: 264803041} - m_Layer: 0 - m_Name: legend_0_Line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &264803040 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264803039} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 587606999} - m_Father: {fileID: 1666099892} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -32.5, y: 0} - m_SizeDelta: {x: 60, y: 20} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &264803041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264803039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &264803042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264803039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 264803043} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &264803043 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264803039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.7607843, g: 0.20784314, b: 0.19215687, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &264803044 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264803039} - m_CullTransparentMesh: 0 --- !u!1 &265167984 GameObject: m_ObjectHideFlags: 0 @@ -74091,6 +74023,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 280364425} m_CullTransparentMesh: 0 +--- !u!1 &280618998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 280618999} + - component: {fileID: 280619001} + - component: {fileID: 280619000} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &280618999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280618998} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1405543405} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &280619000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280618998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Bar +--- !u!222 &280619001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280618998} + m_CullTransparentMesh: 0 --- !u!1 &280813312 GameObject: m_ObjectHideFlags: 0 @@ -75721,6 +75732,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 286729373} m_CullTransparentMesh: 0 +--- !u!1 &286800803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 286800804} + - component: {fileID: 286800806} + - component: {fileID: 286800805} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &286800804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286800803} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1175709254} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &286800805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286800803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70ED\u529B\u56FE" +--- !u!222 &286800806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286800803} + m_CullTransparentMesh: 0 --- !u!1 &287493268 GameObject: m_ObjectHideFlags: 0 @@ -79046,6 +79136,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 301130075} m_CullTransparentMesh: 0 +--- !u!1 &301735824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 301735825} + - component: {fileID: 301735827} + - component: {fileID: 301735826} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &301735825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 301735824} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1206228871} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &301735826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 301735824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u997C\u56FE" +--- !u!222 &301735827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 301735824} + m_CullTransparentMesh: 0 --- !u!1 &302133686 GameObject: m_ObjectHideFlags: 0 @@ -88734,6 +88903,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 343204856} m_CullTransparentMesh: 0 +--- !u!1 &343607736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 343607737} + - component: {fileID: 343607741} + - component: {fileID: 343607740} + - component: {fileID: 343607739} + - component: {fileID: 343607738} + m_Layer: 5 + m_Name: "btn_\u9996\u9875" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &343607737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343607736} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2143036899} + m_Father: {fileID: 1984073382} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &343607738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343607736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &343607739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343607736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_HighlightedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 343607740} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &343607740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343607736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &343607741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343607736} + m_CullTransparentMesh: 0 --- !u!1 &343735697 GameObject: m_ObjectHideFlags: 0 @@ -94160,7 +94468,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &366200782 MonoBehaviour: @@ -95882,157 +96190,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375105937} m_CullTransparentMesh: 0 ---- !u!1 &375558584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 375558585} - - component: {fileID: 375558589} - - component: {fileID: 375558588} - - component: {fileID: 375558587} - - component: {fileID: 375558586} - m_Layer: 0 - m_Name: legend_1_Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &375558585 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375558584} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 583763292} - m_Father: {fileID: 1666099892} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 32.5, y: 0} - m_SizeDelta: {x: 60, y: 20} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &375558586 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375558584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &375558587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375558584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 375558588} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &375558588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375558584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.18431373, g: 0.27058825, b: 0.32941177, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &375558589 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375558584} - m_CullTransparentMesh: 0 --- !u!1 &376101268 GameObject: m_ObjectHideFlags: 0 @@ -98240,7 +98397,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75.23878, y: 24.10772} + m_SizeDelta: {x: 74.359406, y: 24.295984} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &387648236 MonoBehaviour: @@ -98513,7 +98670,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75.23878, y: 24.10772} + m_SizeDelta: {x: 74.359406, y: 24.295984} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &389790896 MonoBehaviour: @@ -100978,85 +101135,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 400379218} m_CullTransparentMesh: 0 ---- !u!1 &400718333 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 400718334} - - component: {fileID: 400718336} - - component: {fileID: 400718335} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &400718334 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400718333} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1171847488} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &400718335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400718333} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6563\u70B9\u56FE" ---- !u!222 &400718336 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400718333} - m_CullTransparentMesh: 0 --- !u!1 &401163385 GameObject: m_ObjectHideFlags: 0 @@ -101403,6 +101481,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402350981} m_CullTransparentMesh: 0 +--- !u!1 &402736171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 402736172} + - component: {fileID: 402736174} + - component: {fileID: 402736173} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &402736172 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402736171} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1100780056} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &402736173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402736171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u89C6\u9891\u5E7F\u544A" +--- !u!222 &402736174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402736171} + m_CullTransparentMesh: 0 --- !u!1 &403450669 GameObject: m_ObjectHideFlags: 0 @@ -102936,6 +103093,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -103030,6 +103188,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -103088,6 +103247,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -103296,6 +103456,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -103354,6 +103515,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -103555,6 +103717,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -103622,6 +103785,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -103685,6 +103849,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -103747,6 +103912,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -105829,7 +105995,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 181.32175, y: 15.433273} + m_AnchoredPosition: {x: 180.88208, y: 15.433273} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &416325874 @@ -107274,9 +107440,9 @@ RectTransform: m_Father: {fileID: 1867673941} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &421973956 @@ -108891,6 +109057,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -108988,6 +109155,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -109046,6 +109214,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -110154,145 +110323,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 432187783} m_CullTransparentMesh: 0 ---- !u!1 &432456060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 432456061} - - component: {fileID: 432456065} - - component: {fileID: 432456064} - - component: {fileID: 432456063} - - component: {fileID: 432456062} - m_Layer: 5 - m_Name: "btn_\u67F1\u72B6\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &432456061 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432456060} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 141421219} - m_Father: {fileID: 1984073382} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &432456062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432456060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &432456063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432456060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 432456064} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &432456064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432456060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &432456065 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 432456060} - m_CullTransparentMesh: 0 --- !u!1 &433337035 GameObject: m_ObjectHideFlags: 0 @@ -114009,6 +114039,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -114113,6 +114144,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -114171,6 +114203,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -114915,6 +114948,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -114973,6 +115007,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -115717,6 +115752,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -115775,6 +115811,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -121573,9 +121610,9 @@ RectTransform: m_Father: {fileID: 472702066} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &471060060 @@ -122238,6 +122275,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -122332,6 +122370,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -122390,6 +122429,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -122559,6 +122599,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -122621,6 +122662,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -122684,6 +122726,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -122746,6 +122789,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -128120,157 +128164,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 499596561} m_CullTransparentMesh: 0 ---- !u!1 &499642848 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 499642849} - - component: {fileID: 499642853} - - component: {fileID: 499642852} - - component: {fileID: 499642851} - - component: {fileID: 499642850} - m_Layer: 0 - m_Name: "legend_1_\u90AE\u4EF6\u8425\u9500" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &499642849 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499642848} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1547009430} - m_Father: {fileID: 637823618} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 70, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &499642850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499642848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &499642851 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499642848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 499642852} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &499642852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499642848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.18431373, g: 0.27058825, b: 0.32941177, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &499642853 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499642848} - m_CullTransparentMesh: 0 --- !u!1 &500428355 GameObject: m_ObjectHideFlags: 0 @@ -131342,6 +131235,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -131436,6 +131330,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -131494,6 +131389,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -131695,6 +131591,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -131762,6 +131659,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -131825,6 +131723,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -131887,6 +131786,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -132751,6 +132651,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 521588883} m_CullTransparentMesh: 0 +--- !u!1 &521625447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 521625448} + - component: {fileID: 521625450} + - component: {fileID: 521625449} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &521625448 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 521625447} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1742034797} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &521625449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 521625447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Line +--- !u!222 &521625450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 521625447} + m_CullTransparentMesh: 0 --- !u!1 &521904017 GameObject: m_ObjectHideFlags: 0 @@ -136864,6 +136843,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538753261} m_CullTransparentMesh: 0 +--- !u!1 &539229256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 539229257} + - component: {fileID: 539229259} + - component: {fileID: 539229258} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &539229257 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539229256} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1007470818} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &539229258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539229256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6563\u70B9\u56FE" +--- !u!222 &539229259 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539229256} + m_CullTransparentMesh: 0 --- !u!1 &539298998 GameObject: m_ObjectHideFlags: 0 @@ -140328,7 +140386,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &555929839 MonoBehaviour: @@ -145562,6 +145620,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -145656,6 +145715,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -145714,6 +145774,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -145915,6 +145976,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -145982,6 +146044,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -146052,6 +146115,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -146114,6 +146178,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -146525,6 +146590,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -146619,6 +146685,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -146677,6 +146744,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -146864,6 +146932,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -146922,6 +146991,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -150977,6 +151047,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -151039,6 +151110,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -151102,6 +151174,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -151164,6 +151237,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -152421,7 +152495,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &581915372 MonoBehaviour: @@ -152891,85 +152965,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 583432767} m_CullTransparentMesh: 0 ---- !u!1 &583763291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 583763292} - - component: {fileID: 583763294} - - component: {fileID: 583763293} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &583763292 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 583763291} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 375558585} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &583763293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 583763291} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Bar ---- !u!222 &583763294 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 583763291} - m_CullTransparentMesh: 0 --- !u!1 &583892133 GameObject: m_ObjectHideFlags: 0 @@ -153894,6 +153889,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -153988,6 +153984,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -154046,6 +154043,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -169175,6 +169173,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -169237,6 +169236,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -169300,6 +169300,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -169362,6 +169363,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -169734,85 +169736,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 586834137} m_CullTransparentMesh: 0 ---- !u!1 &587606998 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 587606999} - - component: {fileID: 587607001} - - component: {fileID: 587607000} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &587606999 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587606998} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 264803040} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &587607000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587606998} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: Line ---- !u!222 &587607001 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587606998} - m_CullTransparentMesh: 0 --- !u!1 &588011345 GameObject: m_ObjectHideFlags: 0 @@ -171051,6 +170974,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 597084794} m_CullTransparentMesh: 0 +--- !u!1 &597151532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 597151533} + - component: {fileID: 597151535} + - component: {fileID: 597151534} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &597151533 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597151532} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1604159955} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &597151534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597151532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6298\u7EBF\u56FE" +--- !u!222 &597151535 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597151532} + m_CullTransparentMesh: 0 --- !u!1 &597291533 GameObject: m_ObjectHideFlags: 0 @@ -179687,6 +179689,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -179781,6 +179784,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -179839,6 +179843,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -180047,6 +180052,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -180105,6 +180111,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -180306,6 +180313,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -180373,6 +180381,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -180443,6 +180452,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -180505,6 +180515,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -182255,7 +182266,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &634539313 MonoBehaviour: @@ -183027,6 +183038,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -183125,6 +183137,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -183183,6 +183196,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -183410,6 +183424,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -183468,6 +183483,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -183722,11 +183738,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1003955010} - - {fileID: 499642849} - - {fileID: 1804959458} - - {fileID: 1943725654} - - {fileID: 1460117204} + - {fileID: 1108362480} + - {fileID: 1732158165} + - {fileID: 139057105} + - {fileID: 1100780056} + - {fileID: 948740804} m_Father: {fileID: 1000969945} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -187797,6 +187813,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -187891,6 +187908,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -187949,6 +187967,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -188157,6 +188176,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -188215,6 +188235,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -188416,6 +188437,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -188483,6 +188505,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -188546,6 +188569,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -188608,6 +188632,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -189226,85 +189251,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 655852763} m_CullTransparentMesh: 0 ---- !u!1 &656129895 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 656129896} - - component: {fileID: 656129898} - - component: {fileID: 656129897} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &656129896 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 656129895} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1164033923} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &656129897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 656129895} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u70ED\u529B\u56FE" ---- !u!222 &656129898 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 656129895} - m_CullTransparentMesh: 0 --- !u!1 &656198550 GameObject: m_ObjectHideFlags: 0 @@ -198021,6 +197967,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -198118,6 +198065,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -198176,6 +198124,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -201345,7 +201294,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &701628086 MonoBehaviour: @@ -207480,6 +207429,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -207574,6 +207524,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -207632,6 +207583,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -207871,6 +207823,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -207933,6 +207886,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -207996,6 +207950,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -208058,6 +208013,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -212410,7 +212366,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &747928664 MonoBehaviour: @@ -216089,7 +216045,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -183.73395, y: -76.363594} + m_AnchoredPosition: {x: -183.29427, y: -76.363594} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &764182832 @@ -220169,6 +220125,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -220263,6 +220220,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -220321,6 +220279,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -220522,6 +220481,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -220589,6 +220549,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -220652,6 +220613,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -220714,6 +220676,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -234334,9 +234297,9 @@ RectTransform: m_Father: {fileID: 1867673941} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &840327357 @@ -239203,7 +239166,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &860624748 MonoBehaviour: @@ -245687,6 +245650,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -245781,6 +245745,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -245839,6 +245804,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -245980,6 +245946,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -246047,6 +246014,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -246110,6 +246078,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -246172,6 +246141,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -259233,6 +259203,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -259327,6 +259298,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -259385,6 +259357,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -259593,6 +259566,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -259651,6 +259625,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -259859,6 +259834,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -259917,6 +259893,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -260118,6 +260095,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -260185,6 +260163,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -260248,6 +260227,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -260310,6 +260290,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -261859,6 +261840,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -261953,6 +261935,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -262011,6 +261994,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -262219,6 +262203,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -262277,6 +262262,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -262478,6 +262464,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -262545,6 +262532,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -262608,6 +262596,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -262670,6 +262659,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -264967,6 +264957,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -265061,6 +265052,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -265119,6 +265111,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -265327,6 +265320,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -265385,6 +265379,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -265586,6 +265581,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -265653,6 +265649,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -265716,6 +265713,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -265778,6 +265776,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -266240,6 +266239,157 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 948717989} m_CullTransparentMesh: 0 +--- !u!1 &948740803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 948740804} + - component: {fileID: 948740808} + - component: {fileID: 948740807} + - component: {fileID: 948740806} + - component: {fileID: 948740805} + m_Layer: 0 + m_Name: "legend_4_\u641C\u7D22\u5F15\u64CE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &948740804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948740803} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1093673909} + m_Father: {fileID: 637823618} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &948740805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948740803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &948740806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948740803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 948740807} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &948740807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948740803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5686275, g: 0.78039217, b: 0.68235296, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &948740808 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948740803} + m_CullTransparentMesh: 0 --- !u!1 &949169157 GameObject: m_ObjectHideFlags: 0 @@ -267084,7 +267234,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4cbfef5a9a03149f6a1ddf4ebe502bf6, type: 3} m_Name: m_EditorClassIdentifier: - m_NowVersion: 1.0.0 (20191023) + m_NowVersion: 1.0.1 (20191026) m_NewVersion: 1.0.0 (20191022) --- !u!4 &953846993 Transform: @@ -274801,6 +274951,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -274895,6 +275046,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -274953,6 +275105,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -289868,6 +290021,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -289930,6 +290084,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -290015,6 +290170,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -290077,6 +290233,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -293703,6 +293860,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -293797,6 +293955,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -293855,6 +294014,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -294321,157 +294481,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1003749054} m_CullTransparentMesh: 0 ---- !u!1 &1003955009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1003955010} - - component: {fileID: 1003955014} - - component: {fileID: 1003955013} - - component: {fileID: 1003955012} - - component: {fileID: 1003955011} - m_Layer: 0 - m_Name: "legend_0_\u76F4\u63A5\u8BBF\u95EE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1003955010 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1003955009} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1801236850} - m_Father: {fileID: 637823618} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 70, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1003955011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1003955009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1003955012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1003955009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1003955013} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1003955013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1003955009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.7607843, g: 0.20784314, b: 0.19215687, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1003955014 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1003955009} - m_CullTransparentMesh: 0 --- !u!1 &1004058828 GameObject: m_ObjectHideFlags: 0 @@ -295304,6 +295313,145 @@ RectTransform: m_AnchoredPosition: {x: -292, y: -150} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1007470817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1007470818} + - component: {fileID: 1007470822} + - component: {fileID: 1007470821} + - component: {fileID: 1007470820} + - component: {fileID: 1007470819} + m_Layer: 5 + m_Name: "btn_\u6563\u70B9\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1007470818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007470817} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 539229257} + m_Father: {fileID: 1984073382} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1007470819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007470817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1007470820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007470817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1007470821} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1007470821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007470817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1007470822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007470817} + m_CullTransparentMesh: 0 --- !u!1 &1007606702 GameObject: m_ObjectHideFlags: 0 @@ -309453,7 +309601,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1068502605 MonoBehaviour: @@ -316168,6 +316316,85 @@ RectTransform: m_AnchoredPosition: {x: -586.56, y: -169} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1093673908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1093673909} + - component: {fileID: 1093673911} + - component: {fileID: 1093673910} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1093673909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093673908} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 948740804} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1093673910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093673908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u641C\u7D22\u5F15\u64CE" +--- !u!222 &1093673911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093673908} + m_CullTransparentMesh: 0 --- !u!1 &1093674502 GameObject: m_ObjectHideFlags: 0 @@ -317856,6 +318083,157 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1100730173} m_CullTransparentMesh: 0 +--- !u!1 &1100780055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1100780056} + - component: {fileID: 1100780060} + - component: {fileID: 1100780059} + - component: {fileID: 1100780058} + - component: {fileID: 1100780057} + m_Layer: 0 + m_Name: "legend_3_\u89C6\u9891\u5E7F\u544A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1100780056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100780055} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 402736172} + m_Father: {fileID: 637823618} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1100780057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100780055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1100780058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100780055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1100780059} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1100780059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100780055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83137256, g: 0.50980395, b: 0.39607844, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1100780060 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1100780055} + m_CullTransparentMesh: 0 --- !u!1 &1100816332 GameObject: m_ObjectHideFlags: 0 @@ -319744,6 +320122,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -319838,6 +320217,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -319896,6 +320276,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -320037,6 +320418,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -320095,6 +320477,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -320587,6 +320970,157 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108325640} m_CullTransparentMesh: 0 +--- !u!1 &1108362479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108362480} + - component: {fileID: 1108362484} + - component: {fileID: 1108362483} + - component: {fileID: 1108362482} + - component: {fileID: 1108362481} + m_Layer: 0 + m_Name: "legend_0_\u76F4\u63A5\u8BBF\u95EE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1108362480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108362479} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 156225522} + m_Father: {fileID: 637823618} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1108362481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108362479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1108362482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108362479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1108362483} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1108362483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108362479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7607843, g: 0.20784314, b: 0.19215687, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1108362484 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1108362479} + m_CullTransparentMesh: 0 --- !u!1 &1108406657 GameObject: m_ObjectHideFlags: 0 @@ -324595,6 +325129,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1126179685} m_CullTransparentMesh: 0 +--- !u!1 &1126324661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1126324662} + - component: {fileID: 1126324664} + - component: {fileID: 1126324663} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1126324662 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126324661} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1574824903} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1126324663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126324661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u96F7\u8FBE\u56FE" +--- !u!222 &1126324664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1126324661} + m_CullTransparentMesh: 0 --- !u!1 &1126351279 GameObject: m_ObjectHideFlags: 0 @@ -324941,6 +325554,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -325035,6 +325649,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -325093,6 +325708,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -325262,6 +325878,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -325324,6 +325941,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -325387,6 +326005,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -325449,6 +326068,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -330868,6 +331488,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -330962,6 +331583,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -331020,6 +331642,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -332725,6 +333348,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -332787,6 +333411,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -332850,6 +333475,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -332912,6 +333538,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -334185,85 +334812,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157043020} m_CullTransparentMesh: 0 ---- !u!1 &1157258948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1157258949} - - component: {fileID: 1157258951} - - component: {fileID: 1157258950} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1157258949 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157258948} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1593647530} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1157258950 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157258948} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u997C\u56FE" ---- !u!222 &1157258951 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157258948} - m_CullTransparentMesh: 0 --- !u!1 &1157327786 GameObject: m_ObjectHideFlags: 0 @@ -335268,6 +335816,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -335362,6 +335911,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -335420,6 +335970,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -335598,6 +336149,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -335656,6 +336208,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -335834,6 +336387,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -335892,6 +336446,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -336061,6 +336616,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -336123,6 +336679,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -336186,6 +336743,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -336248,6 +336806,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -337206,145 +337765,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1164033922 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1164033923} - - component: {fileID: 1164033927} - - component: {fileID: 1164033926} - - component: {fileID: 1164033925} - - component: {fileID: 1164033924} - m_Layer: 5 - m_Name: "btn_\u70ED\u529B\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1164033923 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164033922} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 656129896} - m_Father: {fileID: 1984073382} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1164033924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164033922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1164033925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164033922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1164033926} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1164033926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164033922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1164033927 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164033922} - m_CullTransparentMesh: 0 --- !u!1 &1164485635 GameObject: m_ObjectHideFlags: 0 @@ -338509,145 +338929,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1171847487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1171847488} - - component: {fileID: 1171847492} - - component: {fileID: 1171847491} - - component: {fileID: 1171847490} - - component: {fileID: 1171847489} - m_Layer: 5 - m_Name: "btn_\u6563\u70B9\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1171847488 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171847487} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 400718334} - m_Father: {fileID: 1984073382} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1171847489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171847487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1171847490 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171847487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1171847491} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1171847491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171847487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1171847492 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1171847487} - m_CullTransparentMesh: 0 --- !u!1 &1172555286 GameObject: m_ObjectHideFlags: 0 @@ -339351,6 +339632,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175404523} m_CullTransparentMesh: 0 +--- !u!1 &1175709253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1175709254} + - component: {fileID: 1175709258} + - component: {fileID: 1175709257} + - component: {fileID: 1175709256} + - component: {fileID: 1175709255} + m_Layer: 5 + m_Name: "btn_\u70ED\u529B\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1175709254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175709253} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 286800804} + m_Father: {fileID: 1984073382} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1175709255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175709253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1175709256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175709253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1175709257} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1175709257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175709253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1175709258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175709253} + m_CullTransparentMesh: 0 --- !u!1 &1175724539 GameObject: m_ObjectHideFlags: 0 @@ -345522,6 +345942,145 @@ RectTransform: m_AnchoredPosition: {x: -292, y: -150} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1206228870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1206228871} + - component: {fileID: 1206228875} + - component: {fileID: 1206228874} + - component: {fileID: 1206228873} + - component: {fileID: 1206228872} + m_Layer: 5 + m_Name: "btn_\u997C\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1206228871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228870} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 301735825} + m_Father: {fileID: 1984073382} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1206228872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1206228873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1206228874} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1206228874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1206228875 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228870} + m_CullTransparentMesh: 0 --- !u!1 &1206454323 GameObject: m_ObjectHideFlags: 0 @@ -351269,85 +351828,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1230264359} m_CullTransparentMesh: 0 ---- !u!1 &1230316017 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1230316018} - - component: {fileID: 1230316020} - - component: {fileID: 1230316019} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1230316018 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230316017} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1943725654} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1230316019 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230316017} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u89C6\u9891\u5E7F\u544A" ---- !u!222 &1230316020 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230316017} - m_CullTransparentMesh: 0 --- !u!1 &1230992847 GameObject: m_ObjectHideFlags: 0 @@ -360836,7 +361316,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1271673423 MonoBehaviour: @@ -364138,7 +364618,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1288256099 MonoBehaviour: @@ -366559,6 +367039,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -366656,6 +367137,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -366714,6 +367196,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -370668,7 +371151,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1310495745 MonoBehaviour: @@ -371295,85 +371778,6 @@ RectTransform: m_AnchoredPosition: {x: -292, y: -150} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1313938258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1313938259} - - component: {fileID: 1313938261} - - component: {fileID: 1313938260} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1313938259 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313938258} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1980867351} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1313938260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313938258} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u9996\u9875" ---- !u!222 &1313938261 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1313938258} - m_CullTransparentMesh: 0 --- !u!1 &1314042434 GameObject: m_ObjectHideFlags: 0 @@ -376618,7 +377022,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75.23878, y: 24.10772} + m_SizeDelta: {x: 74.359406, y: 24.295984} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1335668151 MonoBehaviour: @@ -387091,6 +387495,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -387185,6 +387590,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -387243,6 +387649,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -406517,6 +406924,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -406579,6 +406987,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -406642,6 +407051,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -406704,6 +407114,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -412310,7 +412721,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1392916893 MonoBehaviour: @@ -415203,6 +415614,157 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1405543404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1405543405} + - component: {fileID: 1405543409} + - component: {fileID: 1405543408} + - component: {fileID: 1405543407} + - component: {fileID: 1405543406} + m_Layer: 0 + m_Name: legend_1_Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1405543405 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405543404} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 280618999} + m_Father: {fileID: 1666099892} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 32.5, y: 0} + m_SizeDelta: {x: 60, y: 20} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1405543406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405543404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1405543407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405543404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1405543408} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1405543408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405543404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.18431373, g: 0.27058825, b: 0.32941177, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1405543409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405543404} + m_CullTransparentMesh: 0 --- !u!1 &1405718894 GameObject: m_ObjectHideFlags: 0 @@ -427411,9 +427973,9 @@ RectTransform: m_Father: {fileID: 1693045525} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &1453066210 @@ -428725,157 +429287,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1458795366} m_CullTransparentMesh: 0 ---- !u!1 &1460117203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1460117204} - - component: {fileID: 1460117208} - - component: {fileID: 1460117207} - - component: {fileID: 1460117206} - - component: {fileID: 1460117205} - m_Layer: 0 - m_Name: "legend_4_\u641C\u7D22\u5F15\u64CE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1460117204 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460117203} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1584480613} - m_Father: {fileID: 637823618} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: 70, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1460117205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460117203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1460117206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460117203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1460117207} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1460117207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460117203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5686275, g: 0.78039217, b: 0.68235296, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1460117208 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460117203} - m_CullTransparentMesh: 0 --- !u!1 &1460553709 GameObject: m_ObjectHideFlags: 0 @@ -428992,85 +429403,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1461017913 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1461017914} - - component: {fileID: 1461017916} - - component: {fileID: 1461017915} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1461017914 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461017913} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1804959458} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1461017915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461017913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u8054\u76DF\u5E7F\u544A" ---- !u!222 &1461017916 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461017913} - m_CullTransparentMesh: 0 --- !u!1 &1461185552 GameObject: m_ObjectHideFlags: 0 @@ -429540,145 +429872,6 @@ RectTransform: m_AnchoredPosition: {x: -586.56, y: -169} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1463724685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1463724686} - - component: {fileID: 1463724690} - - component: {fileID: 1463724689} - - component: {fileID: 1463724688} - - component: {fileID: 1463724687} - m_Layer: 5 - m_Name: "btn_\u6298\u7EBF\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1463724686 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1463724685} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1544688905} - m_Father: {fileID: 1984073382} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1463724687 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1463724685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1463724688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1463724685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1463724689} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1463724689 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1463724685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1463724690 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1463724685} - m_CullTransparentMesh: 0 --- !u!1 &1464515936 GameObject: m_ObjectHideFlags: 0 @@ -430334,6 +430527,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -430428,6 +430622,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -430486,6 +430681,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -433298,6 +433494,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -433360,6 +433557,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -433430,6 +433628,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -433492,6 +433691,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -439548,7 +439748,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1491944447 MonoBehaviour: @@ -442156,6 +442356,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -442250,6 +442451,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -442308,6 +442510,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -442509,6 +442712,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -442576,6 +442780,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -442639,6 +442844,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -442701,6 +442907,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -443626,6 +443833,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -443723,6 +443931,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -443781,6 +443990,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -444229,6 +444439,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -444287,6 +444498,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -444718,6 +444930,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -444780,6 +444993,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -444843,6 +445057,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -444905,6 +445120,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -449308,6 +449524,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -449402,6 +449619,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -449460,6 +449678,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -449668,6 +449887,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -449726,6 +449946,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -449934,6 +450155,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -449992,6 +450214,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -450200,6 +450423,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -450258,6 +450482,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -450466,6 +450691,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -450524,6 +450750,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -450725,6 +450952,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -450792,6 +451020,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -450855,6 +451084,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -450917,6 +451147,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -456448,85 +456679,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1544688904 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1544688905} - - component: {fileID: 1544688907} - - component: {fileID: 1544688906} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1544688905 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1544688904} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1463724686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1544688906 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1544688904} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6298\u7EBF\u56FE" ---- !u!222 &1544688907 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1544688904} - m_CullTransparentMesh: 0 --- !u!1 &1545108959 GameObject: m_ObjectHideFlags: 0 @@ -457193,85 +457345,6 @@ RectTransform: m_AnchoredPosition: {x: -292, y: -150} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1547009429 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1547009430} - - component: {fileID: 1547009432} - - component: {fileID: 1547009431} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1547009430 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547009429} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 499642849} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1547009431 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547009429} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u90AE\u4EF6\u8425\u9500" ---- !u!222 &1547009432 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547009429} - m_CullTransparentMesh: 0 --- !u!1 &1547544389 GameObject: m_ObjectHideFlags: 0 @@ -464003,6 +464076,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574371187} m_CullTransparentMesh: 0 +--- !u!1 &1574824902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574824903} + - component: {fileID: 1574824907} + - component: {fileID: 1574824906} + - component: {fileID: 1574824905} + - component: {fileID: 1574824904} + m_Layer: 5 + m_Name: "btn_\u96F7\u8FBE\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1574824903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574824902} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1126324662} + m_Father: {fileID: 1984073382} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1574824904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574824902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1574824905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574824902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1574824906} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1574824906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574824902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1574824907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574824902} + m_CullTransparentMesh: 0 --- !u!1 &1574893982 GameObject: m_ObjectHideFlags: 0 @@ -466019,9 +466231,9 @@ RectTransform: m_Father: {fileID: 1693045525} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!1 &1584084132 @@ -466256,85 +466468,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584458700} m_CullTransparentMesh: 0 ---- !u!1 &1584480612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1584480613} - - component: {fileID: 1584480615} - - component: {fileID: 1584480614} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1584480613 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584480612} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1460117204} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1584480614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584480612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u641C\u7D22\u5F15\u64CE" ---- !u!222 &1584480615 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584480612} - m_CullTransparentMesh: 0 --- !u!1 &1584530144 GameObject: m_ObjectHideFlags: 0 @@ -466497,6 +466630,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1584684735} m_CullTransparentMesh: 0 +--- !u!1 &1584699279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584699280} + - component: {fileID: 1584699284} + - component: {fileID: 1584699283} + - component: {fileID: 1584699282} + - component: {fileID: 1584699281} + m_Layer: 5 + m_Name: "btn_\u67F1\u72B6\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1584699280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584699279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1724409768} + m_Father: {fileID: 1984073382} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1584699281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584699279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1584699282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584699279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1584699283} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1584699283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584699279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1584699284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584699279} + m_CullTransparentMesh: 0 --- !u!1 &1584742782 GameObject: m_ObjectHideFlags: 0 @@ -467949,7 +468221,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1590248995 MonoBehaviour: @@ -468807,145 +469079,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593581795} m_CullTransparentMesh: 0 ---- !u!1 &1593647529 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1593647530} - - component: {fileID: 1593647534} - - component: {fileID: 1593647533} - - component: {fileID: 1593647532} - - component: {fileID: 1593647531} - m_Layer: 5 - m_Name: "btn_\u997C\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1593647530 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593647529} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1157258949} - m_Father: {fileID: 1984073382} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1593647531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593647529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1593647532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593647529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1593647533} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1593647533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593647529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1593647534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593647529} - m_CullTransparentMesh: 0 --- !u!1 &1593672703 GameObject: m_ObjectHideFlags: 0 @@ -471080,6 +471213,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1603484911} m_CullTransparentMesh: 0 +--- !u!1 &1604159954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604159955} + - component: {fileID: 1604159959} + - component: {fileID: 1604159958} + - component: {fileID: 1604159957} + - component: {fileID: 1604159956} + m_Layer: 5 + m_Name: "btn_\u6298\u7EBF\u56FE" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1604159955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604159954} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 597151533} + m_Father: {fileID: 1984073382} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1604159956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604159954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1604159957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604159954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1604159958} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1604159958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604159954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1604159959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604159954} + m_CullTransparentMesh: 0 --- !u!1 &1604214959 GameObject: m_ObjectHideFlags: 0 @@ -478601,6 +478873,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -478695,6 +478968,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -478753,6 +479027,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -479142,7 +479417,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1642069712 MonoBehaviour: @@ -484312,145 +484587,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661948313} m_CullTransparentMesh: 0 ---- !u!1 &1662089695 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1662089696} - - component: {fileID: 1662089700} - - component: {fileID: 1662089699} - - component: {fileID: 1662089698} - - component: {fileID: 1662089697} - m_Layer: 5 - m_Name: "btn_\u5176\u4ED6" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1662089696 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662089695} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 208256329} - m_Father: {fileID: 1984073382} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1662089697 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662089695} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1662089698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662089695} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} - m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1662089699} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1662089699 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662089695} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1662089700 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662089695} - m_CullTransparentMesh: 0 --- !u!1 &1662305425 GameObject: m_ObjectHideFlags: 0 @@ -485564,8 +485700,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 264803040} - - {fileID: 375558585} + - {fileID: 1742034797} + - {fileID: 1405543405} m_Father: {fileID: 1867673941} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -487491,7 +487627,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75.23878, y: 24.10772} + m_SizeDelta: {x: 74.359406, y: 24.295984} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1678889806 MonoBehaviour: @@ -491107,6 +491243,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -491201,6 +491338,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -491259,6 +491397,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -491428,6 +491567,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -491490,6 +491630,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -491553,6 +491694,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -491615,6 +491757,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -498281,6 +498424,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723891456} m_CullTransparentMesh: 0 +--- !u!1 &1724409767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1724409768} + - component: {fileID: 1724409770} + - component: {fileID: 1724409769} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1724409768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724409767} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1584699280} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1724409769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724409767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u67F1\u72B6\u56FE" +--- !u!222 &1724409770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724409767} + m_CullTransparentMesh: 0 --- !u!1 &1724482506 GameObject: m_ObjectHideFlags: 0 @@ -500110,6 +500332,157 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731919576} m_CullTransparentMesh: 0 +--- !u!1 &1732158164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1732158165} + - component: {fileID: 1732158169} + - component: {fileID: 1732158168} + - component: {fileID: 1732158167} + - component: {fileID: 1732158166} + m_Layer: 0 + m_Name: "legend_1_\u90AE\u4EF6\u8425\u9500" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1732158165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732158164} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 199735716} + m_Father: {fileID: 637823618} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 70, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1732158166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732158164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1732158167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732158164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1732158168} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1732158168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732158164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.18431373, g: 0.27058825, b: 0.32941177, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1732158169 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732158164} + m_CullTransparentMesh: 0 --- !u!1 &1732471306 GameObject: m_ObjectHideFlags: 0 @@ -501454,6 +501827,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -501548,6 +501922,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -501606,6 +501981,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -501814,6 +502190,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -501872,6 +502249,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -502073,6 +502451,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -502140,6 +502519,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -502203,6 +502583,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -502265,6 +502646,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -503158,6 +503540,157 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 16} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1742034796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1742034797} + - component: {fileID: 1742034801} + - component: {fileID: 1742034800} + - component: {fileID: 1742034799} + - component: {fileID: 1742034798} + m_Layer: 0 + m_Name: legend_0_Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1742034797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742034796} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 521625448} + m_Father: {fileID: 1666099892} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -32.5, y: 0} + m_SizeDelta: {x: 60, y: 20} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1742034798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742034796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &1742034799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742034796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1742034800} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1742034800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742034796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7607843, g: 0.20784314, b: 0.19215687, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1742034801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742034796} + m_CullTransparentMesh: 0 --- !u!1 &1742184067 GameObject: m_ObjectHideFlags: 0 @@ -515040,6 +515573,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -515134,6 +515668,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -515192,6 +515727,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -515310,6 +515846,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -515368,6 +515905,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -515486,6 +516024,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -515544,6 +516083,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -515662,6 +516202,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -515720,6 +516261,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -515824,6 +516366,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -515891,6 +516434,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -515955,6 +516499,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -516017,6 +516562,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -518523,85 +519069,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1800939440} m_CullTransparentMesh: 0 ---- !u!1 &1801236849 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1801236850} - - component: {fileID: 1801236852} - - component: {fileID: 1801236851} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1801236850 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801236849} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1003955010} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1801236851 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801236849} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u76F4\u63A5\u8BBF\u95EE" ---- !u!222 &1801236852 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801236849} - m_CullTransparentMesh: 0 --- !u!1 &1801796873 GameObject: m_ObjectHideFlags: 0 @@ -519353,157 +519820,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804664959} m_CullTransparentMesh: 0 ---- !u!1 &1804959457 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1804959458} - - component: {fileID: 1804959462} - - component: {fileID: 1804959461} - - component: {fileID: 1804959460} - - component: {fileID: 1804959459} - m_Layer: 0 - m_Name: "legend_2_\u8054\u76DF\u5E7F\u544A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1804959458 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804959457} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1461017914} - m_Father: {fileID: 637823618} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 70, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1804959459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804959457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1804959460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804959457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1804959461} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1804959461 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804959457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.38039216, g: 0.627451, b: 0.65882355, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1804959462 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804959457} - m_CullTransparentMesh: 0 --- !u!1 &1804980992 GameObject: m_ObjectHideFlags: 0 @@ -521950,85 +522266,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1814396399} m_CullTransparentMesh: 0 ---- !u!1 &1815721691 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1815721692} - - component: {fileID: 1815721694} - - component: {fileID: 1815721693} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1815721692 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815721691} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 219226356} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1815721693 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815721691} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 22 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u96F7\u8FBE\u56FE" ---- !u!222 &1815721694 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815721691} - m_CullTransparentMesh: 0 --- !u!1 &1816137284 GameObject: m_ObjectHideFlags: 0 @@ -524070,6 +524307,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1827721774} m_CullTransparentMesh: 0 +--- !u!1 &1828037683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828037684} + - component: {fileID: 1828037686} + - component: {fileID: 1828037685} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1828037684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828037683} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 139057105} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1828037685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828037683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8054\u76DF\u5E7F\u544A" +--- !u!222 &1828037686 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828037683} + m_CullTransparentMesh: 0 --- !u!1 &1828958356 GameObject: m_ObjectHideFlags: 0 @@ -525602,6 +525918,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -525696,6 +526013,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -525754,6 +526072,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -525962,6 +526281,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -526020,6 +526340,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -526221,6 +526542,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -526288,6 +526610,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -526351,6 +526674,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -526413,6 +526737,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -530480,7 +530805,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1855059493 MonoBehaviour: @@ -532492,6 +532817,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -532589,6 +532915,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -532647,6 +532974,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -532918,6 +533246,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -532976,6 +533305,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -533273,6 +533603,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -533335,6 +533666,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -533398,6 +533730,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -533460,6 +533793,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -534102,6 +534436,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -534196,6 +534531,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -534254,6 +534590,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -534432,6 +534769,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -534490,6 +534828,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -534659,6 +534998,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -534721,6 +535061,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -534784,6 +535125,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -534846,6 +535188,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -551215,157 +551558,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1943675154} m_CullTransparentMesh: 0 ---- !u!1 &1943725653 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1943725654} - - component: {fileID: 1943725658} - - component: {fileID: 1943725657} - - component: {fileID: 1943725656} - - component: {fileID: 1943725655} - m_Layer: 0 - m_Name: "legend_3_\u89C6\u9891\u5E7F\u544A" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1943725654 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943725653} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1230316018} - m_Father: {fileID: 637823618} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -75} - m_SizeDelta: {x: 70, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1943725655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943725653} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1943725656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943725653} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1943725657} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1943725657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943725653} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.83137256, g: 0.50980395, b: 0.39607844, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1943725658 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1943725653} - m_CullTransparentMesh: 0 --- !u!1 &1944810819 GameObject: m_ObjectHideFlags: 0 @@ -551983,7 +552175,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 153.06958, y: -127.226234} + m_AnchoredPosition: {x: 152.62988, y: -127.226234} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1947856963 @@ -558348,145 +558540,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980669292} m_CullTransparentMesh: 0 ---- !u!1 &1980867350 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1980867351} - - component: {fileID: 1980867355} - - component: {fileID: 1980867354} - - component: {fileID: 1980867353} - - component: {fileID: 1980867352} - m_Layer: 5 - m_Name: "btn_\u9996\u9875" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1980867351 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980867350} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1313938259} - m_Father: {fileID: 1984073382} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1980867352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980867350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 2 - callback: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!114 &1980867353 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980867350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_HighlightedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1980867354} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1980867354 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980867350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1980867355 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980867350} - m_CullTransparentMesh: 0 --- !u!1 &1981199214 GameObject: m_ObjectHideFlags: 0 @@ -559102,14 +559155,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1980867351} - - {fileID: 1463724686} - - {fileID: 432456061} - - {fileID: 1593647530} - - {fileID: 219226356} - - {fileID: 1171847488} - - {fileID: 1164033923} - - {fileID: 1662089696} + - {fileID: 343607737} + - {fileID: 1604159955} + - {fileID: 1584699280} + - {fileID: 1206228871} + - {fileID: 1574824903} + - {fileID: 1007470818} + - {fileID: 1175709254} + - {fileID: 2016670565} m_Father: {fileID: 834546373} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -560966,6 +561019,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1993299119} m_CullTransparentMesh: 0 +--- !u!1 &1993399364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1993399365} + - component: {fileID: 1993399367} + - component: {fileID: 1993399366} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1993399365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993399364} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2016670565} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1993399366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993399364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5176\u4ED6" +--- !u!222 &1993399367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993399364} + m_CullTransparentMesh: 0 --- !u!1 &1993541217 GameObject: m_ObjectHideFlags: 0 @@ -566496,6 +566628,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2016497883} m_CullTransparentMesh: 0 +--- !u!1 &2016670564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2016670565} + - component: {fileID: 2016670569} + - component: {fileID: 2016670568} + - component: {fileID: 2016670567} + - component: {fileID: 2016670566} + m_Layer: 5 + m_Name: "btn_\u5176\u4ED6" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2016670565 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016670564} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1993399365} + m_Father: {fileID: 1984073382} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2016670566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016670564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + delegates: [] +--- !u!114 &2016670567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016670564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.16078432, g: 0.23529412, b: 0.33333334, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.08235294, b: 0.12156863, a: 1} + m_PressedColor: {r: 0.89411765, g: 0.23529412, b: 0.34901962, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2016670568} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &2016670568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016670564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &2016670569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016670564} + m_CullTransparentMesh: 0 --- !u!1 &2016887632 GameObject: m_ObjectHideFlags: 0 @@ -575707,7 +575978,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 24.10772} + m_SizeDelta: {x: 4, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2052814261 MonoBehaviour: @@ -576949,6 +577220,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -577043,6 +577315,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -577101,6 +577374,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -577223,6 +577497,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -577281,6 +577556,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -577425,6 +577701,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -577483,6 +577760,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -578270,6 +578548,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -578366,6 +578645,7 @@ MonoBehaviour: m_Border: 0 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -578424,6 +578704,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -578577,6 +578858,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -578635,6 +578917,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -585411,6 +585694,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -585508,6 +585792,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -585566,6 +585851,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -590891,7 +591177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 184.49255, y: -74.00832} + m_AnchoredPosition: {x: 184.05286, y: -74.00832} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2110811844 @@ -595921,6 +596207,7 @@ MonoBehaviour: m_MinHeight: 0 m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_Series: m_JsonData: m_DataFromJson: 0 @@ -596015,6 +596302,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -596073,6 +596361,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -596266,6 +596555,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 1 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_Animation: m_JsonData: m_DataFromJson: 0 @@ -596324,6 +596614,7 @@ MonoBehaviour: m_Border: 1 m_BorderWidth: 0.5 m_BorderColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_ForceENotation: 0 m_ItemStyle: m_JsonData: m_DataFromJson: 0 @@ -596509,6 +596800,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -596576,6 +596868,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -596639,6 +596932,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -596701,6 +596995,7 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_FontSize: 18 m_FontStyle: 0 + m_ForceENotation: 0 m_SplitArea: m_JsonData: m_DataFromJson: 0 @@ -598758,7 +599053,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75.23878, y: 24.10772} + m_SizeDelta: {x: 74.359406, y: 24.295984} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2142529046 MonoBehaviour: @@ -598913,6 +599208,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2142938022} m_CullTransparentMesh: 0 +--- !u!1 &2143036898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2143036899} + - component: {fileID: 2143036901} + - component: {fileID: 2143036900} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2143036899 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143036898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 343607737} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2143036900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143036898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9996\u9875" +--- !u!222 &2143036901 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2143036898} + m_CullTransparentMesh: 0 --- !u!1 &2143188636 GameObject: m_ObjectHideFlags: 0 diff --git a/Documentation/XChartsAPI.md b/Documentation/XChartsAPI.md index 2ecac2ed..6e4627d8 100644 --- a/Documentation/XChartsAPI.md +++ b/Documentation/XChartsAPI.md @@ -8,6 +8,7 @@ --- +* `BaseChart.themeInfo`：主题组件`ThemeInfo`。 * `BaseChart.title`：标题组件`Title`。 * `BaseChart.legend`：图例组件`Legend`。 * `BaseChart.tooltip`：提示框组件`Tooltip`。 diff --git a/Runtime/Utility/XChartsMgr.cs b/Runtime/Utility/XChartsMgr.cs index 2e66deb8..2d0eb7f9 100644 --- a/Runtime/Utility/XChartsMgr.cs +++ b/Runtime/Utility/XChartsMgr.cs @@ -24,8 +24,8 @@ namespace XCharts public class XChartsMgr : MonoBehaviour { - public const string version = "1.0.1"; - public const int date = 20191026; + public const string version = "1.0.2"; + public const int date = 20191031; [SerializeField] private string m_NowVersion; [SerializeField] private string m_NewVersion; From 7e84b9ff29b344adbf8d8257ee69c3e580c4e5f6 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Fri, 1 Nov 2019 04:14:16 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E5=8F=91=E5=B8=831.0.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b9f2faa..1323fab1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.monitor1394.xcharts", "displayName": "XCharts", - "version": "1.0.1", + "version": "1.0.2", "unity": "2018.3", "description": "A charting and data visualization library for Unity.", "keywords": [ From 4792c785ac3a47383f175226e55f532b24421d55 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Fri, 1 Nov 2019 04:23:10 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E5=8F=91=E5=B8=831.0.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.json b/version.json index 19da9284..b02aa1ef 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { - "version": "1.0.1", - "date": "20191026", - "checkdate": "20191026", + "version": "1.0.2", + "date": "20191031", + "checkdate": "20191031", "desc": "欢迎 Github 上点 Star 支持，非常感谢！", "homepage": "https://github.com/monitor1394/unity-ugui-XCharts" } \ No newline at end of file From 7de3274ce3b00ae643e99548ec7af9567089c8ee Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Sat, 2 Nov 2019 08:24:37 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=9D=9E=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E5=91=BD=E5=90=8D=E5=92=8C=E8=AE=BF=E9=97=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Component/ChartComponent.cs | 4 +- Runtime/Component/Main/Axis.cs | 48 ++--- Runtime/Component/Main/DataZoom.cs | 44 +++-- Runtime/Component/Main/Radar.cs | 23 +-- Runtime/Component/Main/Serie.cs | 36 ++-- Runtime/Component/Main/Series.cs | 30 +-- Runtime/Component/Main/Tooltip.cs | 51 +++--- Runtime/Component/Main/VisualMap.cs | 48 ++--- Runtime/Component/Sub/Location.cs | 8 +- Runtime/Component/Sub/SerieAnimation.cs | 9 +- Runtime/Component/Sub/SerieData.cs | 18 +- Runtime/HeatmapChart.cs | 12 +- Runtime/Internal/AxisPool.cs | 4 +- Runtime/Internal/BaseChart.cs | 26 +-- Runtime/Internal/CoordinateChart.cs | 172 +++++++++--------- Runtime/Internal/CoordinateChart_DrawBar.cs | 12 +- .../Internal/CoordinateChart_DrawHeatmap.cs | 52 +++--- Runtime/Internal/CoordinateChart_DrawLine.cs | 24 +-- .../Internal/CoordinateChart_DrawScatter.cs | 4 +- Runtime/Internal/JsonDataSupport.cs | 45 ----- Runtime/Internal/JsonDataSupport.cs.meta | 13 -- Runtime/Internal/ObjectPool.cs | 2 +- Runtime/PieChart.cs | 136 +++++++------- Runtime/RadarChart.cs | 52 +++--- Runtime/Utility/ChartHelper.cs | 6 +- 25 files changed, 417 insertions(+), 462 deletions(-) delete mode 100644 Runtime/Internal/JsonDataSupport.cs delete mode 100644 Runtime/Internal/JsonDataSupport.cs.meta diff --git a/Runtime/Component/ChartComponent.cs b/Runtime/Component/ChartComponent.cs index 823bd8c8..2f366b6c 100644 --- a/Runtime/Component/ChartComponent.cs +++ b/Runtime/Component/ChartComponent.cs @@ -21,7 +21,7 @@ namespace XCharts /// public string jsonData { get { return m_JsonData; } set { m_JsonData = value; ParseJsonData(value); } } - public void OnAfterDeserialize() + internal void OnAfterDeserialize() { if (m_DataFromJson) { @@ -30,7 +30,7 @@ namespace XCharts } } - public void OnBeforeSerialize() + internal void OnBeforeSerialize() { } diff --git a/Runtime/Component/Main/Axis.cs b/Runtime/Component/Main/Axis.cs index 0d9c501c..474c98d6 100644 --- a/Runtime/Component/Main/Axis.cs +++ b/Runtime/Component/Main/Axis.cs @@ -208,22 +208,22 @@ namespace XCharts /// the current minimun value. /// 当前最小值。 /// - public float minValue { get; set; } + public float runtimeMinValue { get; internal set; } /// /// the current maximum value. /// 当前最大值。 /// - public float maxValue { get; set; } + public float runtimeMaxValue { get; internal set; } /// /// the x offset of zero position. /// 坐标轴原点在X轴的偏移。 /// - public float zeroXOffset { get; set; } + public float runtimeZeroXOffset { get; internal set; } /// /// the y offset of zero position. /// 坐标轴原点在Y轴的偏移。 /// - public float zeroYOffset { get; set; } + public float runtimeZeroYOffset { get; internal set; } private int filterStart; private int filterEnd; @@ -301,7 +301,7 @@ namespace XCharts /// 类目数据索引 /// 区域缩放 /// - public string GetData(int index, DataZoom dataZoom) + internal string GetData(int index, DataZoom dataZoom) { var showData = GetDataList(dataZoom); if (index >= 0 && index < showData.Count) @@ -315,7 +315,7 @@ namespace XCharts /// /// 区域缩放 /// - public List GetDataList(DataZoom dataZoom) + internal List GetDataList(DataZoom dataZoom) { if (dataZoom != null && dataZoom.enable) { @@ -333,7 +333,7 @@ namespace XCharts /// 更新dataZoom对应的类目数据列表 /// /// - public void UpdateFilterData(DataZoom dataZoom) + internal void UpdateFilterData(DataZoom dataZoom) { if (dataZoom != null && dataZoom.enable) { @@ -366,7 +366,7 @@ namespace XCharts /// /// /// - public int GetSplitNumber(float coordinateWid, DataZoom dataZoom) + internal int GetSplitNumber(float coordinateWid, DataZoom dataZoom) { if (type == AxisType.Value) { @@ -398,7 +398,7 @@ namespace XCharts /// /// /// - public float GetSplitWidth(float coordinateWidth, DataZoom dataZoom) + internal float GetSplitWidth(float coordinateWidth, DataZoom dataZoom) { int split = GetSplitNumber(coordinateWidth, dataZoom); int segment = (m_BoundaryGap ? split : split - 1); @@ -411,7 +411,7 @@ namespace XCharts /// /// /// - public int GetDataNumber(DataZoom dataZoom) + internal int GetDataNumber(DataZoom dataZoom) { return GetDataList(dataZoom).Count; } @@ -422,7 +422,7 @@ namespace XCharts /// /// /// - public float GetDataWidth(float coordinateWidth, int dataCount, DataZoom dataZoom) + internal float GetDataWidth(float coordinateWidth, int dataCount, DataZoom dataZoom) { if (dataCount < 1) dataCount = 1; var categoryCount = GetDataNumber(dataZoom); @@ -439,7 +439,7 @@ namespace XCharts /// /// /// - public string GetLabelName(float coordinateWidth, int index, float minValue, float maxValue, + internal string GetLabelName(float coordinateWidth, int index, float minValue, float maxValue, DataZoom dataZoom, bool forcePercent) { int split = GetSplitNumber(coordinateWidth, dataZoom); @@ -483,7 +483,7 @@ namespace XCharts /// /// /// - public int GetScaleNumber(float coordinateWidth, DataZoom dataZoom) + internal int GetScaleNumber(float coordinateWidth, DataZoom dataZoom) { if (type == AxisType.Value) { @@ -508,7 +508,7 @@ namespace XCharts /// /// /// - public float GetScaleWidth(float coordinateWidth, int index, DataZoom dataZoom) + internal float GetScaleWidth(float coordinateWidth, int index, DataZoom dataZoom) { int num = GetScaleNumber(coordinateWidth, dataZoom) - 1; if (num <= 0) num = 1; @@ -528,18 +528,18 @@ namespace XCharts /// 更新刻度标签文字 /// /// - public void UpdateLabelText(float coordinateWidth, DataZoom dataZoom, bool forcePercent) + internal void UpdateLabelText(float coordinateWidth, DataZoom dataZoom, bool forcePercent) { for (int i = 0; i < axisLabelTextList.Count; i++) { if (axisLabelTextList[i] != null) { - axisLabelTextList[i].text = GetLabelName(coordinateWidth, i, minValue, maxValue, dataZoom, forcePercent); + axisLabelTextList[i].text = GetLabelName(coordinateWidth, i, runtimeMinValue, runtimeMaxValue, dataZoom, forcePercent); } } } - public void SetTooltipLabel(GameObject label) + internal void SetTooltipLabel(GameObject label) { m_TooltipLabel = label; m_TooltipLabelRect = label.GetComponent(); @@ -547,13 +547,13 @@ namespace XCharts m_TooltipLabel.SetActive(true); } - public void SetTooltipLabelColor(Color bgColor, Color textColor) + internal void SetTooltipLabelColor(Color bgColor, Color textColor) { m_TooltipLabel.GetComponent().color = bgColor; m_TooltipLabelText.color = textColor; } - public void SetTooltipLabelActive(bool flag) + internal void SetTooltipLabelActive(bool flag) { if (m_TooltipLabel && m_TooltipLabel.activeInHierarchy != flag) { @@ -561,7 +561,7 @@ namespace XCharts } } - public void UpdateTooptipLabelText(string text) + internal void UpdateTooptipLabelText(string text) { if (m_TooltipLabelText) { @@ -571,7 +571,7 @@ namespace XCharts } } - public void UpdateTooltipLabelPos(Vector2 pos) + internal void UpdateTooltipLabelPos(Vector2 pos) { if (m_TooltipLabel) { @@ -591,7 +591,7 @@ namespace XCharts /// /// /// - public void AdjustMinMaxValue(ref float minValue, ref float maxValue) + internal void AdjustMinMaxValue(ref float minValue, ref float maxValue) { if (minMaxType == Axis.AxisMinMaxType.Custom) { @@ -663,8 +663,8 @@ namespace XCharts m_AxisLabel.Equals(other.axisLabel) && splitLineType == other.splitLineType && boundaryGap == other.boundaryGap && - minValue == other.minValue && - maxValue == other.maxValue && + runtimeMinValue == other.runtimeMinValue && + runtimeMaxValue == other.runtimeMaxValue && axisName.Equals(other.axisName) && ChartHelper.IsValueEqualsList(m_Data, other.data); } diff --git a/Runtime/Component/Main/DataZoom.cs b/Runtime/Component/Main/DataZoom.cs index e5bb8dee..dfa5f33a 100644 --- a/Runtime/Component/Main/DataZoom.cs +++ b/Runtime/Component/Main/DataZoom.cs @@ -208,12 +208,12 @@ namespace XCharts /// The start label. /// 组件的开始信息文本。 /// - public Text startLabel { get; set; } + private Text m_StartLabel { get; set; } /// /// The end label. /// 组件的结束信息文本。 /// - public Text endLabel { get; set; } + private Text m_EndLabel { get; set; } public static DataZoom defaultDataZoom { @@ -297,15 +297,15 @@ namespace XCharts /// 是否显示文本 /// /// - public void SetLabelActive(bool flag) + internal void SetLabelActive(bool flag) { - if (startLabel && startLabel.gameObject.activeInHierarchy != flag) + if (m_StartLabel && m_StartLabel.gameObject.activeInHierarchy != flag) { - startLabel.gameObject.SetActive(flag); + m_StartLabel.gameObject.SetActive(flag); } - if (endLabel && endLabel.gameObject.activeInHierarchy != flag) + if (m_EndLabel && m_EndLabel.gameObject.activeInHierarchy != flag) { - endLabel.gameObject.SetActive(flag); + m_EndLabel.gameObject.SetActive(flag); } } @@ -313,18 +313,18 @@ namespace XCharts /// 设置开始文本内容 /// /// - public void SetStartLabelText(string text) + internal void SetStartLabelText(string text) { - if (startLabel) startLabel.text = text; + if (m_StartLabel) m_StartLabel.text = text; } /// /// 设置结束文本内容 /// /// - public void SetEndLabelText(string text) + internal void SetEndLabelText(string text) { - if (endLabel) endLabel.text = text; + if (m_EndLabel) m_EndLabel.text = text; } /// @@ -332,7 +332,7 @@ namespace XCharts /// /// /// - public float GetHeight(float gridBottom) + internal float GetHeight(float gridBottom) { if (height <= 0) { @@ -342,5 +342,25 @@ namespace XCharts } else return height; } + + internal void SetStartLabel(Text startLabel) + { + m_StartLabel = startLabel; + } + + internal void SetEndLabel(Text endLabel) + { + m_EndLabel = endLabel; + } + + internal void UpdateStartLabelPosition(Vector3 pos) + { + m_StartLabel.transform.localPosition = pos; + } + + internal void UpdateEndLabelPosition(Vector3 pos) + { + m_EndLabel.transform.localPosition = pos; + } } } \ No newline at end of file diff --git a/Runtime/Component/Main/Radar.cs b/Runtime/Component/Main/Radar.cs index 953f64e2..963f5831 100644 --- a/Runtime/Component/Main/Radar.cs +++ b/Runtime/Component/Main/Radar.cs @@ -162,20 +162,17 @@ namespace XCharts /// the center position of radar in container. /// 雷达图在容器中的具体中心点。 /// - /// - public Vector2 centerPos { get; set; } + public Vector2 runtimeCenterPos { get; internal set; } /// /// the true radius of radar. /// 雷达图的运行时实际半径。 /// - /// - public float actualRadius { get; set; } + public float runtimeRadius { get; internal set; } /// /// the data position list of radar. /// 雷达图的所有数据坐标点列表。 /// - /// - public Dictionary> dataPosList = new Dictionary>(); + public Dictionary> runtimeDataPosList = new Dictionary>(); public static Radar defaultRadar { @@ -344,23 +341,23 @@ namespace XCharts return 0; } - public void UpdateRadarCenter(float chartWidth, float chartHeight) + internal void UpdateRadarCenter(float chartWidth, float chartHeight) { if (center.Length < 2) return; var centerX = center[0] <= 1 ? chartWidth * center[0] : center[0]; var centerY = center[1] <= 1 ? chartHeight * center[1] : center[1]; - centerPos = new Vector2(centerX, centerY); + runtimeCenterPos = new Vector2(centerX, centerY); if (radius <= 0) { - actualRadius = 0; + runtimeRadius = 0; } else if (radius <= 1) { - actualRadius = Mathf.Min(chartWidth, chartHeight) * radius; + runtimeRadius = Mathf.Min(chartWidth, chartHeight) * radius; } else { - actualRadius = radius; + runtimeRadius = radius; } } @@ -368,8 +365,8 @@ namespace XCharts { int indicatorNum = indicatorList.Count; var angle = 2 * Mathf.PI / indicatorNum * index; - var x = centerPos.x + actualRadius * Mathf.Sin(angle); - var y = centerPos.y + actualRadius * Mathf.Cos(angle); + var x = runtimeCenterPos.x + runtimeRadius * Mathf.Sin(angle); + var y = runtimeCenterPos.y + runtimeRadius * Mathf.Cos(angle); return new Vector3(x, y); } } diff --git a/Runtime/Component/Main/Serie.cs b/Runtime/Component/Main/Serie.cs index 869f1f1e..fa9f9cd5 100644 --- a/Runtime/Component/Main/Serie.cs +++ b/Runtime/Component/Main/Serie.cs @@ -426,12 +426,12 @@ namespace XCharts /// The index of serie,start at 0. /// 系列的索引，从0开始。 /// - public int index { get; set; } + public int index { get; internal set; } /// /// Whether the serie is highlighted. /// 该系列是否高亮，一般由图例悬停触发。 /// - public bool highlighted { get; set; } + public bool highlighted { get; internal set; } /// /// the count of data list. /// 数据项个数。 @@ -444,25 +444,25 @@ namespace XCharts /// /// 饼图的中心点位置。 /// - public Vector3 pieCenterPos { get; set; } + public Vector3 runtimePieCenterPos { get; internal set; } /// /// 饼图的内径 /// - public float pieInsideRadius { get; set; } + public float runtimePieInsideRadius { get; internal set; } /// /// 饼图的外径 /// - public float pieOutsideRadius { get; set; } + public float runtimePieOutsideRadius { get; internal set; } /// /// 饼图的数据项最大值 /// - public float pieDataMax { get; set; } + public float runtimePieDataMax { get; internal set; } /// /// 饼图的数据项之和 /// - public float pieDataTotal { get; set; } + public float runtimePieDataTotal { get; internal set; } - public List GetUpSmoothList(int dataIndex, int size = 100) + internal List GetUpSmoothList(int dataIndex, int size = 100) { if (m_UpSmoothPoints.ContainsKey(dataIndex)) { @@ -476,7 +476,7 @@ namespace XCharts } } - public List GetDownSmoothList(int dataIndex, int size = 100) + internal List GetDownSmoothList(int dataIndex, int size = 100) { if (m_DownSmoothPoints.ContainsKey(dataIndex)) { @@ -490,7 +490,7 @@ namespace XCharts } } - public void ClearSmoothList(int dataIndex) + internal void ClearSmoothList(int dataIndex) { if (m_UpSmoothPoints.ContainsKey(dataIndex)) { @@ -836,7 +836,7 @@ namespace XCharts /// 根据dataZoom更新数据列表缓存 /// /// - public void UpdateFilterData(DataZoom dataZoom) + internal void UpdateFilterData(DataZoom dataZoom) { if (dataZoom != null && dataZoom.enable) { @@ -939,7 +939,7 @@ namespace XCharts } } - public Color GetAreaColor(ThemeInfo theme, int index, bool highlight) + internal Color GetAreaColor(ThemeInfo theme, int index, bool highlight) { var color = areaStyle.color != Color.clear ? areaStyle.color : (Color)theme.GetColor(index); if (highlight) @@ -951,7 +951,7 @@ namespace XCharts return color; } - public Color GetAreaToColor(ThemeInfo theme, int index, bool highlight) + internal Color GetAreaToColor(ThemeInfo theme, int index, bool highlight) { if (areaStyle.toColor != Color.clear) { @@ -970,7 +970,7 @@ namespace XCharts } } - public Color GetLineColor(ThemeInfo theme, int index, bool highlight) + internal Color GetLineColor(ThemeInfo theme, int index, bool highlight) { if (lineStyle.color != Color.clear) { @@ -988,7 +988,7 @@ namespace XCharts } } - public Color GetSymbolColor(ThemeInfo theme, int index, bool highlight) + internal Color GetSymbolColor(ThemeInfo theme, int index, bool highlight) { if (symbol.color != Color.clear) { @@ -1006,13 +1006,13 @@ namespace XCharts } } - public float GetBarWidth(float categoryWidth) + internal float GetBarWidth(float categoryWidth) { if (m_BarWidth > 1) return m_BarWidth; else return m_BarWidth * categoryWidth; } - public float GetBarGap(float categoryWidth) + internal float GetBarGap(float categoryWidth) { if (m_BarGap == -1) return 0; else if (m_BarGap <= 1) return GetBarWidth(categoryWidth) * m_BarGap; @@ -1073,7 +1073,7 @@ namespace XCharts } } - public bool IsNeedShowDataIcon() + internal bool IsNeedShowDataIcon() { foreach (var data in m_Data) { diff --git a/Runtime/Component/Main/Series.cs b/Runtime/Component/Main/Series.cs index 72c6cf26..ca3d3a65 100644 --- a/Runtime/Component/Main/Series.cs +++ b/Runtime/Component/Main/Series.cs @@ -143,7 +143,7 @@ namespace XCharts /// /// /// - public Serie GetLastStackSerie(int index) + internal Serie GetLastStackSerie(int index) { var serie = GetSerie(index); return GetLastStackSerie(serie); @@ -154,7 +154,7 @@ namespace XCharts /// /// /// - public bool IsAnyGradientSerie(string stack) + internal bool IsAnyGradientSerie(string stack) { if (string.IsNullOrEmpty(stack)) return false; foreach (var serie in m_Series) @@ -172,7 +172,7 @@ namespace XCharts /// /// /// - public Serie GetLastStackSerie(Serie serie) + internal Serie GetLastStackSerie(Serie serie) { if (serie == null || string.IsNullOrEmpty(serie.stack)) return null; for (int i = serie.index - 1; i >= 0; i--) @@ -461,7 +461,7 @@ namespace XCharts /// dataZoom由变化是更新系列的缓存数据 /// /// - public void UpdateFilterData(DataZoom dataZoom) + internal void UpdateFilterData(DataZoom dataZoom) { if (dataZoom != null && dataZoom.enable) { @@ -527,7 +527,7 @@ namespace XCharts /// /// /// - public bool IsUsedAxisIndex(int axisIndex) + internal bool IsUsedAxisIndex(int axisIndex) { foreach (var serie in list) { @@ -555,7 +555,7 @@ namespace XCharts /// /// /// - public void GetXMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, + internal void GetXMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, out float minVaule, out float maxValue) { GetMinMaxValue(dataZoom, axisIndex, isValueAxis, false, out minVaule, out maxValue); @@ -568,7 +568,7 @@ namespace XCharts /// /// /// - public void GetYMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, + internal void GetYMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, out float minVaule, out float maxValue) { GetMinMaxValue(dataZoom, axisIndex, isValueAxis, true, out minVaule, out maxValue); @@ -576,7 +576,7 @@ namespace XCharts private Dictionary> _stackSeriesForMinMax = new Dictionary>(); private Dictionary _serieTotalValueForMinMax = new Dictionary(); - public void GetMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, bool yValue, + internal void GetMinMaxValue(DataZoom dataZoom, int axisIndex, bool isValueAxis, bool yValue, out float minVaule, out float maxValue) { float min = int.MaxValue; @@ -680,7 +680,7 @@ namespace XCharts /// 是否由数据堆叠 /// /// - public bool IsStack() + internal bool IsStack() { _setForStack.Clear(); foreach (var serie in m_Series) @@ -701,7 +701,7 @@ namespace XCharts /// /// /// - public bool IsStack(string stackName, SerieType type) + internal bool IsStack(string stackName, SerieType type) { if (string.IsNullOrEmpty(stackName)) return false; int count = 0; @@ -721,7 +721,7 @@ namespace XCharts /// /// /// - public bool IsPercentStack(SerieType type) + internal bool IsPercentStack(SerieType type) { int count = 0; bool isPercentStack = false; @@ -746,7 +746,7 @@ namespace XCharts /// /// /// - public bool IsPercentStack(string stackName, SerieType type) + internal bool IsPercentStack(string stackName, SerieType type) { if (string.IsNullOrEmpty(stackName)) return false; int count = 0; @@ -770,7 +770,7 @@ namespace XCharts /// 获得堆叠系列列表 /// /// - public Dictionary> GetStackSeries() + internal Dictionary> GetStackSeries() { int count = 0; Dictionary sets = new Dictionary(); @@ -810,7 +810,7 @@ namespace XCharts /// /// /// - public void GetStackSeries(ref Dictionary> stackSeries) + internal void GetStackSeries(ref Dictionary> stackSeries) { int count = 0; sets.Clear(); @@ -860,7 +860,7 @@ namespace XCharts /// 获得所有系列名，不包含空名字。 /// /// - public List GetSerieNameList() + internal List GetSerieNameList() { serieNameList.Clear(); for (int n = 0; n < m_Series.Count; n++) diff --git a/Runtime/Component/Main/Tooltip.cs b/Runtime/Component/Main/Tooltip.cs index d866672c..0a0a7a69 100644 --- a/Runtime/Component/Main/Tooltip.cs +++ b/Runtime/Component/Main/Tooltip.cs @@ -124,42 +124,42 @@ namespace XCharts /// The data index currently indicated by Tooltip. /// 当前提示框所指示的数据项索引。 /// - public List dataIndex { get; set; } + public List runtimeDataIndex { get; internal set; } /// /// the value for x indicator label. /// 指示器X轴上要显示的值。 /// - public float[] xValues { get; set; } + public float[] runtimeXValues { get; internal set; } /// /// the value for y indicator label. /// 指示器Y轴上要显示的值。 /// - public float[] yValues { get; set; } + public float[] runtimeYValues { get; internal set; } /// /// the current pointer position. /// 当前鼠标位置。 /// - public Vector2 pointerPos { get; set; } + public Vector2 runtimePointerPos { get; internal set; } /// /// the width of tooltip. /// 提示框宽。 /// - public float width { get { return m_ContentRect.sizeDelta.x; } } + public float runtimeWidth { get { return m_ContentRect.sizeDelta.x; } } /// /// the height of tooltip. /// 提示框高。 /// - public float height { get { return m_ContentRect.sizeDelta.y; } } + public float runtimeHeight { get { return m_ContentRect.sizeDelta.y; } } /// /// Whether the tooltip has been initialized. /// 提示框是否已初始化。 /// - public bool inited { get { return m_GameObject != null; } } + public bool runtimeInited { get { return m_GameObject != null; } } /// /// the gameObject of tooltip. /// 提示框的gameObject。 /// - public GameObject gameObject { get { return m_GameObject; } } + public GameObject runtimeGameObject { get { return m_GameObject; } } public static Tooltip defaultTooltip { @@ -168,9 +168,9 @@ namespace XCharts var tooltip = new Tooltip { m_Show = true, - xValues = new float[2] { -1, -1 }, - yValues = new float[2] { -1, -1 }, - dataIndex = new List() { -1, -1 }, + runtimeXValues = new float[2] { -1, -1 }, + runtimeYValues = new float[2] { -1, -1 }, + runtimeDataIndex = new List() { -1, -1 }, lastDataIndex = new List() { -1, -1 } }; return tooltip; @@ -214,7 +214,8 @@ namespace XCharts /// public void SetContentBackgroundColor(Color color) { - m_Content.GetComponent().color = color; + if (m_Content != null && m_Content.GetComponent() != null) + m_Content.GetComponent().color = color; } /// @@ -252,11 +253,11 @@ namespace XCharts /// /// 清除提示框指示数据 /// - public void ClearValue() + internal void ClearValue() { - dataIndex[0] = dataIndex[1] = -1; - xValues[0] = xValues[1] = -1; - yValues[0] = yValues[1] = -1; + runtimeDataIndex[0] = runtimeDataIndex[1] = -1; + runtimeXValues[0] = runtimeXValues[1] = -1; + runtimeYValues[0] = runtimeYValues[1] = -1; } /// @@ -308,17 +309,17 @@ namespace XCharts /// public bool IsDataIndexChanged() { - return dataIndex[0] != lastDataIndex[0] || - dataIndex[1] != lastDataIndex[1]; + return runtimeDataIndex[0] != lastDataIndex[0] || + runtimeDataIndex[1] != lastDataIndex[1]; } /// /// 当前索引缓存 /// - public void UpdateLastDataIndex() + internal void UpdateLastDataIndex() { - lastDataIndex[0] = dataIndex[0]; - lastDataIndex[1] = dataIndex[1]; + lastDataIndex[0] = runtimeDataIndex[0]; + lastDataIndex[1] = runtimeDataIndex[1]; } /// @@ -327,7 +328,7 @@ namespace XCharts /// public bool IsSelected() { - return dataIndex[0] >= 0 || dataIndex[1] >= 0; + return runtimeDataIndex[0] >= 0 || runtimeDataIndex[1] >= 0; } /// @@ -337,10 +338,10 @@ namespace XCharts /// public bool IsSelected(int index) { - return dataIndex[0] == index || dataIndex[1] == index; + return runtimeDataIndex[0] == index || runtimeDataIndex[1] == index; } - public string GetFormatterContent(int dataIndex, Series series, string category, DataZoom dataZoom = null) + internal string GetFormatterContent(int dataIndex, Series series, string category, DataZoom dataZoom = null) { if (string.IsNullOrEmpty(m_Formatter)) { @@ -383,7 +384,7 @@ namespace XCharts } } - public string GetFormatterContent(string serieName, string dataName, float dataValue) + internal string GetFormatterContent(string serieName, string dataName, float dataValue) { if (string.IsNullOrEmpty(m_Formatter)) return ChartCached.FloatToStr(dataValue, 0, m_ForceENotation); diff --git a/Runtime/Component/Main/VisualMap.cs b/Runtime/Component/Main/VisualMap.cs index 38e7f207..eb3c7d4f 100644 --- a/Runtime/Component/Main/VisualMap.cs +++ b/Runtime/Component/Main/VisualMap.cs @@ -164,14 +164,14 @@ namespace XCharts /// 鼠标悬停选中的index /// /// - public int rtSelectedIndex { get; set; } - public float rtSelectedValue { get; set; } + public int runtimeSelectedIndex { get; internal set; } + public float runtimeSelectedValue { get; internal set; } /// /// the current pointer position. /// 当前鼠标位置。 /// - public Vector2 pointerPos { get; set; } - public bool isVertical { get { return orient == Orient.Vertical; } } + public Vector2 runtimePointerPos { get; internal set; } + public bool runtimeIsVertical { get { return orient == Orient.Vertical; } } public float rangeMin { get @@ -198,7 +198,7 @@ namespace XCharts } } - public int rtSplitNumber + public int runtimeSplitNumber { get { @@ -207,18 +207,18 @@ namespace XCharts } } - public float rangeMinHeight { get { return (rangeMin - min) / (max - min) * itemHeight; } } - public float rangeMaxHeight { get { return (rangeMax - min) / (max - min) * itemHeight; } } + public float runtimeRangeMinHeight { get { return (rangeMin - min) / (max - min) * itemHeight; } } + public float runtimeRangeMaxHeight { get { return (rangeMax - min) / (max - min) * itemHeight; } } private List m_RtInRange = new List(); - public List rtInRange + public List runtimeInRange { get { if (splitNumber == 0 || m_InRange.Count >= splitNumber || m_InRange.Count < 1) return m_InRange; else { - if (m_RtInRange.Count != rtSplitNumber) + if (m_RtInRange.Count != runtimeSplitNumber) { m_RtInRange.Clear(); var total = max - min; @@ -256,7 +256,7 @@ namespace XCharts public Color GetColor(float value) { - int splitNumber = rtInRange.Count; + int splitNumber = runtimeInRange.Count; if (splitNumber <= 0) return Color.clear; value = Mathf.Clamp(value, min, max); @@ -264,13 +264,13 @@ namespace XCharts var index = GetIndex(value); var nowMin = min + index * diff; var rate = (value - nowMin) / diff; - if (index == splitNumber - 1) return rtInRange[index]; - else return Color.Lerp(rtInRange[index], rtInRange[index + 1], rate); + if (index == splitNumber - 1) return runtimeInRange[index]; + else return Color.Lerp(runtimeInRange[index], runtimeInRange[index + 1], rate); } public int GetIndex(float value) { - int splitNumber = rtInRange.Count; + int splitNumber = runtimeInRange.Count; if (splitNumber <= 0) return -1; value = Mathf.Clamp(value, min, max); @@ -289,19 +289,19 @@ namespace XCharts public bool IsInSelectedValue(float value) { - if (rtSelectedIndex < 0) return true; + if (runtimeSelectedIndex < 0) return true; else { - return rtSelectedIndex == GetIndex(value); + return runtimeSelectedIndex == GetIndex(value); } } public float GetValue(Vector3 pos, float chartWidth, float chartHeight) { var centerPos = location.GetPosition(chartWidth, chartHeight); - var pos1 = centerPos + (isVertical ? Vector3.down : Vector3.left) * itemHeight / 2; - var pos2 = centerPos + (isVertical ? Vector3.up : Vector3.right) * itemHeight / 2; - if (isVertical) + var pos1 = centerPos + (runtimeIsVertical ? Vector3.down : Vector3.left) * itemHeight / 2; + var pos2 = centerPos + (runtimeIsVertical ? Vector3.up : Vector3.right) * itemHeight / 2; + if (runtimeIsVertical) { if (pos.y < pos1.y) return min; else if (pos.y > pos2.y) return max; @@ -337,12 +337,12 @@ namespace XCharts { var pos1 = centerPos + Vector3.down * itemHeight / 2; return local.x >= centerPos.x - itemWidth / 2 && local.x <= centerPos.x + itemWidth / 2 && - local.y >= pos1.y + rangeMinHeight && local.y <= pos1.y + rangeMaxHeight; + local.y >= pos1.y + runtimeRangeMinHeight && local.y <= pos1.y + runtimeRangeMaxHeight; } else { var pos1 = centerPos + Vector3.left * itemHeight / 2; - return local.x >= pos1.x + rangeMinHeight && local.x <= pos1.x + rangeMaxHeight && + return local.x >= pos1.x + runtimeRangeMinHeight && local.x <= pos1.x + runtimeRangeMaxHeight && local.y >= centerPos.y - itemWidth / 2 && local.y <= centerPos.y + itemWidth / 2; } } @@ -354,7 +354,7 @@ namespace XCharts { var radius = triangleLen / 2; var pos1 = centerPos + Vector3.down * itemHeight / 2; - var cpos = new Vector3(pos1.x + itemWidth / 2 + radius, pos1.y + rangeMinHeight - radius); + var cpos = new Vector3(pos1.x + itemWidth / 2 + radius, pos1.y + runtimeRangeMinHeight - radius); return local.x >= cpos.x - radius && local.x <= cpos.x + radius && local.y >= cpos.y - radius && local.y <= cpos.y + radius; @@ -363,7 +363,7 @@ namespace XCharts { var radius = triangleLen / 2; var pos1 = centerPos + Vector3.left * itemHeight / 2; - var cpos = new Vector3(pos1.x + rangeMinHeight, pos1.y + itemWidth / 2 + radius); + var cpos = new Vector3(pos1.x + runtimeRangeMinHeight, pos1.y + itemWidth / 2 + radius); return local.x >= cpos.x - radius && local.x <= cpos.x + radius && local.y >= cpos.y - radius && local.y <= cpos.y + radius; } @@ -376,7 +376,7 @@ namespace XCharts { var radius = triangleLen / 2; var pos1 = centerPos + Vector3.down * itemHeight / 2; - var cpos = new Vector3(pos1.x + itemWidth / 2 + radius, pos1.y + rangeMaxHeight + radius); + var cpos = new Vector3(pos1.x + itemWidth / 2 + radius, pos1.y + runtimeRangeMaxHeight + radius); return local.x >= cpos.x - radius && local.x <= cpos.x + radius && local.y >= cpos.y - radius && local.y <= cpos.y + radius; @@ -385,7 +385,7 @@ namespace XCharts { var radius = triangleLen / 2; var pos1 = centerPos + Vector3.left * itemHeight / 2; - var cpos = new Vector3(pos1.x + rangeMaxHeight + radius, pos1.y + itemWidth / 2 + radius); + var cpos = new Vector3(pos1.x + runtimeRangeMaxHeight + radius, pos1.y + itemWidth / 2 + radius); return local.x >= cpos.x - radius && local.x <= cpos.x + radius && local.y >= cpos.y - radius && local.y <= cpos.y + radius; } diff --git a/Runtime/Component/Sub/Location.cs b/Runtime/Component/Sub/Location.cs index 83621c73..19c61aff 100644 --- a/Runtime/Component/Sub/Location.cs +++ b/Runtime/Component/Sub/Location.cs @@ -74,25 +74,25 @@ namespace XCharts /// Location对应的Anchor锚点 /// /// - public TextAnchor textAnchor { get { return m_TextAnchor; } } + public TextAnchor runtimeTextAnchor { get { return m_TextAnchor; } } /// /// the minimum achor. /// Location对应的anchorMin。 /// /// - public Vector2 anchorMin { get { return m_AnchorMin; } } + public Vector2 runtimeAnchorMin { get { return m_AnchorMin; } } /// /// the maximun achor. /// Location对应的anchorMax. /// /// - public Vector2 anchorMax { get { return m_AnchorMax; } } + public Vector2 runtimeAnchorMax { get { return m_AnchorMax; } } /// /// the povot. /// Loation对应的中心点。 /// /// - public Vector2 pivot { get { return m_Pivot; } } + public Vector2 runtimePivot { get { return m_Pivot; } } public static Location defaultLeft { diff --git a/Runtime/Component/Sub/SerieAnimation.cs b/Runtime/Component/Sub/SerieAnimation.cs index 12110e0a..9f8f7073 100644 --- a/Runtime/Component/Sub/SerieAnimation.cs +++ b/Runtime/Component/Sub/SerieAnimation.cs @@ -37,31 +37,26 @@ namespace XCharts /// Easing method used for the first animation. /// 动画的缓动效果。 /// - /// public Easing easing { get { return m_Easting; } set { m_Easting = value; } } /// /// The milliseconds duration of the first animation. /// 设定的动画时长（毫秒）。 /// - /// public int duration { get { return m_Duration; } set { m_Duration = value; } } /// /// The milliseconds actual duration of the first animation. /// 实际的动画时长（毫秒）。 /// - /// public int actualDuration { get { return m_ActualDuration; } } /// /// Whether to set graphic number threshold to animation. Animation will be disabled when graphic number is larger than threshold. /// 是否开启动画的阈值，当单个系列显示的图形数量大于这个阈值时会关闭动画。 /// - /// public int threshold { get { return m_Threshold; } set { m_Threshold = value; } } /// /// The milliseconds delay before updating the first animation. /// 动画延时（毫秒）。 /// - /// public int delay { get { return m_Delay; } set { m_Delay = value; if (m_Delay < 0) m_Delay = 0; } } private Dictionary m_DataAnimationState = new Dictionary(); @@ -179,7 +174,7 @@ namespace XCharts return dataIndex <= m_CurrDataProgress; } - public void CheckProgress(float delta) + internal void CheckProgress(float delta) { if (!enable) return; if (IsInDelay()) return; @@ -195,7 +190,7 @@ namespace XCharts } } - public void CheckSymbol(float delta, float dest) + internal void CheckSymbol(float delta, float dest) { m_CurrSymbolProgress += delta; if (m_CurrSymbolProgress > dest) m_CurrSymbolProgress = dest; diff --git a/Runtime/Component/Sub/SerieData.cs b/Runtime/Component/Sub/SerieData.cs index 2541e98a..a1299375 100644 --- a/Runtime/Component/Sub/SerieData.cs +++ b/Runtime/Component/Sub/SerieData.cs @@ -133,34 +133,34 @@ namespace XCharts /// /// 饼图数据项的开始角度（运行时自动计算） /// - public float pieStartAngle { get; set; } + public float runtimePieStartAngle { get; internal set; } /// /// 饼图数据项的结束角度（运行时自动计算） /// - public float pieToAngle { get; set; } + public float runtimePieToAngle { get; internal set; } /// /// 饼图数据项的一半时的角度（运行时自动计算） /// - public float pieHalfAngle { get; set; } + public float runtimePieHalfAngle { get; internal set; } /// /// 饼图数据项的当前角度（运行时自动计算） /// - public float pieCurrAngle { get; set; } + public float runtimePieCurrAngle { get; internal set; } /// /// 饼图数据项的内半径 /// - public float pieInsideRadius { get; set; } + public float runtimePieInsideRadius { get; internal set; } /// /// 饼图数据项的外半径 /// - public float pieOutsideRadius + public float runtimePieOutsideRadius { get { if (radius > 0) return radius; else return m_RtPieOutsideRadius; } - set + internal set { m_RtPieOutsideRadius = value; } @@ -168,8 +168,8 @@ namespace XCharts /// /// 饼图数据项的偏移半径 /// - public float pieOffsetRadius { get; set; } - public Vector3 pieOffsetCenter { get; set; } + public float runtimePieOffsetRadius { get; internal set; } + public Vector3 runtiemPieOffsetCenter { get; internal set; } public float GetData(int index) { diff --git a/Runtime/HeatmapChart.cs b/Runtime/HeatmapChart.cs index 280de6a1..a38c40ae 100644 --- a/Runtime/HeatmapChart.cs +++ b/Runtime/HeatmapChart.cs @@ -87,8 +87,8 @@ namespace XCharts protected override void RefreshTooltip() { - var xData = m_Tooltip.xValues[0]; - var yData = m_Tooltip.yValues[0]; + var xData = m_Tooltip.runtimeXValues[0]; + var yData = m_Tooltip.runtimeYValues[0]; if (IsCategory() && (xData < 0 || yData < 0)) return; sb.Length = 0; for (int i = 0; i < m_Series.Count; i++) @@ -117,13 +117,13 @@ namespace XCharts } m_Tooltip.UpdateContentText(sb.ToString().Trim()); var pos = m_Tooltip.GetContentPos(); - if (pos.x + m_Tooltip.width > chartWidth) + if (pos.x + m_Tooltip.runtimeWidth > chartWidth) { - pos.x = chartWidth - m_Tooltip.width; + pos.x = chartWidth - m_Tooltip.runtimeWidth; } - if (pos.y - m_Tooltip.height < 0) + if (pos.y - m_Tooltip.runtimeHeight < 0) { - pos.y = m_Tooltip.height; + pos.y = m_Tooltip.runtimeHeight; } m_Tooltip.UpdateContentPos(pos); m_Tooltip.SetActive(true); diff --git a/Runtime/Internal/AxisPool.cs b/Runtime/Internal/AxisPool.cs index 5d3afd51..e02b4d9e 100644 --- a/Runtime/Internal/AxisPool.cs +++ b/Runtime/Internal/AxisPool.cs @@ -7,7 +7,7 @@ namespace XCharts { - public static class XAxisPool + internal static class XAxisPool { private static readonly ObjectPool s_ListPool = new ObjectPool(null, null); @@ -22,7 +22,7 @@ namespace XCharts } } - public static class YAxisPool + internal static class YAxisPool { private static readonly ObjectPool s_ListPool = new ObjectPool(null, null); diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 08066464..87283468 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -148,10 +148,10 @@ namespace XCharts private void InitTitle() { m_Title.OnChanged(); - TextAnchor anchor = m_Title.location.textAnchor; - Vector2 anchorMin = m_Title.location.anchorMin; - Vector2 anchorMax = m_Title.location.anchorMax; - Vector2 pivot = m_Title.location.pivot; + TextAnchor anchor = m_Title.location.runtimeTextAnchor; + Vector2 anchorMin = m_Title.location.runtimeAnchorMin; + Vector2 anchorMax = m_Title.location.runtimeAnchorMax; + Vector2 pivot = m_Title.location.runtimePivot; Vector3 titlePosition = m_Title.location.GetPosition(chartWidth, chartHeight); Vector3 subTitlePosition = -new Vector3(0, m_Title.textFontSize + m_Title.itemGap, 0); float titleWid = chartWidth; @@ -183,10 +183,10 @@ namespace XCharts private void InitLegend() { m_Legend.OnChanged(); - TextAnchor anchor = m_Legend.location.textAnchor; - Vector2 anchorMin = m_Legend.location.anchorMin; - Vector2 anchorMax = m_Legend.location.anchorMax; - Vector2 pivot = m_Legend.location.pivot; + TextAnchor anchor = m_Legend.location.runtimeTextAnchor; + Vector2 anchorMin = m_Legend.location.runtimeAnchorMin; + Vector2 anchorMax = m_Legend.location.runtimeAnchorMax; + Vector2 pivot = m_Legend.location.runtimePivot; var legendObject = ChartHelper.AddObject(s_LegendObjectName, transform, anchorMin, anchorMax, pivot, new Vector2(chartWidth, chartHeight)); @@ -409,7 +409,7 @@ namespace XCharts private void CheckPointerPos() { - var needCheck = (m_Tooltip.show && m_Tooltip.inited) + var needCheck = (m_Tooltip.show && m_Tooltip.runtimeInited) || raycastTarget; if (needCheck) { @@ -429,7 +429,7 @@ namespace XCharts private void CheckTooltip() { - if (!m_Tooltip.show || !m_Tooltip.inited) + if (!m_Tooltip.show || !m_Tooltip.runtimeInited) { if (m_Tooltip.IsActive()) { @@ -439,9 +439,9 @@ namespace XCharts } return; } - for (int i = 0; i < m_Tooltip.dataIndex.Count; i++) + for (int i = 0; i < m_Tooltip.runtimeDataIndex.Count; i++) { - m_Tooltip.dataIndex[i] = -1; + m_Tooltip.runtimeDataIndex[i] = -1; } Vector2 local = pointerPos; if (canvas == null) return; @@ -465,7 +465,7 @@ namespace XCharts } return; } - m_Tooltip.pointerPos = local; + m_Tooltip.runtimePointerPos = local; CheckTootipArea(local); } diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs index fc25a548..5c35b927 100644 --- a/Runtime/Internal/CoordinateChart.cs +++ b/Runtime/Internal/CoordinateChart.cs @@ -154,14 +154,14 @@ namespace XCharts if (!xAxis.show && !yAxis.show) continue; if (isCartesian && xAxis.show && yAxis.show) { - var yRate = (yAxis.maxValue - yAxis.minValue) / coordinateHeight; - var xRate = (xAxis.maxValue - xAxis.minValue) / coordinateWidth; - var yValue = yRate * (local.y - coordinateY - yAxis.zeroYOffset); - if (yAxis.minValue > 0) yValue += yAxis.minValue; - m_Tooltip.yValues[i] = yValue; - var xValue = xRate * (local.x - coordinateX - xAxis.zeroXOffset); - if (xAxis.minValue > 0) xValue += xAxis.minValue; - m_Tooltip.xValues[i] = xValue; + var yRate = (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) / coordinateHeight; + var xRate = (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) / coordinateWidth; + var yValue = yRate * (local.y - coordinateY - yAxis.runtimeZeroYOffset); + if (yAxis.runtimeMinValue > 0) yValue += yAxis.runtimeMinValue; + m_Tooltip.runtimeYValues[i] = yValue; + var xValue = xRate * (local.x - coordinateX - xAxis.runtimeZeroXOffset); + if (xAxis.runtimeMinValue > 0) xValue += xAxis.runtimeMinValue; + m_Tooltip.runtimeXValues[i] = xValue; for (int j = 0; j < m_Series.Count; j++) { @@ -175,7 +175,7 @@ namespace XCharts if (Mathf.Abs(xValue - xdata) / xRate < symbolSize && Mathf.Abs(yValue - ydata) / yRate < symbolSize) { - m_Tooltip.dataIndex[i] = n; + m_Tooltip.runtimeDataIndex[i] = n; serieData.highlighted = true; } else @@ -195,8 +195,8 @@ namespace XCharts if ((xAxis.boundaryGap && (local.x > pX && local.x <= pX + splitWid)) || (!xAxis.boundaryGap && (local.x > pX - splitWid / 2 && local.x <= pX + splitWid / 2))) { - m_Tooltip.xValues[i] = j; - m_Tooltip.dataIndex[i] = j; + m_Tooltip.runtimeXValues[i] = j; + m_Tooltip.runtimeDataIndex[i] = j; break; } } @@ -207,16 +207,16 @@ namespace XCharts if ((yAxis.boundaryGap && (local.y > pY && local.y <= pY + splitWid)) || (!yAxis.boundaryGap && (local.y > pY - splitWid / 2 && local.y <= pY + splitWid / 2))) { - m_Tooltip.yValues[i] = j; + m_Tooltip.runtimeYValues[i] = j; break; } } } else if (xAxis.IsCategory()) { - var value = (yAxis.maxValue - yAxis.minValue) * (local.y - coordinateY - yAxis.zeroYOffset) / coordinateHeight; - if (yAxis.minValue > 0) value += yAxis.minValue; - m_Tooltip.yValues[i] = value; + var value = (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) * (local.y - coordinateY - yAxis.runtimeZeroYOffset) / coordinateHeight; + if (yAxis.runtimeMinValue > 0) value += yAxis.runtimeMinValue; + m_Tooltip.runtimeYValues[i] = value; for (int j = 0; j < xAxis.GetDataNumber(m_DataZoom); j++) { float splitWid = xAxis.GetDataWidth(coordinateWidth, dataCount, m_DataZoom); @@ -224,17 +224,17 @@ namespace XCharts if ((xAxis.boundaryGap && (local.x > pX && local.x <= pX + splitWid)) || (!xAxis.boundaryGap && (local.x > pX - splitWid / 2 && local.x <= pX + splitWid / 2))) { - m_Tooltip.xValues[i] = j; - m_Tooltip.dataIndex[i] = j; + m_Tooltip.runtimeXValues[i] = j; + m_Tooltip.runtimeDataIndex[i] = j; break; } } } else if (yAxis.IsCategory()) { - var value = (xAxis.maxValue - xAxis.minValue) * (local.x - coordinateX - xAxis.zeroXOffset) / coordinateWidth; - if (xAxis.minValue > 0) value += xAxis.minValue; - m_Tooltip.xValues[i] = value; + var value = (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * (local.x - coordinateX - xAxis.runtimeZeroXOffset) / coordinateWidth; + if (xAxis.runtimeMinValue > 0) value += xAxis.runtimeMinValue; + m_Tooltip.runtimeXValues[i] = value; for (int j = 0; j < yAxis.GetDataNumber(m_DataZoom); j++) { float splitWid = yAxis.GetDataWidth(coordinateHeight, dataCount, m_DataZoom); @@ -242,8 +242,8 @@ namespace XCharts if ((yAxis.boundaryGap && (local.y > pY && local.y <= pY + splitWid)) || (!yAxis.boundaryGap && (local.y > pY - splitWid / 2 && local.y <= pY + splitWid / 2))) { - m_Tooltip.yValues[i] = j; - m_Tooltip.dataIndex[i] = j; + m_Tooltip.runtimeYValues[i] = j; + m_Tooltip.runtimeDataIndex[i] = j; break; } } @@ -276,17 +276,17 @@ namespace XCharts bool isCartesian = IsValue(); if (isCartesian) { - index = m_Tooltip.dataIndex[0]; + index = m_Tooltip.runtimeDataIndex[0]; tempAxis = m_XAxises[0]; } else if (m_XAxises[0].type == Axis.AxisType.Value) { - index = (int)m_Tooltip.yValues[0]; + index = (int)m_Tooltip.runtimeYValues[0]; tempAxis = m_YAxises[0]; } else { - index = (int)m_Tooltip.xValues[0]; + index = (int)m_Tooltip.runtimeXValues[0]; tempAxis = m_XAxises[0]; } if (index < 0) @@ -341,13 +341,13 @@ namespace XCharts m_Tooltip.UpdateContentText(m_Tooltip.GetFormatterContent(index, m_Series, category, m_DataZoom)); } var pos = m_Tooltip.GetContentPos(); - if (pos.x + m_Tooltip.width > chartWidth) + if (pos.x + m_Tooltip.runtimeWidth > chartWidth) { - pos.x = chartWidth - m_Tooltip.width; + pos.x = chartWidth - m_Tooltip.runtimeWidth; } - if (pos.y - m_Tooltip.height < 0) + if (pos.y - m_Tooltip.runtimeHeight < 0) { - pos.y = m_Tooltip.height; + pos.y = m_Tooltip.runtimeHeight; } m_Tooltip.UpdateContentPos(pos); m_Tooltip.SetActive(true); @@ -375,14 +375,14 @@ namespace XCharts var diff = axisIndex > 0 ? -axis.axisLabel.fontSize - axis.axisLabel.margin - 3.5f : axis.axisLabel.margin / 2 + 1; if (axis.IsValue()) { - labelText = ChartCached.FloatToStr(m_Tooltip.xValues[axisIndex], 2); - labelPos = new Vector2(m_Tooltip.pointerPos.x, posY - diff); + labelText = ChartCached.FloatToStr(m_Tooltip.runtimeXValues[axisIndex], 2); + labelPos = new Vector2(m_Tooltip.runtimePointerPos.x, posY - diff); } else { - labelText = axis.GetData((int)m_Tooltip.xValues[axisIndex], m_DataZoom); + labelText = axis.GetData((int)m_Tooltip.runtimeXValues[axisIndex], m_DataZoom); float splitWidth = axis.GetSplitWidth(coordinateWidth, m_DataZoom); - int index = (int)m_Tooltip.xValues[axisIndex]; + int index = (int)m_Tooltip.runtimeXValues[axisIndex]; float px = coordinateX + index * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0) + 0.5f; labelPos = new Vector2(px, posY - diff); } @@ -393,14 +393,14 @@ namespace XCharts var diff = axisIndex > 0 ? -axis.axisLabel.margin + 3 : axis.axisLabel.margin - 3; if (axis.IsValue()) { - labelText = ChartCached.FloatToStr(m_Tooltip.yValues[axisIndex], 2); - labelPos = new Vector2(posX - diff, m_Tooltip.pointerPos.y); + labelText = ChartCached.FloatToStr(m_Tooltip.runtimeYValues[axisIndex], 2); + labelPos = new Vector2(posX - diff, m_Tooltip.runtimePointerPos.y); } else { - labelText = axis.GetData((int)m_Tooltip.yValues[axisIndex], m_DataZoom); + labelText = axis.GetData((int)m_Tooltip.runtimeYValues[axisIndex], m_DataZoom); float splitWidth = axis.GetSplitWidth(coordinateHeight, m_DataZoom); - int index = (int)m_Tooltip.yValues[axisIndex]; + int index = (int)m_Tooltip.runtimeYValues[axisIndex]; float py = coordinateY + index * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0); labelPos = new Vector2(posX - diff, py); } @@ -439,8 +439,8 @@ namespace XCharts m_YAxises.Add(axis1); m_YAxises.Add(axis2); } - foreach (var axis in m_XAxises) axis.minValue = axis.maxValue = 0; - foreach (var axis in m_YAxises) axis.minValue = axis.maxValue = 0; + foreach (var axis in m_XAxises) axis.runtimeMinValue = axis.runtimeMaxValue = 0; + foreach (var axis in m_YAxises) axis.runtimeMinValue = axis.runtimeMaxValue = 0; } private void InitAxisY() @@ -462,7 +462,7 @@ namespace XCharts axisObj.transform.localPosition = Vector3.zero; axisObj.SetActive(yAxis.show && yAxis.axisLabel.show); ChartHelper.HideAllObject(axisObj); - if (yAxis.IsValue() && yAxis.minValue == 0 && yAxis.maxValue == 0) return; + if (yAxis.IsValue() && yAxis.runtimeMinValue == 0 && yAxis.runtimeMaxValue == 0) return; var labelColor = yAxis.axisLabel.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : yAxis.axisLabel.color; @@ -491,7 +491,7 @@ namespace XCharts txt.transform.localPosition = GetLabelYPosition(totalWidth + (yAxis.boundaryGap ? labelWidth / 2 : 0), i, yAxisIndex, yAxis); var isPercentStack = m_Series.IsPercentStack(SerieType.Bar); - txt.text = yAxis.GetLabelName(coordinateHeight, i, yAxis.minValue, yAxis.maxValue, m_DataZoom, isPercentStack); + txt.text = yAxis.GetLabelName(coordinateHeight, i, yAxis.runtimeMinValue, yAxis.runtimeMaxValue, m_DataZoom, isPercentStack); txt.gameObject.SetActive(yAxis.show && (yAxis.axisLabel.interval == 0 || i % (yAxis.axisLabel.interval + 1) == 0)); yAxis.axisLabelTextList.Add(txt); @@ -504,7 +504,7 @@ namespace XCharts var fontSize = yAxis.axisName.fontSize; var offset = yAxis.axisName.offset; Text axisName = null; - var zeroPos = new Vector3(coordinateX + m_XAxises[yAxisIndex].zeroXOffset, coordinateY); + var zeroPos = new Vector3(coordinateX + m_XAxises[yAxisIndex].runtimeZeroXOffset, coordinateY); switch (yAxis.axisName.location) { case AxisName.Location.Start: @@ -538,10 +538,10 @@ namespace XCharts axisName.text = yAxis.axisName.name; } //init tooltip label - if (m_Tooltip.gameObject) + if (m_Tooltip.runtimeGameObject) { Vector2 privot = yAxisIndex > 0 ? new Vector2(0, 0.5f) : new Vector2(1, 0.5f); - var labelParent = m_Tooltip.gameObject.transform; + var labelParent = m_Tooltip.runtimeGameObject.transform; GameObject labelObj = ChartHelper.AddTooltipLabel(objName + "_label", labelParent, m_ThemeInfo.font, privot); yAxis.SetTooltipLabel(labelObj); yAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); @@ -567,7 +567,7 @@ namespace XCharts axisObj.transform.localPosition = Vector3.zero; axisObj.SetActive(xAxis.show && xAxis.axisLabel.show); ChartHelper.HideAllObject(axisObj); - if (xAxis.IsValue() && xAxis.minValue == 0 && xAxis.maxValue == 0) return; + if (xAxis.IsValue() && xAxis.runtimeMinValue == 0 && xAxis.runtimeMaxValue == 0) return; var labelColor = xAxis.axisLabel.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : xAxis.axisLabel.color; @@ -586,7 +586,7 @@ namespace XCharts i, xAxisIndex, xAxis); totalWidth += labelWidth; var isPercentStack = m_Series.IsPercentStack(SerieType.Bar); - txt.text = xAxis.GetLabelName(coordinateWidth, i, xAxis.minValue, xAxis.maxValue, m_DataZoom, isPercentStack); + txt.text = xAxis.GetLabelName(coordinateWidth, i, xAxis.runtimeMinValue, xAxis.runtimeMaxValue, m_DataZoom, isPercentStack); txt.gameObject.SetActive(xAxis.show && (xAxis.axisLabel.interval == 0 || i % (xAxis.axisLabel.interval + 1) == 0)); xAxis.axisLabelTextList.Add(txt); @@ -598,7 +598,7 @@ namespace XCharts var fontSize = xAxis.axisName.fontSize; var offset = xAxis.axisName.offset; Text axisName = null; - var zeroPos = new Vector3(coordinateX, coordinateY + m_YAxises[xAxisIndex].zeroYOffset); + var zeroPos = new Vector3(coordinateX, coordinateY + m_YAxises[xAxisIndex].runtimeZeroYOffset); switch (xAxis.axisName.location) { case AxisName.Location.Start: @@ -631,10 +631,10 @@ namespace XCharts } axisName.text = xAxis.axisName.name; } - if (m_Tooltip.gameObject) + if (m_Tooltip.runtimeGameObject) { Vector2 privot = xAxisIndex > 0 ? new Vector2(0.5f, 1) : new Vector2(0.5f, 1); - var labelParent = m_Tooltip.gameObject.transform; + var labelParent = m_Tooltip.runtimeGameObject.transform; GameObject labelObj = ChartHelper.AddTooltipLabel(ChartHelper.Cancat(objName, "_label"), labelParent, m_ThemeInfo.font, privot); xAxis.SetTooltipLabel(labelObj); xAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); @@ -648,12 +648,14 @@ namespace XCharts chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); dataZoomObject.transform.localPosition = Vector3.zero; ChartHelper.HideAllObject(dataZoomObject); - m_DataZoom.startLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "start", + var startLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "start", dataZoomObject.transform, m_ThemeInfo.font, m_ThemeInfo.dataZoomTextColor, TextAnchor.MiddleRight, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f), new Vector2(200, 20), m_DataZoom.fontSize, 0, m_DataZoom.fontStyle); - m_DataZoom.endLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "end", + var endLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "end", dataZoomObject.transform, m_ThemeInfo.font, m_ThemeInfo.dataZoomTextColor, TextAnchor.MiddleLeft, Vector2.zero, Vector2.zero, new Vector2(0, 0.5f), new Vector2(200, 20), m_DataZoom.fontSize, 0, m_DataZoom.fontStyle); + m_DataZoom.SetStartLabel(startLabel); + m_DataZoom.SetEndLabel(endLabel); m_DataZoom.SetLabelActive(false); CheckRaycastTarget(); var xAxis = m_XAxises[m_DataZoom.xAxisIndex]; @@ -786,26 +788,26 @@ namespace XCharts m_Series.GetYMinMaxValue(m_DataZoom, axisIndex, false, out tempMinValue, out tempMaxValue); } axis.AdjustMinMaxValue(ref tempMinValue, ref tempMaxValue); - if (tempMinValue != axis.minValue || tempMaxValue != axis.maxValue) + if (tempMinValue != axis.runtimeMinValue || tempMaxValue != axis.runtimeMaxValue) { m_CheckMinMaxValue = true; - axis.minValue = tempMinValue; - axis.maxValue = tempMaxValue; - axis.zeroXOffset = 0; - axis.zeroYOffset = 0; + axis.runtimeMinValue = tempMinValue; + axis.runtimeMaxValue = tempMaxValue; + axis.runtimeZeroXOffset = 0; + axis.runtimeZeroYOffset = 0; if (tempMinValue != 0 || tempMaxValue != 0) { if (axis is XAxis && axis.IsValue()) { - axis.zeroXOffset = axis.minValue > 0 ? 0 : - axis.maxValue < 0 ? this.coordinateWidth : - Mathf.Abs(axis.minValue) * (this.coordinateWidth / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); + axis.runtimeZeroXOffset = axis.runtimeMinValue > 0 ? 0 : + axis.runtimeMaxValue < 0 ? this.coordinateWidth : + Mathf.Abs(axis.runtimeMinValue) * (this.coordinateWidth / (Mathf.Abs(axis.runtimeMinValue) + Mathf.Abs(axis.runtimeMaxValue))); } if (axis is YAxis && axis.IsValue()) { - axis.zeroYOffset = axis.minValue > 0 ? 0 : - axis.maxValue < 0 ? coordinateHeight : - Mathf.Abs(axis.minValue) * (coordinateHeight / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); + axis.runtimeZeroYOffset = axis.runtimeMinValue > 0 ? 0 : + axis.runtimeMaxValue < 0 ? coordinateHeight : + Mathf.Abs(axis.runtimeMinValue) * (coordinateHeight / (Mathf.Abs(axis.runtimeMinValue) + Mathf.Abs(axis.runtimeMaxValue))); } } if (updateChart) @@ -881,7 +883,7 @@ namespace XCharts var size = yAxis.GetScaleNumber(coordinateWidth, m_DataZoom); var totalWidth = coordinateY; var xAxis = m_XAxises[yAxisIndex]; - var zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY + yAxis.zeroYOffset); + var zeroPos = new Vector3(coordinateX + xAxis.runtimeZeroXOffset, coordinateY + yAxis.runtimeZeroYOffset); for (int i = 0; i < size; i++) { var scaleWidth = yAxis.GetScaleWidth(coordinateHeight, i, m_DataZoom); @@ -901,7 +903,7 @@ namespace XCharts } if (yAxis.axisTick.show) { - var startX = coordinateX + m_XAxises[yAxisIndex].zeroXOffset; + var startX = coordinateX + m_XAxises[yAxisIndex].runtimeZeroXOffset; if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWidth; bool inside = yAxis.axisTick.inside; if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1)) @@ -935,7 +937,7 @@ namespace XCharts var size = xAxis.GetScaleNumber(coordinateWidth, m_DataZoom); var totalWidth = coordinateX; var yAxis = m_YAxises[xAxisIndex]; - var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset); + var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.runtimeZeroYOffset); for (int i = 0; i < size; i++) { var scaleWidth = xAxis.GetScaleWidth(coordinateWidth, i, m_DataZoom); @@ -955,7 +957,7 @@ namespace XCharts } if (xAxis.axisTick.show) { - var startY = coordinateY + m_YAxises[xAxisIndex].zeroYOffset; + var startY = coordinateY + m_YAxises[xAxisIndex].runtimeZeroYOffset; if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHeight; bool inside = xAxis.axisTick.inside; if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1)) @@ -986,7 +988,7 @@ namespace XCharts { if (xAxis.show && xAxis.axisLine.show) { - var lineY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].zeroYOffset : 0); + var lineY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].runtimeZeroYOffset : 0); if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHeight; var left = new Vector3(coordinateX - xAxis.axisLine.width, lineY); var top = new Vector3(coordinateX + coordinateWidth + xAxis.axisLine.width, lineY); @@ -1004,7 +1006,7 @@ namespace XCharts { if (yAxis.show && yAxis.axisLine.show) { - var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].zeroXOffset : 0); + var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].runtimeZeroXOffset : 0); if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWidth; var top = new Vector3(lineX, coordinateY + coordinateHeight + yAxis.axisLine.width); ChartDrawer.DrawLine(vh, new Vector3(lineX, coordinateY - yAxis.axisLine.width), @@ -1056,8 +1058,8 @@ namespace XCharts { float value = SampleValue(ref showData, serie.sampleType, rate, serie.minShow, maxCount, totalAverage, i); float pX = coordinateX + i * scaleWid; - float dataHig = (axis.maxValue - axis.minValue) == 0 ? 0 : - (value - axis.minValue) / (axis.maxValue - axis.minValue) * hig; + float dataHig = (axis.runtimeMaxValue - axis.runtimeMinValue) == 0 ? 0 : + (value - axis.runtimeMinValue) / (axis.runtimeMaxValue - axis.runtimeMinValue) * hig; np = new Vector3(pX, m_DataZoom.bottom + dataHig); if (i > 0) { @@ -1127,24 +1129,24 @@ namespace XCharts { case Tooltip.Type.Corss: case Tooltip.Type.Line: - float pX = coordinateX + m_Tooltip.xValues[i] * splitWidth + float pX = coordinateX + m_Tooltip.runtimeXValues[i] * splitWidth + (xAxis.boundaryGap ? splitWidth / 2 : 0); - if (xAxis.IsValue()) pX = m_Tooltip.pointerPos.x; + if (xAxis.IsValue()) pX = m_Tooltip.runtimePointerPos.x; Vector2 sp = new Vector2(pX, coordinateY); Vector2 ep = new Vector2(pX, coordinateY + coordinateHeight); DrawSplitLine(vh, xAxis, Axis.SplitLineType.Solid, sp, ep, m_ThemeInfo.tooltipLineColor); if (m_Tooltip.type == Tooltip.Type.Corss) { - sp = new Vector2(coordinateX, m_Tooltip.pointerPos.y); - ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.pointerPos.y); + sp = new Vector2(coordinateX, m_Tooltip.runtimePointerPos.y); + ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.runtimePointerPos.y); DrawSplitLine(vh, yAxis, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } break; case Tooltip.Type.Shadow: float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth; - pX = coordinateX + splitWidth * m_Tooltip.xValues[i] - + pX = coordinateX + splitWidth * m_Tooltip.runtimeXValues[i] - (xAxis.boundaryGap ? 0 : splitWidth / 2); - if (xAxis.IsValue()) pX = m_Tooltip.xValues[i]; + if (xAxis.IsValue()) pX = m_Tooltip.runtimeXValues[i]; float pY = coordinateY + coordinateHeight; Vector3 p1 = new Vector3(pX, coordinateY); Vector3 p2 = new Vector3(pX, pY); @@ -1172,21 +1174,21 @@ namespace XCharts case Tooltip.Type.Corss: case Tooltip.Type.Line: - float pY = coordinateY + m_Tooltip.yValues[i] * splitWidth + (yAxis.boundaryGap ? splitWidth / 2 : 0); + float pY = coordinateY + m_Tooltip.runtimeYValues[i] * splitWidth + (yAxis.boundaryGap ? splitWidth / 2 : 0); Vector2 sp = new Vector2(coordinateX, pY); Vector2 ep = new Vector2(coordinateX + coordinateWidth, pY); DrawSplitLine(vh, xAxis, Axis.SplitLineType.Solid, sp, ep, m_ThemeInfo.tooltipLineColor); if (m_Tooltip.type == Tooltip.Type.Corss) { - sp = new Vector2(coordinateX, m_Tooltip.pointerPos.y); - ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.pointerPos.y); + sp = new Vector2(coordinateX, m_Tooltip.runtimePointerPos.y); + ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.runtimePointerPos.y); DrawSplitLine(vh, yAxis, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } break; case Tooltip.Type.Shadow: float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth; float pX = coordinateX + coordinateWidth; - pY = coordinateY + splitWidth * m_Tooltip.yValues[i] - + pY = coordinateY + splitWidth * m_Tooltip.runtimeYValues[i] - (yAxis.boundaryGap ? 0 : splitWidth / 2); Vector3 p1 = new Vector3(coordinateX, pY); Vector3 p2 = new Vector3(coordinateX, pY + tooltipSplitWid); @@ -1289,10 +1291,8 @@ namespace XCharts var start = coordinateX + coordinateWidth * m_DataZoom.start / 100; var end = coordinateX + coordinateWidth * m_DataZoom.end / 100; var hig = m_DataZoom.GetHeight(grid.bottom); - m_DataZoom.startLabel.transform.localPosition = - new Vector3(start - 10, m_DataZoom.bottom + hig / 2); - m_DataZoom.endLabel.transform.localPosition = - new Vector3(end + 10, m_DataZoom.bottom + hig / 2); + m_DataZoom.UpdateStartLabelPosition(new Vector3(start - 10, m_DataZoom.bottom + hig / 2)); + m_DataZoom.UpdateEndLabelPosition(new Vector3(end + 10, m_DataZoom.bottom + hig / 2)); } } @@ -1313,12 +1313,12 @@ namespace XCharts if (isYAxis) { var xAxis = m_XAxises[serie.axisIndex]; - zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY); + zeroPos = new Vector3(coordinateX + xAxis.runtimeZeroXOffset, coordinateY); } else { var yAxis = m_YAxises[serie.axisIndex]; - zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset); + zeroPos = new Vector3(coordinateX, coordinateY + yAxis.runtimeZeroYOffset); } } } diff --git a/Runtime/Internal/CoordinateChart_DrawBar.cs b/Runtime/Internal/CoordinateChart_DrawBar.cs index 6fefa517..8e20a161 100644 --- a/Runtime/Internal/CoordinateChart_DrawBar.cs +++ b/Runtime/Internal/CoordinateChart_DrawBar.cs @@ -50,7 +50,7 @@ namespace XCharts seriesHig.Add(0); } float value = showData[i].data[1]; - float pX = seriesHig[i] + coordinateX + xAxis.zeroXOffset + yAxis.axisLine.width; + float pX = seriesHig[i] + coordinateX + xAxis.runtimeZeroXOffset + yAxis.axisLine.width; float pY = coordinateY + +i * categoryWidth; if (!yAxis.boundaryGap) pY -= categoryWidth / 2; @@ -64,8 +64,8 @@ namespace XCharts } else { - valueTotal = xAxis.maxValue - xAxis.minValue; - barHig = (xAxis.minValue > 0 ? value - xAxis.minValue : value) + valueTotal = xAxis.runtimeMaxValue - xAxis.runtimeMinValue; + barHig = (xAxis.runtimeMinValue > 0 ? value - xAxis.runtimeMinValue : value) / valueTotal * coordinateWidth; seriesHig[i] += barHig; } @@ -160,7 +160,7 @@ namespace XCharts } float value = showData[i].data[1]; float pX = coordinateX + i * categoryWidth; - float zeroY = coordinateY + yAxis.zeroYOffset; + float zeroY = coordinateY + yAxis.runtimeZeroYOffset; if (!xAxis.boundaryGap) pX -= categoryWidth / 2; float pY = seriesHig[i] + zeroY + xAxis.axisLine.width; @@ -174,8 +174,8 @@ namespace XCharts } else { - valueTotal = yAxis.maxValue - yAxis.minValue; - barHig = (yAxis.minValue > 0 ? value - yAxis.minValue : value) + valueTotal = yAxis.runtimeMaxValue - yAxis.runtimeMinValue; + barHig = (yAxis.runtimeMinValue > 0 ? value - yAxis.runtimeMinValue : value) / valueTotal * coordinateHeight; seriesHig[i] += barHig; } diff --git a/Runtime/Internal/CoordinateChart_DrawHeatmap.cs b/Runtime/Internal/CoordinateChart_DrawHeatmap.cs index a4afe6ee..859b2357 100644 --- a/Runtime/Internal/CoordinateChart_DrawHeatmap.cs +++ b/Runtime/Internal/CoordinateChart_DrawHeatmap.cs @@ -24,9 +24,9 @@ namespace XCharts if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, canvas.worldCamera, out local)) { - if (m_VisualMap.rtSelectedIndex >= 0) + if (m_VisualMap.runtimeSelectedIndex >= 0) { - m_VisualMap.rtSelectedIndex = -1; + m_VisualMap.runtimeSelectedIndex = -1; RefreshChart(); } return; @@ -35,9 +35,9 @@ namespace XCharts local.y < 0 || local.y > chartHeight || !m_VisualMap.IsInRangeRect(local, chartWidth, chartHeight)) { - if (m_VisualMap.rtSelectedIndex >= 0) + if (m_VisualMap.runtimeSelectedIndex >= 0) { - m_VisualMap.rtSelectedIndex = -1; + m_VisualMap.runtimeSelectedIndex = -1; RefreshChart(); } return; @@ -63,8 +63,8 @@ namespace XCharts selectedIndex = m_VisualMap.GetIndex(value); break; } - m_VisualMap.rtSelectedValue = value; - m_VisualMap.rtSelectedIndex = selectedIndex; + m_VisualMap.runtimeSelectedValue = value; + m_VisualMap.runtimeSelectedIndex = selectedIndex; RefreshChart(); } @@ -161,8 +161,8 @@ namespace XCharts } if(animationIndex>= 0 && i> animationIndex) continue; serieData.canShowLabel = true; - var emphasis = (m_Tooltip.show && i == (int)m_Tooltip.xValues[0] && j == (int)m_Tooltip.yValues[0]) - || m_VisualMap.rtSelectedIndex > 0; + var emphasis = (m_Tooltip.show && i == (int)m_Tooltip.runtimeXValues[0] && j == (int)m_Tooltip.runtimeYValues[0]) + || m_VisualMap.runtimeSelectedIndex > 0; var rectWid = xWidth - 2 * borderWidth; var rectHig = yWidth - 2 * borderWidth; ChartDrawer.DrawPolygon(vh, pos, rectWid / 2, rectHig / 2, color); @@ -199,10 +199,10 @@ namespace XCharts var halfHig = m_VisualMap.itemHeight / 2; var xRadius = 0f; var yRadius = 0f; - var splitNum = m_VisualMap.rtInRange.Count; + var splitNum = m_VisualMap.runtimeInRange.Count; var splitWid = m_VisualMap.itemHeight / (splitNum - 1); var isVertical = false; - var colors = m_VisualMap.rtInRange; + var colors = m_VisualMap.runtimeInRange; var triangeLen = m_Settings.visualMapTriangeLen; switch (m_VisualMap.orient) { @@ -215,13 +215,13 @@ namespace XCharts isVertical = false; if (m_VisualMap.calculable) { - var p0 = pos1 + Vector3.right * m_VisualMap.rangeMinHeight; + var p0 = pos1 + Vector3.right * m_VisualMap.runtimeRangeMinHeight; var p1 = p0 + Vector3.up * halfWid; var p2 = p0 + Vector3.up * (halfWid + triangeLen); var p3 = p2 + Vector3.left * triangeLen; var color = m_VisualMap.GetColor(m_VisualMap.rangeMin); ChartDrawer.DrawTriangle(vh, p1, p2, p3, color); - p0 = pos1 + Vector3.right * m_VisualMap.rangeMaxHeight; + p0 = pos1 + Vector3.right * m_VisualMap.runtimeRangeMaxHeight; p1 = p0 + Vector3.up * halfWid; p2 = p0 + Vector3.up * (halfWid + triangeLen); p3 = p2 + Vector3.right * triangeLen; @@ -238,13 +238,13 @@ namespace XCharts isVertical = true; if (m_VisualMap.calculable) { - var p0 = pos1 + Vector3.up * m_VisualMap.rangeMinHeight; + var p0 = pos1 + Vector3.up * m_VisualMap.runtimeRangeMinHeight; var p1 = p0 + Vector3.right * halfWid; var p2 = p0 + Vector3.right * (halfWid + triangeLen); var p3 = p2 + Vector3.down * triangeLen; var color = m_VisualMap.GetColor(m_VisualMap.rangeMin); ChartDrawer.DrawTriangle(vh, p1, p2, p3, color); - p0 = pos1 + Vector3.up * m_VisualMap.rangeMaxHeight; + p0 = pos1 + Vector3.up * m_VisualMap.runtimeRangeMaxHeight; p1 = p0 + Vector3.right * halfWid; p2 = p0 + Vector3.right * (halfWid + triangeLen); p3 = p2 + Vector3.up * triangeLen; @@ -276,7 +276,7 @@ namespace XCharts } else if (rangeMin > splitMin && rangeMax >= splitMax) { - var p0 = pos1 + dir * m_VisualMap.rangeMinHeight; + var p0 = pos1 + dir * m_VisualMap.runtimeRangeMinHeight; var splitMaxPos = pos1 + dir * i * splitWid; var splitPos = p0 + (splitMaxPos - p0) / 2; var startColor = m_VisualMap.GetColor(m_VisualMap.rangeMin); @@ -289,7 +289,7 @@ namespace XCharts } else if (rangeMax < splitMax && rangeMin <= splitMin) { - var p0 = pos1 + dir * m_VisualMap.rangeMaxHeight; + var p0 = pos1 + dir * m_VisualMap.runtimeRangeMaxHeight; var splitMinPos = pos1 + dir * (i - 1) * splitWid; var splitPos = splitMinPos + (p0 - splitMinPos) / 2; var startColor = colors[i - 1]; @@ -302,8 +302,8 @@ namespace XCharts } else { - var p0 = pos1 + dir * m_VisualMap.rangeMinHeight; - var p1 = pos1 + dir * m_VisualMap.rangeMaxHeight; + var p0 = pos1 + dir * m_VisualMap.runtimeRangeMinHeight; + var p1 = pos1 + dir * m_VisualMap.runtimeRangeMaxHeight; var splitPos = (p0 + p1) / 2; var startColor = m_VisualMap.GetColor(m_VisualMap.rangeMin); var toColor = m_VisualMap.GetColor(m_VisualMap.rangeMax); @@ -328,38 +328,38 @@ namespace XCharts if (m_VisualMap.rangeMin > m_VisualMap.min) { - var p0 = pos1 + dir * m_VisualMap.rangeMinHeight; + var p0 = pos1 + dir * m_VisualMap.runtimeRangeMinHeight; ChartDrawer.DrawPolygon(vh, pos1, p0, m_VisualMap.itemWidth / 2, m_ThemeInfo.visualMapBackgroundColor); } if (m_VisualMap.rangeMax < m_VisualMap.max) { - var p1 = pos1 + dir * m_VisualMap.rangeMaxHeight; + var p1 = pos1 + dir * m_VisualMap.runtimeRangeMaxHeight; ChartDrawer.DrawPolygon(vh, p1, pos2, m_VisualMap.itemWidth / 2, m_ThemeInfo.visualMapBackgroundColor); } if (m_VisualMap.hoverLink) { - if (m_VisualMap.rtSelectedIndex >= 0) + if (m_VisualMap.runtimeSelectedIndex >= 0) { - var p0 = pos1 + dir * m_VisualMap.rangeMinHeight; - var p1 = pos1 + dir * m_VisualMap.rangeMaxHeight; + var p0 = pos1 + dir * m_VisualMap.runtimeRangeMinHeight; + var p1 = pos1 + dir * m_VisualMap.runtimeRangeMaxHeight; if (m_VisualMap.orient == Orient.Vertical) { var p2 = new Vector3(centerPos.x + halfWid, Mathf.Clamp(pointerPos.y + (triangeLen / 2), p0.y, p1.y)); var p3 = new Vector3(centerPos.x + halfWid, Mathf.Clamp(pointerPos.y - (triangeLen / 2), p0.y, p1.y)); var p4 = new Vector3(centerPos.x + halfWid + triangeLen / 2, pointerPos.y); - ChartDrawer.DrawTriangle(vh, p2, p3, p4, colors[m_VisualMap.rtSelectedIndex]); + ChartDrawer.DrawTriangle(vh, p2, p3, p4, colors[m_VisualMap.runtimeSelectedIndex]); } else { var p2 = new Vector3(Mathf.Clamp(pointerPos.x + (triangeLen / 2), p0.x, p1.x), centerPos.y + halfWid); var p3 = new Vector3(Mathf.Clamp(pointerPos.x - (triangeLen / 2), p0.x, p1.x), centerPos.y + halfWid); var p4 = new Vector3(pointerPos.x, centerPos.y + halfWid + triangeLen / 2); - ChartDrawer.DrawTriangle(vh, p2, p3, p4, colors[m_VisualMap.rtSelectedIndex]); + ChartDrawer.DrawTriangle(vh, p2, p3, p4, colors[m_VisualMap.runtimeSelectedIndex]); } } - else if (m_Tooltip.show && m_Tooltip.xValues[0] >= 0 && m_Tooltip.yValues[0] >= 0) + else if (m_Tooltip.show && m_Tooltip.runtimeXValues[0] >= 0 && m_Tooltip.runtimeYValues[0] >= 0) { // var p0 = pos1 + dir * m_VisualMap.rangeMinHeight; // var p1 = pos1 + dir * m_VisualMap.rangeMaxHeight; diff --git a/Runtime/Internal/CoordinateChart_DrawLine.cs b/Runtime/Internal/CoordinateChart_DrawLine.cs index fa0d56cc..329ee1b9 100644 --- a/Runtime/Internal/CoordinateChart_DrawLine.cs +++ b/Runtime/Internal/CoordinateChart_DrawLine.cs @@ -88,7 +88,7 @@ namespace XCharts Vector3 lp = Vector3.zero, np = Vector3.zero, llp = Vector3.zero, nnp = Vector3.zero; var yAxis = m_YAxises[serie.axisIndex]; var xAxis = m_XAxises[serie.axisIndex]; - var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset); + var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.runtimeZeroYOffset); var isStack = m_Series.IsStack(serie.stack, SerieType.Line); if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count]; float scaleWid = xAxis.GetDataWidth(coordinateWidth, showData.Count, m_DataZoom); @@ -168,7 +168,7 @@ namespace XCharts serie.ClearSmoothList(i); if (!serie.animation.NeedAnimation(i)) break; bool isFinish = true; - if (serie.areaStyle.tooltipHighlight && m_Tooltip.show && i <= m_Tooltip.dataIndex[0]) + if (serie.areaStyle.tooltipHighlight && m_Tooltip.show && i <= m_Tooltip.runtimeDataIndex[0]) { areaColor = highlightAreaColor; areaToColor = highlightAreaToColor; @@ -294,18 +294,18 @@ namespace XCharts float xValue = i > showData.Count - 1 ? 0 : showData[i].data[0]; float pX = coordinateX + xAxis.axisLine.width; float pY = serieHig + coordinateY + xAxis.axisLine.width; - if ((xAxis.maxValue - xAxis.minValue) <= 0) xDataHig = 0; - else xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; - if ((yAxis.maxValue - yAxis.minValue) <= 0) yDataHig = 0; - else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; + if ((xAxis.runtimeMaxValue - xAxis.runtimeMinValue) <= 0) xDataHig = 0; + else xDataHig = (xValue - xAxis.runtimeMinValue) / (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * coordinateWidth; + if ((yAxis.runtimeMaxValue - yAxis.runtimeMinValue) <= 0) yDataHig = 0; + else yDataHig = (yValue - yAxis.runtimeMinValue) / (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) * coordinateHeight; np = new Vector3(pX + xDataHig, pY + yDataHig); } else { float pX = startX + i * scaleWid; float pY = serieHig + coordinateY + yAxis.axisLine.width; - if ((yAxis.maxValue - yAxis.minValue) <= 0) yDataHig = 0; - else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; + if ((yAxis.runtimeMaxValue - yAxis.runtimeMinValue) <= 0) yDataHig = 0; + else yDataHig = (yValue - yAxis.runtimeMinValue) / (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) * coordinateHeight; np = new Vector3(pX, pY + yDataHig); } return yDataHig; @@ -327,7 +327,7 @@ namespace XCharts Color areaColor, areaToColor; var xAxis = m_XAxises[serie.axisIndex]; var yAxis = m_YAxises[serie.axisIndex]; - var zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY); + var zeroPos = new Vector3(coordinateX + xAxis.runtimeZeroXOffset, coordinateY); var isStack = m_Series.IsStack(serie.stack, SerieType.Line); if (!yAxis.show) yAxis = m_YAxises[(serie.axisIndex + 1) % m_YAxises.Count]; float scaleWid = yAxis.GetDataWidth(coordinateHeight, showData.Count, m_DataZoom); @@ -356,7 +356,7 @@ namespace XCharts float value = showData[i].data[1]; float pY = startY + i * scaleWid; float pX = seriesHig[i] + coordinateX + yAxis.axisLine.width; - float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; + float dataHig = (value - xAxis.runtimeMinValue) / (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * coordinateWidth; np = new Vector3(pX + dataHig, pY); serie.dataPoints.Add(np); seriesHig[i] += dataHig; @@ -368,7 +368,7 @@ namespace XCharts float value = showData[i].data[1]; float pY = startY + i * scaleWid; float pX = seriesHig[i] + coordinateX + yAxis.axisLine.width; - float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; + float dataHig = (value - xAxis.runtimeMinValue) / (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * coordinateWidth; np = new Vector3(pX + dataHig, pY); serie.dataPoints.Add(np); seriesHig[i] += dataHig; @@ -384,7 +384,7 @@ namespace XCharts serie.ClearSmoothList(i); if (!serie.animation.NeedAnimation(i)) break; bool isFinish = true; - if (serie.areaStyle.tooltipHighlight && m_Tooltip.show && i < m_Tooltip.dataIndex[0]) + if (serie.areaStyle.tooltipHighlight && m_Tooltip.show && i < m_Tooltip.runtimeDataIndex[0]) { areaColor = highlightAreaColor; areaToColor = highlightAreaToColor; diff --git a/Runtime/Internal/CoordinateChart_DrawScatter.cs b/Runtime/Internal/CoordinateChart_DrawScatter.cs index b6feb2c7..71f6a686 100644 --- a/Runtime/Internal/CoordinateChart_DrawScatter.cs +++ b/Runtime/Internal/CoordinateChart_DrawScatter.cs @@ -30,8 +30,8 @@ namespace XCharts float yValue = serieData.data[1]; float pX = coordinateX + xAxis.axisLine.width; float pY = coordinateY + yAxis.axisLine.width; - float xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; - float yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; + float xDataHig = (xValue - xAxis.runtimeMinValue) / (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * coordinateWidth; + float yDataHig = (yValue - yAxis.runtimeMinValue) / (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) * coordinateHeight; var pos = new Vector3(pX + xDataHig, pY + yDataHig); var datas = serie.data[n].data; diff --git a/Runtime/Internal/JsonDataSupport.cs b/Runtime/Internal/JsonDataSupport.cs deleted file mode 100644 index 46b4b2e8..00000000 --- a/Runtime/Internal/JsonDataSupport.cs +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************/ -/* */ -/* Copyright (c) 2018 monitor1394 */ -/* https://github.com/monitor1394 */ -/* */ -/******************************************/ - -using UnityEngine; -using System; - -namespace XCharts -{ - /// - /// 支持从json格式的字符串中导入数据 - /// - public class JsonDataSupport : IJsonData, ISerializationCallbackReceiver - { - [SerializeField] protected string m_JsonData; - [SerializeField] protected bool m_DataFromJson; - - /// - /// json格式的字符串数据 - /// - /// - public string jsonData { get { return m_JsonData; } set { m_JsonData = value; ParseJsonData(value); } } - - public void OnAfterDeserialize() - { - if (m_DataFromJson) - { - ParseJsonData(m_JsonData); - m_DataFromJson = false; - } - } - - public void OnBeforeSerialize() - { - } - - public virtual void ParseJsonData(string json) - { - throw new Exception("no support yet"); - } - } -} diff --git a/Runtime/Internal/JsonDataSupport.cs.meta b/Runtime/Internal/JsonDataSupport.cs.meta deleted file mode 100644 index 5f64576a..00000000 --- a/Runtime/Internal/JsonDataSupport.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 73e326ed8a76f90408bfa9feb1797433 -timeCreated: 1555379601 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/Internal/ObjectPool.cs b/Runtime/Internal/ObjectPool.cs index e53dad38..be2bde7b 100644 --- a/Runtime/Internal/ObjectPool.cs +++ b/Runtime/Internal/ObjectPool.cs @@ -11,7 +11,7 @@ using UnityEngine.Events; namespace XCharts { - public class ObjectPool where T : new() + internal class ObjectPool where T : new() { private readonly Stack m_Stack = new Stack(); private readonly UnityAction m_ActionOnGet; diff --git a/Runtime/PieChart.cs b/Runtime/PieChart.cs index 50726fe5..a0226d6d 100644 --- a/Runtime/PieChart.cs +++ b/Runtime/PieChart.cs @@ -65,8 +65,8 @@ namespace XCharts } bool isFinish = true; if (serie.pieClickOffset) isClickOffset = true; - serie.pieDataMax = serie.yMax; - serie.pieDataTotal = serie.yTotal; + serie.runtimePieDataMax = serie.yMax; + serie.runtimePieDataTotal = serie.yTotal; UpdatePieCenter(serie); float totalDegree = 360; @@ -85,73 +85,73 @@ namespace XCharts float value = serieData.data[1]; serieNameCount = m_LegendRealShowName.IndexOf(serieData.legendName); Color color = m_ThemeInfo.GetColor(serieNameCount); - serieData.pieStartAngle = startDegree; - serieData.pieToAngle = startDegree; - serieData.pieHalfAngle = startDegree; - serieData.pieCurrAngle = startDegree; + serieData.runtimePieStartAngle = startDegree; + serieData.runtimePieToAngle = startDegree; + serieData.runtimePieHalfAngle = startDegree; + serieData.runtimePieCurrAngle = startDegree; if (!serieData.show) { continue; } float degree = serie.pieRoseType == RoseType.Area ? - (totalDegree / showdataCount) : (totalDegree * value / serie.pieDataTotal); - serieData.pieToAngle = startDegree + degree; + (totalDegree / showdataCount) : (totalDegree * value / serie.runtimePieDataTotal); + serieData.runtimePieToAngle = startDegree + degree; - serieData.pieOutsideRadius = serie.pieRoseType > 0 ? - serie.pieInsideRadius + (serie.pieOutsideRadius - serie.pieInsideRadius) * value / serie.pieDataMax : - serie.pieOutsideRadius; + serieData.runtimePieOutsideRadius = serie.pieRoseType > 0 ? + serie.runtimePieInsideRadius + (serie.runtimePieOutsideRadius - serie.runtimePieInsideRadius) * value / serie.runtimePieDataMax : + serie.runtimePieOutsideRadius; if (serieData.highlighted) { isDataHighlight = true; color *= 1.2f; - serieData.pieOutsideRadius += m_Settings.pieTooltipExtraRadius; + serieData.runtimePieOutsideRadius += m_Settings.pieTooltipExtraRadius; } var offset = serie.pieSpace; if (serie.pieClickOffset && serieData.selected) { offset += m_Settings.pieSelectedOffset; } - var halfDegree = (serieData.pieToAngle - startDegree) / 2; - serieData.pieHalfAngle = startDegree + halfDegree; - float currRad = serieData.pieHalfAngle * Mathf.Deg2Rad; + var halfDegree = (serieData.runtimePieToAngle - startDegree) / 2; + serieData.runtimePieHalfAngle = startDegree + halfDegree; + float currRad = serieData.runtimePieHalfAngle * Mathf.Deg2Rad; float currSin = Mathf.Sin(currRad); float currCos = Mathf.Cos(currRad); - var center = serie.pieCenterPos; + var center = serie.runtimePieCenterPos; - serieData.pieCurrAngle = serieData.pieToAngle; - serieData.pieOffsetCenter = center; - serieData.pieInsideRadius = serie.pieInsideRadius; - if (serie.animation.CheckDetailBreak(n, serieData.pieToAngle)) + serieData.runtimePieCurrAngle = serieData.runtimePieToAngle; + serieData.runtiemPieOffsetCenter = center; + serieData.runtimePieInsideRadius = serie.runtimePieInsideRadius; + if (serie.animation.CheckDetailBreak(n, serieData.runtimePieToAngle)) { isFinish = false; - serieData.pieCurrAngle = serie.animation.GetCurrDetail(); + serieData.runtimePieCurrAngle = serie.animation.GetCurrDetail(); } if (offset > 0) { - serieData.pieOffsetRadius = serie.pieSpace / Mathf.Sin(halfDegree * Mathf.Deg2Rad); - serieData.pieInsideRadius -= serieData.pieOffsetRadius; - serieData.pieOutsideRadius -= serieData.pieOffsetRadius; + serieData.runtimePieOffsetRadius = serie.pieSpace / Mathf.Sin(halfDegree * Mathf.Deg2Rad); + serieData.runtimePieInsideRadius -= serieData.runtimePieOffsetRadius; + serieData.runtimePieOutsideRadius -= serieData.runtimePieOffsetRadius; if (serie.pieClickOffset && serieData.selected) { - serieData.pieOffsetRadius += m_Settings.pieSelectedOffset; - if (serieData.pieInsideRadius > 0) serieData.pieInsideRadius += m_Settings.pieSelectedOffset; - serieData.pieOutsideRadius += m_Settings.pieSelectedOffset; + serieData.runtimePieOffsetRadius += m_Settings.pieSelectedOffset; + if (serieData.runtimePieInsideRadius > 0) serieData.runtimePieInsideRadius += m_Settings.pieSelectedOffset; + serieData.runtimePieOutsideRadius += m_Settings.pieSelectedOffset; } - serieData.pieOffsetCenter = new Vector3(center.x + serieData.pieOffsetRadius * currSin, - center.y + serieData.pieOffsetRadius * currCos); + serieData.runtiemPieOffsetCenter = new Vector3(center.x + serieData.runtimePieOffsetRadius * currSin, + center.y + serieData.runtimePieOffsetRadius * currCos); - ChartDrawer.DrawDoughnut(vh, serieData.pieOffsetCenter, serieData.pieInsideRadius, serieData.pieOutsideRadius, - color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, startDegree, serieData.pieCurrAngle); + ChartDrawer.DrawDoughnut(vh, serieData.runtiemPieOffsetCenter, serieData.runtimePieInsideRadius, serieData.runtimePieOutsideRadius, + color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, startDegree, serieData.runtimePieCurrAngle); } else { - ChartDrawer.DrawDoughnut(vh, center, serieData.pieInsideRadius, serieData.pieOutsideRadius, - color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, startDegree, serieData.pieCurrAngle); + ChartDrawer.DrawDoughnut(vh, center, serieData.runtimePieInsideRadius, serieData.runtimePieOutsideRadius, + color, m_ThemeInfo.backgroundColor, m_Settings.cicleSmoothness, startDegree, serieData.runtimePieCurrAngle); } - serieData.canShowLabel = serieData.pieCurrAngle >= serieData.pieHalfAngle; + serieData.canShowLabel = serieData.runtimePieCurrAngle >= serieData.runtimePieHalfAngle; isDrawPie = true; - startDegree = serieData.pieToAngle; + startDegree = serieData.runtimePieToAngle; if (isFinish) serie.animation.SetDataFinish(n); else break; } @@ -213,17 +213,17 @@ namespace XCharts && serie.label.position == SerieLabel.Position.Outside && serie.label.line) { - var insideRadius = serieData.pieInsideRadius; - var outSideRadius = serieData.pieOutsideRadius; - var center = serie.pieCenterPos; - var currAngle = serieData.pieHalfAngle; + var insideRadius = serieData.runtimePieInsideRadius; + var outSideRadius = serieData.runtimePieOutsideRadius; + var center = serie.runtimePieCenterPos; + var currAngle = serieData.runtimePieHalfAngle; if (serie.label.lineColor != Color.clear) color = serie.label.lineColor; else if (serie.label.lineType == SerieLabel.LineType.HorizontalLine) color *= color; float currSin = Mathf.Sin(currAngle * Mathf.Deg2Rad); float currCos = Mathf.Cos(currAngle * Mathf.Deg2Rad); var radius1 = serie.label.lineType == SerieLabel.LineType.HorizontalLine ? - serie.pieOutsideRadius : outSideRadius; - var radius2 = serie.pieOutsideRadius + serie.label.lineLength1; + serie.runtimePieOutsideRadius : outSideRadius; + var radius2 = serie.runtimePieOutsideRadius + serie.label.lineLength1; var radius3 = insideRadius + (outSideRadius - insideRadius) / 2; var pos0 = new Vector3(center.x + radius3 * currSin, center.y + radius3 * currCos); var pos1 = new Vector3(center.x + radius1 * currSin, center.y + radius1 * currCos); @@ -332,7 +332,7 @@ namespace XCharts private void DrawLabel(Serie serie, int dataIndex, SerieData serieData, Color serieColor) { if (serieData.labelText == null) return; - var currAngle = serieData.pieHalfAngle; + var currAngle = serieData.runtimePieHalfAngle; var isHighlight = (serieData.highlighted && serie.emphasis.label.show); var showLabel = ((serie.label.show || isHighlight) && serieData.canShowLabel); if (showLabel || serieData.showIcon) @@ -387,30 +387,30 @@ namespace XCharts protected void UpdateLabelPostion(Serie serie, SerieData serieData) { - var currAngle = serieData.pieHalfAngle; + var currAngle = serieData.runtimePieHalfAngle; var currRad = currAngle * Mathf.Deg2Rad; - var offsetRadius = serieData.pieOffsetRadius; - var insideRadius = serieData.pieInsideRadius; - var outsideRadius = serieData.pieOutsideRadius; + var offsetRadius = serieData.runtimePieOffsetRadius; + var insideRadius = serieData.runtimePieInsideRadius; + var outsideRadius = serieData.runtimePieOutsideRadius; switch (serie.label.position) { case SerieLabel.Position.Center: - serieData.labelPosition = serie.pieCenterPos; + serieData.labelPosition = serie.runtimePieCenterPos; break; case SerieLabel.Position.Inside: var labelRadius = offsetRadius + insideRadius + (outsideRadius - insideRadius) / 2; - var labelCenter = new Vector2(serie.pieCenterPos.x + labelRadius * Mathf.Sin(currRad), - serie.pieCenterPos.y + labelRadius * Mathf.Cos(currRad)); + var labelCenter = new Vector2(serie.runtimePieCenterPos.x + labelRadius * Mathf.Sin(currRad), + serie.runtimePieCenterPos.y + labelRadius * Mathf.Cos(currRad)); serieData.labelPosition = labelCenter; break; case SerieLabel.Position.Outside: if (serie.label.lineType == SerieLabel.LineType.HorizontalLine) { - var radius1 = serie.pieOutsideRadius; + var radius1 = serie.runtimePieOutsideRadius; var radius3 = insideRadius + (outsideRadius - insideRadius) / 2; var currSin = Mathf.Sin(currRad); var currCos = Mathf.Cos(currRad); - var pos0 = new Vector3(serie.pieCenterPos.x + radius3 * currSin, serie.pieCenterPos.y + radius3 * currCos); + var pos0 = new Vector3(serie.runtimePieCenterPos.x + radius3 * currSin, serie.runtimePieCenterPos.y + radius3 * currCos); if (currAngle > 180) { currSin = Mathf.Sin((360 - currAngle) * Mathf.Deg2Rad); @@ -423,9 +423,9 @@ namespace XCharts } else { - labelRadius = serie.pieOutsideRadius + serie.label.lineLength1; - labelCenter = new Vector2(serie.pieCenterPos.x + labelRadius * Mathf.Sin(currRad), - serie.pieCenterPos.y + labelRadius * Mathf.Cos(currRad)); + labelRadius = serie.runtimePieOutsideRadius + serie.label.lineLength1; + labelCenter = new Vector2(serie.runtimePieCenterPos.x + labelRadius * Mathf.Sin(currRad), + serie.runtimePieCenterPos.y + labelRadius * Mathf.Cos(currRad)); float labelWidth = serieData.labelText.preferredWidth; if (currAngle > 180) { @@ -467,21 +467,21 @@ namespace XCharts if (serie.pieCenter.Length < 2) return; var centerX = serie.pieCenter[0] <= 1 ? chartWidth * serie.pieCenter[0] : serie.pieCenter[0]; var centerY = serie.pieCenter[1] <= 1 ? chartHeight * serie.pieCenter[1] : serie.pieCenter[1]; - serie.pieCenterPos = new Vector2(centerX, centerY); + serie.runtimePieCenterPos = new Vector2(centerX, centerY); var minWidth = Mathf.Min(chartWidth, chartHeight); - serie.pieInsideRadius = serie.pieRadius[0] <= 1 ? minWidth * serie.pieRadius[0] : serie.pieRadius[0]; - serie.pieOutsideRadius = serie.pieRadius[1] <= 1 ? minWidth * serie.pieRadius[1] : serie.pieRadius[1]; + serie.runtimePieInsideRadius = serie.pieRadius[0] <= 1 ? minWidth * serie.pieRadius[0] : serie.pieRadius[0]; + serie.runtimePieOutsideRadius = serie.pieRadius[1] <= 1 ? minWidth * serie.pieRadius[1] : serie.pieRadius[1]; } protected override void CheckTootipArea(Vector2 local) { if (m_IsEnterLegendButtom) return; - m_Tooltip.dataIndex.Clear(); + m_Tooltip.runtimeDataIndex.Clear(); bool selected = false; foreach (var serie in m_Series.list) { int index = GetPosPieIndex(serie, local); - m_Tooltip.dataIndex.Add(index); + m_Tooltip.runtimeDataIndex.Add(index); if (serie.type != SerieType.Pie) continue; bool refresh = false; for (int j = 0; j < serie.data.Count; j++) @@ -508,14 +508,14 @@ namespace XCharts private int GetPosPieIndex(Serie serie, Vector2 local) { if (serie.type != SerieType.Pie) return -1; - var dist = Vector2.Distance(local, serie.pieCenterPos); - if (dist < serie.pieInsideRadius || dist > serie.pieOutsideRadius) return -1; - Vector2 dir = local - new Vector2(serie.pieCenterPos.x, serie.pieCenterPos.y); + var dist = Vector2.Distance(local, serie.runtimePieCenterPos); + if (dist < serie.runtimePieInsideRadius || dist > serie.runtimePieOutsideRadius) return -1; + Vector2 dir = local - new Vector2(serie.runtimePieCenterPos.x, serie.runtimePieCenterPos.y); float angle = VectorAngle(Vector2.up, dir); for (int i = 0; i < serie.data.Count; i++) { var serieData = serie.data[i]; - if (angle >= serieData.pieStartAngle && angle <= serieData.pieToAngle) + if (angle >= serieData.runtimePieStartAngle && angle <= serieData.runtimePieToAngle) { return i; } @@ -541,7 +541,7 @@ namespace XCharts bool showTooltip = false; foreach (var serie in m_Series.list) { - int index = m_Tooltip.dataIndex[serie.index]; + int index = m_Tooltip.runtimeDataIndex[serie.index]; if (index < 0) continue; showTooltip = true; if (string.IsNullOrEmpty(tooltip.formatter)) @@ -565,13 +565,13 @@ namespace XCharts } var pos = m_Tooltip.GetContentPos(); - if (pos.x + m_Tooltip.width > chartWidth) + if (pos.x + m_Tooltip.runtimeWidth > chartWidth) { - pos.x = chartWidth - m_Tooltip.width; + pos.x = chartWidth - m_Tooltip.runtimeWidth; } - if (pos.y - m_Tooltip.height < 0) + if (pos.y - m_Tooltip.runtimeHeight < 0) { - pos.y = m_Tooltip.height; + pos.y = m_Tooltip.runtimeHeight; } m_Tooltip.UpdateContentPos(pos); } diff --git a/Runtime/RadarChart.cs b/Runtime/RadarChart.cs index 75b2eea0..b9f0169b 100644 --- a/Runtime/RadarChart.cs +++ b/Runtime/RadarChart.cs @@ -110,7 +110,7 @@ namespace XCharts var indicator = radar.indicatorList[i]; var pos = radar.GetIndicatorPosition(i); TextAnchor anchor = TextAnchor.MiddleCenter; - var diff = pos.x - radar.centerPos.x; + var diff = pos.x - radar.runtimeCenterPos.x; if (diff < -1f) { pos = new Vector3(pos.x - 5, pos.y); @@ -124,7 +124,7 @@ namespace XCharts else { anchor = TextAnchor.MiddleCenter; - float y = pos.y > radar.centerPos.y ? pos.y + txtHig / 2 : pos.y - txtHig / 2; + float y = pos.y > radar.runtimeCenterPos.y ? pos.y + txtHig / 2 : pos.y - txtHig / 2; pos = new Vector3(pos.x + txtWid / 2, y); } var textColor = indicator.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : indicator.color; @@ -212,7 +212,7 @@ namespace XCharts var radar = m_Radars[serie.radarIndex]; int indicatorNum = radar.indicatorList.Count; var angle = 2 * Mathf.PI / indicatorNum; - Vector3 p = radar.centerPos; + Vector3 p = radar.runtimeCenterPos; serie.animation.InitProgress(1, 0, 1); if (!IsActive(i)) { @@ -223,13 +223,13 @@ namespace XCharts { var serieData = serie.data[j]; int key = i * 100 + j; - if (!radar.dataPosList.ContainsKey(key)) + if (!radar.runtimeDataPosList.ContainsKey(key)) { - radar.dataPosList.Add(i * 100 + j, new List(serieData.data.Count)); + radar.runtimeDataPosList.Add(i * 100 + j, new List(serieData.data.Count)); } else { - radar.dataPosList[key].Clear(); + radar.runtimeDataPosList[key].Clear(); } string dataName = serieData.name; int serieIndex = 0; @@ -253,11 +253,11 @@ namespace XCharts continue; } var isHighlight = serie.highlighted || serieData.highlighted || - (m_Tooltip.show && m_Tooltip.dataIndex[0] == i && m_Tooltip.dataIndex[1] == j); + (m_Tooltip.show && m_Tooltip.runtimeDataIndex[0] == i && m_Tooltip.runtimeDataIndex[1] == j); var areaColor = serie.GetAreaColor(m_ThemeInfo, serieIndex, isHighlight); var lineColor = serie.GetLineColor(m_ThemeInfo, serieIndex, isHighlight); int dataCount = radar.indicatorList.Count; - List pointList = radar.dataPosList[key]; + List pointList = radar.runtimeDataPosList[key]; for (int n = 0; n < dataCount; n++) { if (n >= serieData.data.Count) break; @@ -269,8 +269,8 @@ namespace XCharts serie.GetMinMaxData(n, out min, out max); min = radar.GetIndicatorMin(n); } - var radius = max < 0 ? radar.actualRadius - radar.actualRadius * value / max - : radar.actualRadius * value / max; + var radius = max < 0 ? radar.runtimeRadius - radar.runtimeRadius * value / max + : radar.runtimeRadius * value / max; var currAngle = n * angle; radius *= rate; if (n == 0) @@ -331,10 +331,10 @@ namespace XCharts return; } float insideRadius = 0, outsideRadius = 0; - float block = radar.actualRadius / radar.splitNumber; + float block = radar.runtimeRadius / radar.splitNumber; int indicatorNum = radar.indicatorList.Count; Vector3 p1, p2, p3, p4; - Vector3 p = radar.centerPos; + Vector3 p = radar.runtimeCenterPos; float angle = 2 * Mathf.PI / indicatorNum; var lineColor = GetLineColor(radar); for (int i = 0; i < radar.splitNumber; i++) @@ -382,9 +382,9 @@ namespace XCharts return; } float insideRadius = 0, outsideRadius = 0; - float block = radar.actualRadius / radar.splitNumber; + float block = radar.runtimeRadius / radar.splitNumber; int indicatorNum = radar.indicatorList.Count; - Vector3 p = radar.centerPos; + Vector3 p = radar.runtimeCenterPos; Vector3 p1; float angle = 2 * Mathf.PI / indicatorNum; var lineColor = GetLineColor(radar); @@ -443,23 +443,23 @@ namespace XCharts if (!IsActive(i)) continue; var serie = m_Series.GetSerie(i); var radar = m_Radars[serie.radarIndex]; - var dist = Vector2.Distance(radar.centerPos, local); - if (dist > radar.actualRadius + serie.symbol.size) + var dist = Vector2.Distance(radar.runtimeCenterPos, local); + if (dist > radar.runtimeRadius + serie.symbol.size) { continue; } for (int n = 0; n < serie.data.Count; n++) { var posKey = i * 100 + n; - if (radar.dataPosList.ContainsKey(posKey)) + if (radar.runtimeDataPosList.ContainsKey(posKey)) { - var posList = radar.dataPosList[posKey]; + var posList = radar.runtimeDataPosList[posKey]; foreach (var pos in posList) { if (Vector2.Distance(pos, local) <= serie.symbol.size * 1.2f) { - m_Tooltip.dataIndex[0] = i; - m_Tooltip.dataIndex[1] = n; + m_Tooltip.runtimeDataIndex[0] = i; + m_Tooltip.runtimeDataIndex[1] = n; highlight = true; break; } @@ -487,7 +487,7 @@ namespace XCharts protected override void RefreshTooltip() { base.RefreshTooltip(); - int serieIndex = m_Tooltip.dataIndex[0]; + int serieIndex = m_Tooltip.runtimeDataIndex[0]; if (serieIndex < 0) { if (m_Tooltip.IsActive()) @@ -500,7 +500,7 @@ namespace XCharts m_Tooltip.SetActive(true); var serie = m_Series.GetSerie(serieIndex); var radar = m_Radars[serie.radarIndex]; - var serieData = serie.GetSerieData(m_Tooltip.dataIndex[1]); + var serieData = serie.GetSerieData(m_Tooltip.runtimeDataIndex[1]); StringBuilder sb = new StringBuilder(serieData.name); for (int i = 0; i < radar.indicatorList.Count; i++) { @@ -511,13 +511,13 @@ namespace XCharts } m_Tooltip.UpdateContentText(sb.ToString()); var pos = m_Tooltip.GetContentPos(); - if (pos.x + m_Tooltip.width > chartWidth) + if (pos.x + m_Tooltip.runtimeWidth > chartWidth) { - pos.x = chartWidth - m_Tooltip.width; + pos.x = chartWidth - m_Tooltip.runtimeWidth; } - if (pos.y - m_Tooltip.height < 0) + if (pos.y - m_Tooltip.runtimeHeight < 0) { - pos.y = m_Tooltip.height; + pos.y = m_Tooltip.runtimeHeight; } m_Tooltip.UpdateContentPos(pos); } diff --git a/Runtime/Utility/ChartHelper.cs b/Runtime/Utility/ChartHelper.cs index 4fb650a5..20243ff6 100644 --- a/Runtime/Utility/ChartHelper.cs +++ b/Runtime/Utility/ChartHelper.cs @@ -190,7 +190,7 @@ namespace XCharts return btnObj.GetComponent public float min { get { return m_Min; } set { m_Min = value; } } /// - /// Specfy a color the the indicator. - /// 标签特定的颜色。默认取自主题的axisTextColor。 + /// the style of text. + /// 文本样式。 /// - public Color color { get { return m_Color; } set { m_Color = value; } } + public TextStyle textStyle { get { return m_TextStyle; } set { m_TextStyle = value; } } /// /// the text conponent of indicator. /// 指示器的文本组件。 @@ -72,7 +87,7 @@ namespace XCharts m_Name = name, m_Max = max, m_Min = min, - m_Color = color + m_TextStyle = textStyle.Clone() }; } @@ -99,7 +114,7 @@ namespace XCharts return false; } return m_Name.Equals(other.name) && - ChartHelper.IsValueEqualsColor(m_Color, other.color); + m_TextStyle.Equals(other.textStyle); } public override int GetHashCode() @@ -114,6 +129,8 @@ namespace XCharts [SerializeField] private LineStyle m_LineStyle = new LineStyle(); [SerializeField] private AxisSplitArea m_SplitArea = AxisSplitArea.defaultSplitArea; [SerializeField] private bool m_Indicator = true; + [SerializeField] private PositionType m_PositionType = PositionType.Vertice; + [SerializeField] private float m_IndicatorGap = 10; [SerializeField] private List m_IndicatorList = new List(); /// /// Radar render type, in which 'Polygon' and 'Circle' are supported. @@ -153,6 +170,14 @@ namespace XCharts /// public bool indicator { get { return m_Indicator; } set { m_Indicator = value; } } /// + /// 指示器和雷达的间距。 + /// + public float indicatorGap { get { return m_IndicatorGap; } set { m_IndicatorGap = value; } } + /// + /// 指示器显示位置类型。 + /// + public PositionType positionType { get { return m_PositionType; } set { m_PositionType = value; } } + /// /// the indicator list. /// 指示器列表。 /// @@ -168,6 +193,7 @@ namespace XCharts /// 雷达图的运行时实际半径。 /// public float runtimeRadius { get; internal set; } + public float runtimeDataRadius { get; internal set; } /// /// the data position list of radar. /// 雷达图的所有数据坐标点列表。 @@ -216,12 +242,14 @@ namespace XCharts { var radar = new Radar(); radar.shape = shape; + radar.positionType = positionType; radar.radius = radius; radar.splitNumber = splitNumber; radar.center[0] = center[0]; radar.center[1] = center[1]; radar.indicatorList.Clear(); radar.indicator = indicator; + radar.indicatorGap = indicatorGap; foreach (var d in indicatorList) radar.indicatorList.Add(d.Clone()); return radar; } @@ -250,10 +278,12 @@ namespace XCharts } return radius == other.radius && shape == other.shape && + positionType == other.positionType && splitNumber == other.splitNumber && center[0] == other.center[0] && center[1] == other.center[1] && indicator == other.indicator && + indicatorGap == other.indicatorGap && IsEqualsIndicatorList(indicatorList, other.indicatorList); } @@ -359,14 +389,32 @@ namespace XCharts { runtimeRadius = radius; } + if (shape == Radar.Shape.Polygon && positionType == PositionType.Between) + { + var angle = Mathf.PI / indicatorList.Count; + runtimeDataRadius = runtimeRadius * Mathf.Cos(angle); + } + else + { + runtimeDataRadius = runtimeRadius; + } } public Vector3 GetIndicatorPosition(int index) { int indicatorNum = indicatorList.Count; - var angle = 2 * Mathf.PI / indicatorNum * index; - var x = runtimeCenterPos.x + runtimeRadius * Mathf.Sin(angle); - var y = runtimeCenterPos.y + runtimeRadius * Mathf.Cos(angle); + var angle = 0f; + switch (positionType) + { + case PositionType.Vertice: + angle = 2 * Mathf.PI / indicatorNum * index; + break; + case PositionType.Between: + angle = 2 * Mathf.PI / indicatorNum * (index + 0.5f); + break; + } + var x = runtimeCenterPos.x + (runtimeRadius + indicatorGap) * Mathf.Sin(angle); + var y = runtimeCenterPos.y + (runtimeRadius + indicatorGap) * Mathf.Cos(angle); return new Vector3(x, y); } } diff --git a/Runtime/Component/Sub/TextStyle.cs b/Runtime/Component/Sub/TextStyle.cs new file mode 100644 index 00000000..31a68656 --- /dev/null +++ b/Runtime/Component/Sub/TextStyle.cs @@ -0,0 +1,129 @@ +using System.Threading; +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using System; +using UnityEngine; + +namespace XCharts +{ + /// + /// Settings related to text. + /// 文本的相关设置。 + /// + [Serializable] + public class TextStyle : SubComponent, IEquatable + { + [SerializeField] private float m_Rotate = 0; + [SerializeField] private Vector2 m_Offset = Vector2.zero; + [SerializeField] private Color m_Color = Color.clear; + [SerializeField] private int m_FontSize = 18; + [SerializeField] private FontStyle m_FontStyle = FontStyle.Normal; + + /// + /// Rotation of text. + /// 文本的旋转。 + /// + public float rotate { get { return m_Rotate; } set { m_Rotate = value; } } + /// + /// the offset of position. + /// 坐标偏移。 + /// + public Vector2 offset { get { return m_Offset; } set { m_Offset = value; } } + + /// + /// the color of text. + /// 文本的颜色。 + /// + public Color color { get { return m_Color; } set { m_Color = value; } } + /// + /// font size. + /// 文本字体大小。 + /// + public int fontSize { get { return m_FontSize; } set { m_FontSize = value; } } + /// + /// font style. + /// 文本字体的风格。 + /// + public FontStyle fontStyle { get { return m_FontStyle; } set { m_FontStyle = value; } } + + public TextStyle() + { + } + + public TextStyle(int fontSize) + { + this.fontSize = fontSize; + } + + public TextStyle(int fontSize, FontStyle fontStyle) + { + this.fontSize = fontSize; + this.fontStyle = fontStyle; + } + + public TextStyle(int fontSize, FontStyle fontStyle, Color color) + { + this.fontSize = fontSize; + this.fontStyle = fontStyle; + this.color = color; + } + + public TextStyle(int fontSize, FontStyle fontStyle, Color color, int rorate) + { + this.fontSize = fontSize; + this.fontStyle = fontStyle; + this.color = color; + this.rotate = rotate; + } + + public TextStyle Clone() + { + var textStyle = new TextStyle(); + textStyle.rotate = rotate; + textStyle.color = color; + textStyle.fontSize = fontSize; + textStyle.fontStyle = fontStyle; + textStyle.offset = offset; + return textStyle; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(null, obj)) + { + return false; + } + else if (obj is TextStyle) + { + return Equals((TextStyle)obj); + } + else + { + return false; + } + } + + public bool Equals(TextStyle other) + { + if (ReferenceEquals(null, other)) + { + return false; + } + return rotate == other.rotate && + fontSize == other.fontSize && + fontStyle == other.fontStyle && + offset == other.offset && + ChartHelper.IsValueEqualsColor(m_Color, other.color); + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + } +} \ No newline at end of file diff --git a/Runtime/Component/Sub/TextStyle.cs.meta b/Runtime/Component/Sub/TextStyle.cs.meta new file mode 100644 index 00000000..c429b3bd --- /dev/null +++ b/Runtime/Component/Sub/TextStyle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e8f6b652968894ab195666501dda672c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Internal/SerieLabelPool.cs b/Runtime/Internal/SerieLabelPool.cs index 8e863aac..e8704857 100644 --- a/Runtime/Internal/SerieLabelPool.cs +++ b/Runtime/Internal/SerieLabelPool.cs @@ -17,7 +17,7 @@ namespace XCharts public static GameObject Get(string name, Transform parent, SerieLabel label, Font font, Color color, SerieData serieData) { GameObject element; - if (m_Stack.Count == 0) + if (m_Stack.Count == 0 || !Application.isPlaying) { element = ChartHelper.AddSerieLabel(name, parent, font, color, label.backgroundColor, label.fontSize, label.fontStyle, label.rotate, @@ -39,7 +39,8 @@ namespace XCharts ChartHelper.SetActive(element, false); //if (m_Stack.Count > 0 && ReferenceEquals(m_Stack.Peek(), element)) // Debug.LogError("Internal error. Trying to destroy object that is already released to pool." + element.name); - m_Stack.Push(element); + if (Application.isPlaying) + m_Stack.Push(element); } public static void ReleaseAll(Transform parent) diff --git a/Runtime/RadarChart.cs b/Runtime/RadarChart.cs index b9f0169b..e2fc66c6 100644 --- a/Runtime/RadarChart.cs +++ b/Runtime/RadarChart.cs @@ -20,12 +20,10 @@ namespace XCharts { private const string INDICATOR_TEXT = "indicator"; - //[SerializeField] private Radar radar = Radar.defaultRadar; [SerializeField] private List m_Radars = new List(); private List m_CheckRadars = new List(); private bool m_IsEnterLegendButtom; - //public Radar radar { get { return radar; } } public List radars { get { return m_Radars; } } /// @@ -110,30 +108,31 @@ namespace XCharts var indicator = radar.indicatorList[i]; var pos = radar.GetIndicatorPosition(i); TextAnchor anchor = TextAnchor.MiddleCenter; + var textStyle = indicator.textStyle; + var textColor = textStyle.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : textStyle.color; + var txt = ChartHelper.AddTextObject(INDICATOR_TEXT + "_" + n + "_" + i, transform, m_ThemeInfo.font, + textColor, anchor, new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), + new Vector2(txtWid, txtHig), textStyle.fontSize, textStyle.rotate, textStyle.fontStyle); + txt.text = radar.indicatorList[i].name; + txt.gameObject.SetActive(radar.indicator); + var txtWidth = txt.preferredWidth; + var sizeDelta = new Vector2(txt.preferredWidth, txt.preferredHeight); + txt.GetComponent().sizeDelta = sizeDelta; var diff = pos.x - radar.runtimeCenterPos.x; - if (diff < -1f) + if (diff < -1f) //left { - pos = new Vector3(pos.x - 5, pos.y); - anchor = TextAnchor.MiddleRight; + pos = new Vector3(pos.x - txtWidth / 2, pos.y); } - else if (diff > 1f) + else if (diff > 1f) //right { - anchor = TextAnchor.MiddleLeft; - pos = new Vector3(pos.x + txtWid + 5, pos.y); + pos = new Vector3(pos.x + txtWidth / 2, pos.y); } else { - anchor = TextAnchor.MiddleCenter; float y = pos.y > radar.runtimeCenterPos.y ? pos.y + txtHig / 2 : pos.y - txtHig / 2; - pos = new Vector3(pos.x + txtWid / 2, y); + pos = new Vector3(pos.x, y); } - var textColor = indicator.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : indicator.color; - Text txt = ChartHelper.AddTextObject(INDICATOR_TEXT + "_" + n + "_" + i, transform, m_ThemeInfo.font, - textColor, anchor, Vector2.zero, Vector2.zero, new Vector2(1, 0.5f), - new Vector2(txtWid, txtHig)); - txt.transform.localPosition = pos; - txt.text = radar.indicatorList[i].name; - txt.gameObject.SetActive(radar.indicator); + txt.transform.localPosition = pos + new Vector3(textStyle.offset.x, textStyle.offset.y); } } } @@ -269,9 +268,9 @@ namespace XCharts serie.GetMinMaxData(n, out min, out max); min = radar.GetIndicatorMin(n); } - var radius = max < 0 ? radar.runtimeRadius - radar.runtimeRadius * value / max - : radar.runtimeRadius * value / max; - var currAngle = n * angle; + var radius = max < 0 ? radar.runtimeDataRadius - radar.runtimeDataRadius * value / max + : radar.runtimeDataRadius * value / max; + var currAngle = (n + (radar.positionType == Radar.PositionType.Between ? 0.5f : 0)) * angle; radius *= rate; if (n == 0) { diff --git a/Runtime/Utility/ChartHelper.cs b/Runtime/Utility/ChartHelper.cs index 415b97a7..c92ab1c4 100644 --- a/Runtime/Utility/ChartHelper.cs +++ b/Runtime/Utility/ChartHelper.cs @@ -156,15 +156,13 @@ namespace XCharts Text txt = GetOrAddComponent(txtObj); txt.font = font; txt.fontSize = fontSize; + txt.fontStyle = fontStyle; txt.text = "Text"; txt.alignment = anchor; txt.horizontalOverflow = HorizontalWrapMode.Overflow; txt.verticalOverflow = VerticalWrapMode.Overflow; txt.color = color; - if (rotate > 0) - { - txtObj.transform.localEulerAngles = new Vector3(0, 0, rotate); - } + txtObj.transform.localEulerAngles = new Vector3(0, 0, rotate); RectTransform rect = GetOrAddComponent(txtObj); rect.localPosition = Vector3.zero; From dd1416e49e8cf79b2cf321c4291615cbe186ce43 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 5 Nov 2019 19:20:06 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E5=8F=91=E5=B8=831.0.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- Documentation/XCharts配置项手册.md | 39 ++++++++++++++++++++++++++++++ Runtime/Component/Main/Radar.cs | 2 +- Runtime/Utility/XChartsMgr.cs | 4 +-- package.json | 2 +- version.json | 6 ++--- 6 files changed, 47 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc19c72f..8c33dca0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # 更新日志 -* (2019.11.05) 增加`Radar`雷达组件更多样式配置参数支持，如`positionType`,`rotate`,`fontSize`,`fontStyle`,`offset`等 +* (2019.11.05) 增加`Radar`雷达组件文本样式参数配置支持 * (2019.11.04) 修复`Unity2018.3`以下版本代码不兼容的问题 * (2019.11.04) 优化`SerieLabel`过多时引起的性能问题 * (2019.11.03) 发布`v1.0.3`版本 diff --git a/Documentation/XCharts配置项手册.md b/Documentation/XCharts配置项手册.md index 9d9ef82a..e16b85ca 100644 --- a/Documentation/XCharts配置项手册.md +++ b/Documentation/XCharts配置项手册.md @@ -10,6 +10,7 @@ * [DataZoom 区域缩放](#DataZoom) * [Grid 网格](#Grid) * [Legend 图例](#Legend) +* [Radar 雷达](#Radar) * [Series 系列](#Series) * [Settings 设置](#Settings) * [Theme 主题](#Theme) @@ -34,6 +35,7 @@ * [SerieData 数据项](#SerieData) * [SerieLabel 图形上的文本标签](#SerieLabel) * [SerieSymbol 图形标记](#SerieSymbol) +* [TextStyle 文本样式](#TextStyle) ## `Theme` @@ -115,6 +117,43 @@ * `GetData(int index)`：获得指定索引的图例。 * `GetIndex(string legendName)`：获得指定图例的索引。 +## `Radar` + +--- + +* `shape`：雷达图绘制类型。 + * `Polygon`：多边形。 + * `Circle`：圆形。 +* `positionType`：显示位置类型。 + * `Vertice`：显示在顶点处。 + * `Between`：显示在顶点之间。 +* `radius`：雷达图的半径。 +* `center`：雷达图的中心点。数组的第一项是横坐标，第二项是纵坐标。当值为0-1之间时表示百分比，设置成百分比时第一项是相对于容器宽度，第二项是相对于容器高度。 +* `lineStyle`：线条样式 [LineStyle](#LineStyle)。 +* `splitArea`：分割区域 [AxisSplitArea](#AxisSplitArea)。 +* `indicator`：是否显示指示器。 +* `indicatorGap`：指示器和雷达的间距。 +* `indicatorList`指示器列表 [Radar.Indicator](#Radar.Indicator)。 + +## `Radar.Indicator` + +--- + +* `name`：指示器名称。 +* `max`：指示器的最大值，默认为 0 无限制。 +* `min`：指示器的最小值，默认为 0 无限制。 +* `textStyle`：文本样式 [TextStyle](#TextStyle)。 + +## `TextStyle` + +--- + +* `rotate`：旋转。 +* `offset`：偏移。 +* `color`：颜色。 +* `fontSize`：字体大小。 +* `fontStyle`：字体风格。 + ## `Tooltip` --- diff --git a/Runtime/Component/Main/Radar.cs b/Runtime/Component/Main/Radar.cs index d942bbe4..0cef4db5 100644 --- a/Runtime/Component/Main/Radar.cs +++ b/Runtime/Component/Main/Radar.cs @@ -174,7 +174,7 @@ namespace XCharts /// public float indicatorGap { get { return m_IndicatorGap; } set { m_IndicatorGap = value; } } /// - /// 指示器显示位置类型。 + /// 显示位置类型。 /// public PositionType positionType { get { return m_PositionType; } set { m_PositionType = value; } } /// diff --git a/Runtime/Utility/XChartsMgr.cs b/Runtime/Utility/XChartsMgr.cs index 2602df21..e8675b8d 100644 --- a/Runtime/Utility/XChartsMgr.cs +++ b/Runtime/Utility/XChartsMgr.cs @@ -24,8 +24,8 @@ namespace XCharts public class XChartsMgr : MonoBehaviour { - public const string version = "1.0.3"; - public const int date = 20191103; + public const string version = "1.0.4"; + public const int date = 20191105; [SerializeField] private string m_NowVersion; [SerializeField] private string m_NewVersion; diff --git a/package.json b/package.json index ed2deb24..5d4ed075 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.monitor1394.xcharts", "displayName": "XCharts", - "version": "1.0.3", + "version": "1.0.4", "unity": "2018.3", "description": "A charting and data visualization library for Unity.", "keywords": [ diff --git a/version.json b/version.json index 04a82307..8725cd6d 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { - "version": "1.0.3", - "date": "20191103", - "checkdate": "20191103", + "version": "1.0.4", + "date": "20191105", + "checkdate": "20191105", "desc": "欢迎 Github 上点 Star 支持，非常感谢！", "homepage": "https://github.com/monitor1394/unity-ugui-XCharts" } \ No newline at end of file From ff4f682a7b4e74f8bb77d980116788afd673cd64 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Sat, 9 Nov 2019 07:00:58 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E7=A6=BB=E4=B8=BAXCharts=E5=92=8CXChartsDemo?= =?UTF-8?q?=E4=B8=A4=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 + Demo.meta | 2 - Demo/Editor.meta | 8 - Demo/Editor/ChartModuleDrawer.cs | 45 - Demo/Editor/ChartModuleDrawer.cs.meta | 11 - Demo/Editor/DemoEditor.cs | 66 - Demo/Editor/DemoEditor.cs.meta | 11 - Demo/Editor/XCharts.Editor.Demo.asmdef | 17 - Demo/Editor/XCharts.Editor.Demo.asmdef.meta | 7 - Demo/Runtime/Demo.cs | 197 - Demo/Runtime/Demo.cs.meta | 11 - Demo/demo_xchart.unity | 630494 ----------------- Demo/demo_xchart.unity.meta | 9 - 13 files changed, 2 insertions(+), 630878 deletions(-) delete mode 100644 Demo/Editor.meta delete mode 100644 Demo/Editor/ChartModuleDrawer.cs delete mode 100644 Demo/Editor/ChartModuleDrawer.cs.meta delete mode 100644 Demo/Editor/DemoEditor.cs delete mode 100644 Demo/Editor/DemoEditor.cs.meta delete mode 100644 Demo/Editor/XCharts.Editor.Demo.asmdef delete mode 100644 Demo/Editor/XCharts.Editor.Demo.asmdef.meta delete mode 100644 Demo/Runtime/Demo.cs delete mode 100644 Demo/Runtime/Demo.cs.meta delete mode 100644 Demo/demo_xchart.unity delete mode 100644 Demo/demo_xchart.unity.meta diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c33dca0..15f7ff60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # 更新日志 +* (2019.11.09) 优化结构，分离为`XCharts`和`XChartsDemo`两部分 +* (2019.11.05) 发布`v1.0.4`版本 * (2019.11.05) 增加`Radar`雷达组件文本样式参数配置支持 * (2019.11.04) 修复`Unity2018.3`以下版本代码不兼容的问题 * (2019.11.04) 优化`SerieLabel`过多时引起的性能问题 diff --git a/Demo.meta b/Demo.meta index 24e0f666..2976fd1f 100644 --- a/Demo.meta +++ b/Demo.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 guid: 5e6b0fb015bc6524d8bab146b6f2ba3a folderAsset: yes -timeCreated: 1553641866 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Demo/Editor.meta b/Demo/Editor.meta deleted file mode 100644 index 1896fb2f..00000000 --- a/Demo/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05b7d15b7a92f4c1eb56dbf47522bf6c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Demo/Editor/ChartModuleDrawer.cs b/Demo/Editor/ChartModuleDrawer.cs deleted file mode 100644 index 1a609b4a..00000000 --- a/Demo/Editor/ChartModuleDrawer.cs +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************/ -/* */ -/* Copyright (c) 2018 monitor1394 */ -/* https://github.com/monitor1394 */ -/* */ -/******************************************/ - -using UnityEditor; -using UnityEngine; - -namespace XCharts -{ - [CustomPropertyDrawer(typeof(ChartModule), true)] - public class ChartModuleDrawer : PropertyDrawer - { - public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label) - { - Rect drawRect = pos; - drawRect.height = EditorGUIUtility.singleLineHeight; - var lastX = drawRect.x; - var lastWid = drawRect.width; - SerializedProperty m_Name = prop.FindPropertyRelative("m_Name"); - SerializedProperty m_Title = prop.FindPropertyRelative("m_Title"); - SerializedProperty m_Selected = prop.FindPropertyRelative("m_Selected"); - SerializedProperty m_Panel = prop.FindPropertyRelative("m_Panel"); - var fieldWid = EditorGUIUtility.currentViewWidth - 30 - 5 - 50 - 90; - drawRect.width = 15; - EditorGUI.PropertyField(drawRect,m_Selected,GUIContent.none); - drawRect.x += 15; - drawRect.width = 50; - EditorGUI.PropertyField(drawRect,m_Name,GUIContent.none); - drawRect.x += 52; - drawRect.width = fieldWid; - EditorGUI.PropertyField(drawRect,m_Title,GUIContent.none); - drawRect.x += fieldWid + 2; - drawRect.width = 90; - EditorGUI.PropertyField(drawRect,m_Panel,GUIContent.none); - } - - public override float GetPropertyHeight(SerializedProperty prop, GUIContent label) - { - return 1 * EditorGUIUtility.singleLineHeight + 1 * EditorGUIUtility.standardVerticalSpacing; - } - } -} \ No newline at end of file diff --git a/Demo/Editor/ChartModuleDrawer.cs.meta b/Demo/Editor/ChartModuleDrawer.cs.meta deleted file mode 100644 index df5c8c51..00000000 --- a/Demo/Editor/ChartModuleDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2fbbaed3e670f478c844c1bdfc73d433 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Demo/Editor/DemoEditor.cs b/Demo/Editor/DemoEditor.cs deleted file mode 100644 index f2928fc5..00000000 --- a/Demo/Editor/DemoEditor.cs +++ /dev/null @@ -1,66 +0,0 @@ - -/******************************************/ -/* */ -/* Copyright (c) 2018 monitor1394 */ -/* https://github.com/monitor1394 */ -/* */ -/******************************************/ - -using UnityEditor; - -namespace XCharts -{ - /// - /// Editor class used to edit UI BaseChart. - /// - - [CustomEditor(typeof(Demo), false)] - public class DemoEditor : Editor - { - protected Demo m_Target; - protected SerializedProperty m_Script; - protected SerializedProperty m_ButtonNormalColor; - protected SerializedProperty m_ButtonSelectedColor; - protected SerializedProperty m_ButtonHighlightColor; - protected SerializedProperty m_ChartModule; - protected virtual void OnEnable() - { - m_Target = (Demo)target; - m_Script = serializedObject.FindProperty("m_Script"); - m_ButtonNormalColor = serializedObject.FindProperty("m_ButtonNormalColor"); - m_ButtonSelectedColor = serializedObject.FindProperty("m_ButtonSelectedColor"); - m_ButtonHighlightColor = serializedObject.FindProperty("m_ButtonHighlightColor"); - m_ChartModule = serializedObject.FindProperty("m_ChartModule"); - - } - - public override void OnInspectorGUI() - { - if (m_Target == null && target == null) - { - base.OnInspectorGUI(); - return; - } - serializedObject.Update(); - EditorGUILayout.PropertyField(m_ButtonNormalColor); - EditorGUILayout.PropertyField(m_ButtonSelectedColor); - EditorGUILayout.PropertyField(m_ButtonHighlightColor); - - var size = m_ChartModule.arraySize; - size = EditorGUILayout.IntField("Chart Module Size", size); - if (size != m_ChartModule.arraySize) - { - while (size > m_ChartModule.arraySize) - m_ChartModule.InsertArrayElementAtIndex(m_ChartModule.arraySize); - while (size < m_ChartModule.arraySize) - m_ChartModule.DeleteArrayElementAtIndex(m_ChartModule.arraySize - 1); - } - for (int i = 0; i < size; i++) - { - EditorGUILayout.PropertyField(m_ChartModule.GetArrayElementAtIndex(i)); - } - - serializedObject.ApplyModifiedProperties(); - } - } -} \ No newline at end of file diff --git a/Demo/Editor/DemoEditor.cs.meta b/Demo/Editor/DemoEditor.cs.meta deleted file mode 100644 index 0e512df0..00000000 --- a/Demo/Editor/DemoEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 90c1787bea03849c8b6d19be625b7e17 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Demo/Editor/XCharts.Editor.Demo.asmdef b/Demo/Editor/XCharts.Editor.Demo.asmdef deleted file mode 100644 index ebf6f8e5..00000000 --- a/Demo/Editor/XCharts.Editor.Demo.asmdef +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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/Demo/Editor/XCharts.Editor.Demo.asmdef.meta b/Demo/Editor/XCharts.Editor.Demo.asmdef.meta deleted file mode 100644 index 67d354f5..00000000 --- a/Demo/Editor/XCharts.Editor.Demo.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2d3606aaaf73f468984f4615b496f408 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Demo/Runtime/Demo.cs b/Demo/Runtime/Demo.cs deleted file mode 100644 index d2777332..00000000 --- a/Demo/Runtime/Demo.cs +++ /dev/null @@ -1,197 +0,0 @@ -/******************************************/ -/* */ -/* 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.DestroyAllChildren(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 public float runtimePieDataTotal { get; internal set; } + internal int runtimeLastCheckDataCount { get; set; } internal List GetUpSmoothList(int dataIndex, int size = 100) { diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index d60234e4..0d4db010 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -289,7 +289,6 @@ namespace XCharts { var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); - //ChartHelper.DestroyAllChildren(labelObject.transform); SerieLabelPool.ReleaseAll(labelObject.transform); int count = 0; for (int i = 0; i < m_Series.Count; i++) @@ -484,6 +483,14 @@ namespace XCharts protected void CheckRefreshLabel() { + foreach (var serie in m_Series.list) + { + if (serie.label.show && serie.runtimeLastCheckDataCount != serie.dataCount) + { + m_ReinitLabel = true; + serie.runtimeLastCheckDataCount = serie.dataCount; + } + } if (m_ReinitLabel) { m_ReinitLabel = false; diff --git a/Runtime/PieChart.cs b/Runtime/PieChart.cs index a0226d6d..3c700a5e 100644 --- a/Runtime/PieChart.cs +++ b/Runtime/PieChart.cs @@ -387,6 +387,7 @@ namespace XCharts protected void UpdateLabelPostion(Serie serie, SerieData serieData) { + if (serieData.labelText == null) return; var currAngle = serieData.runtimePieHalfAngle; var currRad = currAngle * Mathf.Deg2Rad; var offsetRadius = serieData.runtimePieOffsetRadius; From 3eb632844fa3271caa6b2fb3106c79cf3a368945 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 11 Nov 2019 09:24:24 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A5=BC=E5=9B=BE?= =?UTF-8?q?=E5=BD=93=E6=95=B0=E6=8D=AE=E8=BF=87=E5=B0=8F=E6=97=B6=E8=A7=86?= =?UTF-8?q?=E8=A7=89=E5=BC=95=E5=AF=BC=E7=BA=BF=E4=BC=9A=E7=A9=BF=E9=80=8F?= =?UTF-8?q?=E7=9A=84=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/PieChart.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Runtime/PieChart.cs b/Runtime/PieChart.cs index 3c700a5e..c8f20146 100644 --- a/Runtime/PieChart.cs +++ b/Runtime/PieChart.cs @@ -225,6 +225,8 @@ namespace XCharts serie.runtimePieOutsideRadius : outSideRadius; var radius2 = serie.runtimePieOutsideRadius + serie.label.lineLength1; var radius3 = insideRadius + (outSideRadius - insideRadius) / 2; + if (radius1 < serie.runtimePieInsideRadius) radius1 = serie.runtimePieInsideRadius; + radius1 -= 0.1f; var pos0 = new Vector3(center.x + radius3 * currSin, center.y + radius3 * currCos); var pos1 = new Vector3(center.x + radius1 * currSin, center.y + radius1 * currCos); var pos2 = new Vector3(center.x + radius2 * currSin, center.y + radius2 * currCos); From 6d8e6992f164305ae28754ccca8ef7e416bfb9af Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 11 Nov 2019 09:37:31 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=8A=E8=A6=86=E7=9B=96Label?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/BaseChart.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 0d4db010..28fdded0 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -313,6 +313,7 @@ namespace XCharts var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serie.label, m_ThemeInfo.font, color, serieData); var iconObj = labelObj.transform.Find("Icon").gameObject; serieData.SetIconObj(iconObj); + iconObj.GetComponent().SetSiblingIndex(0); var isAutoSize = serie.label.backgroundWidth == 0 || serie.label.backgroundHeight == 0; serieData.InitLabel(labelObj, isAutoSize, serie.label.paddingLeftRight, serie.label.paddingTopBottom); From 6e8d65cb343ef968068a95dc600c23f728f386d1 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 12 Nov 2019 07:38:02 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0IconStyle=E5=AD=90?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96SerieData=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/PropertyDrawers/IconStyleDrawer.cs | 67 +++++++++++ .../PropertyDrawers/IconStyleDrawer.cs.meta | 11 ++ Editor/PropertyDrawers/SerieDrawer.cs | 65 +++++------ Editor/PropertyDrawers/TextStyleDrawer.cs | 2 +- Editor/Utility/ChartEditorHelper.cs | 2 +- Runtime/Component/Main/Serie.cs | 18 +-- Runtime/Component/Sub/IconStyle.cs | 105 ++++++++++++++++++ Runtime/Component/Sub/IconStyle.cs.meta | 11 ++ Runtime/Component/Sub/SerieData.cs | 65 +++-------- Runtime/Internal/BaseChart.cs | 5 +- Runtime/Internal/CoordinateChart.cs | 2 +- Runtime/Internal/SerieLabelPool.cs | 2 +- Runtime/PieChart.cs | 2 +- 13 files changed, 250 insertions(+), 107 deletions(-) create mode 100644 Editor/PropertyDrawers/IconStyleDrawer.cs create mode 100644 Editor/PropertyDrawers/IconStyleDrawer.cs.meta create mode 100644 Runtime/Component/Sub/IconStyle.cs create mode 100644 Runtime/Component/Sub/IconStyle.cs.meta diff --git a/Editor/PropertyDrawers/IconStyleDrawer.cs b/Editor/PropertyDrawers/IconStyleDrawer.cs new file mode 100644 index 00000000..b90773fc --- /dev/null +++ b/Editor/PropertyDrawers/IconStyleDrawer.cs @@ -0,0 +1,67 @@ +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace XCharts +{ + [CustomPropertyDrawer(typeof(IconStyle), true)] + public class IconStyleDrawer : PropertyDrawer + { + private Dictionary m_IconStyleToggle = new Dictionary(); + + public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label) + { + Rect drawRect = pos; + drawRect.height = EditorGUIUtility.singleLineHeight; + SerializedProperty m_Show = prop.FindPropertyRelative("m_Show"); + SerializedProperty m_Layer = prop.FindPropertyRelative("m_Layer"); + SerializedProperty m_Sprite = prop.FindPropertyRelative("m_Sprite"); + SerializedProperty m_Color = prop.FindPropertyRelative("m_Color"); + SerializedProperty m_Width = prop.FindPropertyRelative("m_Width"); + SerializedProperty m_Height = prop.FindPropertyRelative("m_Height"); + SerializedProperty m_Offset = prop.FindPropertyRelative("m_Offset"); + ChartEditorHelper.MakeFoldout(ref drawRect, ref m_IconStyleToggle, prop, null, m_Show, false); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + if (ChartEditorHelper.IsToggle(m_IconStyleToggle, prop)) + { + ++EditorGUI.indentLevel; + + EditorGUI.PropertyField(drawRect, m_Layer); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Sprite); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Color); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Width); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Height); + drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Offset); + drawRect.y += EditorGUI.GetPropertyHeight(m_Offset); + --EditorGUI.indentLevel; + } + } + + public override float GetPropertyHeight(SerializedProperty prop, GUIContent label) + { + if (ChartEditorHelper.IsToggle(m_IconStyleToggle, prop)) + { + var hight = 6 * EditorGUIUtility.singleLineHeight + 6 * EditorGUIUtility.standardVerticalSpacing; + hight += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Offset")); + hight += EditorGUIUtility.standardVerticalSpacing; + return hight; + } + else + { + return EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + } + } + } +} \ No newline at end of file diff --git a/Editor/PropertyDrawers/IconStyleDrawer.cs.meta b/Editor/PropertyDrawers/IconStyleDrawer.cs.meta new file mode 100644 index 00000000..fb19ace6 --- /dev/null +++ b/Editor/PropertyDrawers/IconStyleDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9cae26ad61d224d8a97d41bdc52ec0b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Editor/PropertyDrawers/SerieDrawer.cs b/Editor/PropertyDrawers/SerieDrawer.cs index f243e32e..367683b7 100644 --- a/Editor/PropertyDrawers/SerieDrawer.cs +++ b/Editor/PropertyDrawers/SerieDrawer.cs @@ -173,7 +173,7 @@ namespace XCharts { EditorGUI.indentLevel++; - float nameWid = 40; + float nameWid = 42; EditorGUI.PropertyField(new Rect(drawRect.x, drawRect.y, pos.width - 2 * nameWid - 2, pos.height), m_DataDimension); var nameRect = new Rect(pos.width - 2 * nameWid + 14, drawRect.y, nameWid, pos.height); if (GUI.Button(nameRect, new GUIContent("Name"))) @@ -181,7 +181,7 @@ namespace XCharts m_ShowDataName.boolValue = !m_ShowDataName.boolValue; } var iconRect = new Rect(pos.width - nameWid + 14, drawRect.y, nameWid, pos.height); - if (GUI.Button(iconRect, new GUIContent("Icon"))) + if (GUI.Button(iconRect, new GUIContent("Other"))) { m_ShowDataIcon.boolValue = !m_ShowDataIcon.boolValue; } @@ -232,7 +232,7 @@ namespace XCharts } private void DrawDataElement(ref Rect drawRect, int dimension, SerializedProperty m_Datas, bool showName, - bool showIconDetail, bool showSelected, int index, float currentWidth) + bool showDetail, bool showSelected, int index, float currentWidth) { var lastX = drawRect.x; var lastWid = drawRect.width; @@ -253,7 +253,7 @@ namespace XCharts if (showSelected) { drawRect.width = drawRect.width - 18; - EditorGUI.PropertyField(drawRect, element); + EditorGUI.PropertyField(drawRect, element, new GUIContent("Element " + index)); drawRect.x = currentWidth - 45; EditorGUI.PropertyField(drawRect, selected, GUIContent.none); drawRect.x = lastX; @@ -261,13 +261,14 @@ namespace XCharts } else { - EditorGUI.PropertyField(drawRect, element); + EditorGUI.PropertyField(drawRect, element, new GUIContent("Element " + index)); } drawRect.y += EditorGUI.GetPropertyHeight(element) + EditorGUIUtility.standardVerticalSpacing; } else { EditorGUI.LabelField(drawRect, "Element " + index); + Debug.LogError("Element " + index); var startX = drawRect.x + EditorGUIUtility.labelWidth - EditorGUI.indentLevel * 15; var dataWidTotal = (currentWidth - (startX + 20.5f + 1)); var dataWid = dataWidTotal / fieldCount; @@ -296,36 +297,12 @@ namespace XCharts EditorGUIUtility.fieldWidth = lastFieldWid; EditorGUIUtility.labelWidth = lastLabelWid; } - if (showIconDetail) + if (showDetail) { EditorGUI.indentLevel++; - var m_ShowIcon = serieData.FindPropertyRelative("m_ShowIcon"); - var m_IconImage = serieData.FindPropertyRelative("m_IconImage"); - var m_IconColor = serieData.FindPropertyRelative("m_IconColor"); - var m_IconWidth = serieData.FindPropertyRelative("m_IconWidth"); - var m_IconHeight = serieData.FindPropertyRelative("m_IconHeight"); - var m_IconOffset = serieData.FindPropertyRelative("m_IconOffset"); - EditorGUI.PropertyField(drawRect, m_ShowIcon); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - EditorGUI.PropertyField(drawRect, m_IconImage); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - EditorGUI.PropertyField(drawRect, m_IconColor); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - EditorGUI.PropertyField(drawRect, m_IconWidth); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - EditorGUI.PropertyField(drawRect, m_IconHeight); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - - EditorGUI.LabelField(drawRect, "Icon Offset"); - var startX = drawRect.x + EditorGUIUtility.labelWidth - EditorGUI.indentLevel * 15; - var tempWidth = (drawRect.width - startX + 72) / 2; - var centerXRect = new Rect(startX, drawRect.y, tempWidth, drawRect.height); - var centerYRect = new Rect(centerXRect.x + tempWidth - 58, drawRect.y, tempWidth, drawRect.height); - var x = EditorGUI.FloatField(centerXRect, m_IconOffset.vector3Value.x); - var y = EditorGUI.FloatField(centerYRect, m_IconOffset.vector3Value.y); - m_IconOffset.vector3Value = new Vector3(x, y); - drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; - + var m_Icon = serieData.FindPropertyRelative("m_IconStyle"); + EditorGUI.PropertyField(drawRect, m_Icon); + drawRect.y += EditorGUI.GetPropertyHeight(m_Icon); EditorGUI.indentLevel--; } } @@ -373,15 +350,25 @@ namespace XCharts if (m_DataFoldout[index]) { SerializedProperty m_Data = prop.FindPropertyRelative("m_Data"); - int num = m_Data.arraySize + 2; - if (num > 30) num = 15; + height += 2 * EditorGUIUtility.singleLineHeight + 1 * EditorGUIUtility.standardVerticalSpacing; + int num = m_Data.arraySize; + if (num > 30) + { + num = 11; + height += (num + 1) * EditorGUIUtility.singleLineHeight + (num) * EditorGUIUtility.standardVerticalSpacing; + } + else + { + height += (num) * EditorGUIUtility.singleLineHeight + (num - 1) * EditorGUIUtility.standardVerticalSpacing; + } if (prop.FindPropertyRelative("m_ShowDataIcon").boolValue) { - num *= 5; - num += 2; + for (int i = 0; i < num; i++) + { + var item = m_Data.GetArrayElementAtIndex(i); + height += EditorGUI.GetPropertyHeight(item.FindPropertyRelative("m_IconStyle")); + } } - height += num * EditorGUIUtility.singleLineHeight + (num - 1) * EditorGUIUtility.standardVerticalSpacing; - } if (m_ShowJsonDataArea) { diff --git a/Editor/PropertyDrawers/TextStyleDrawer.cs b/Editor/PropertyDrawers/TextStyleDrawer.cs index 3669d33c..38f9713e 100644 --- a/Editor/PropertyDrawers/TextStyleDrawer.cs +++ b/Editor/PropertyDrawers/TextStyleDrawer.cs @@ -14,7 +14,7 @@ namespace XCharts [CustomPropertyDrawer(typeof(TextStyle), true)] public class TextStyleDrawer : PropertyDrawer { - private Dictionary m_TextStyleToggle = new Dictionary(); + //private Dictionary m_TextStyleToggle = new Dictionary(); public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label) { diff --git a/Editor/Utility/ChartEditorHelper.cs b/Editor/Utility/ChartEditorHelper.cs index 6c86dacd..e83f4c20 100644 --- a/Editor/Utility/ChartEditorHelper.cs +++ b/Editor/Utility/ChartEditorHelper.cs @@ -114,7 +114,7 @@ public class ChartEditorHelper { if (showProp.propertyType == SerializedPropertyType.Boolean) { - drawRect.width = 60; + drawRect.width = 80; } else { diff --git a/Runtime/Component/Main/Serie.cs b/Runtime/Component/Main/Serie.cs index 1abb89b7..11556617 100644 --- a/Runtime/Component/Main/Serie.cs +++ b/Runtime/Component/Main/Serie.cs @@ -1028,7 +1028,7 @@ namespace XCharts { foreach (var data in m_Data) { - data.showIcon = flag; + data.iconStyle.show = flag; } } @@ -1042,7 +1042,7 @@ namespace XCharts if (dataIndex >= 0 && dataIndex < m_Data.Count) { var data = m_Data[dataIndex]; - data.showIcon = flag; + data.iconStyle.show = flag; } } @@ -1055,8 +1055,8 @@ namespace XCharts { foreach (var data in m_Data) { - data.iconWidth = width; - data.iconHeight = height; + data.iconStyle.width = width; + data.iconStyle.height = height; } } @@ -1070,7 +1070,7 @@ namespace XCharts if (dataIndex >= 0 && dataIndex < m_Data.Count) { var data = m_Data[dataIndex]; - data.iconImage = image; + data.iconStyle.sprite = image; } } @@ -1078,7 +1078,7 @@ namespace XCharts { foreach (var data in m_Data) { - if (data.showIcon) return true; + if (data.iconStyle.show) return true; } return false; } @@ -1094,8 +1094,8 @@ namespace XCharts if (dataIndex >= 0 && dataIndex < m_Data.Count) { var data = m_Data[dataIndex]; - data.iconWidth = width; - data.iconHeight = height; + data.iconStyle.width = width; + data.iconStyle.height = height; } } @@ -1109,7 +1109,7 @@ namespace XCharts if (dataIndex >= 0 && dataIndex < m_Data.Count) { var data = m_Data[dataIndex]; - data.iconColor = color; + data.iconStyle.color = color; } } diff --git a/Runtime/Component/Sub/IconStyle.cs b/Runtime/Component/Sub/IconStyle.cs new file mode 100644 index 00000000..8d665b0a --- /dev/null +++ b/Runtime/Component/Sub/IconStyle.cs @@ -0,0 +1,105 @@ +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using UnityEngine; +using UnityEngine.UI; + +namespace XCharts +{ + /// + /// 系列数据项的图标 + /// + [System.Serializable] + public class IconStyle : SubComponent + { + public enum Layer + { + UnderLabel, + AboveLabel + } + [SerializeField] private bool m_Show; + [SerializeField] private Layer m_Layer; + [SerializeField] private Sprite m_Sprite; + [SerializeField] private Color m_Color = Color.white; + [SerializeField] private float m_Width = 40; + [SerializeField] private float m_Height = 40; + [SerializeField] private Vector3 m_Offset; + + /// + /// Whether the data icon is show. + /// 是否显示图标。 + /// + public bool show { get { return m_Show; } set { m_Show = value; UpdateIcon(); } } + /// + /// 显示在上层还是在下层。 + /// + public Layer layer { get { return m_Layer; } set { m_Layer = value; } } + /// + /// The image of icon. + /// 图标的图片。 + /// + public Sprite sprite { get { return m_Sprite; } set { m_Sprite = value; } } + /// + /// 图标颜色。 + /// + public Color color { get { return m_Color; } set { m_Color = value; } } + /// + /// 图标宽。 + /// + public float width { get { return m_Width; } set { m_Width = value; } } + /// + /// 图标高。 + /// + public float height { get { return m_Height; } set { m_Height = value; } } + /// + /// 图标偏移。 + /// + public Vector3 offset { get { return m_Offset; } set { m_Offset = value; } } + + public Image image { get; private set; } + public RectTransform rect { get; private set; } + + public void SetImage(Image image) + { + this.image = image; + if (image) + { + rect = image.GetComponent(); + if (m_Layer == Layer.UnderLabel) + rect.SetSiblingIndex(0); + else + rect.SetSiblingIndex(image.transform.childCount - 1); + UpdateIcon(); + } + } + + public void SetActive(bool flag) + { + if (image) + { + ChartHelper.SetActive(image.gameObject, flag); + } + } + + public void UpdateIcon() + { + if (image == null) return; + if (show) + { + ChartHelper.SetActive(image.gameObject, true); + image.sprite = m_Sprite; + image.color = m_Color; + rect.sizeDelta = new Vector2(m_Width, m_Height); + image.transform.localPosition = m_Offset; + } + else + { + ChartHelper.SetActive(image.gameObject, false); + } + } + } +} diff --git a/Runtime/Component/Sub/IconStyle.cs.meta b/Runtime/Component/Sub/IconStyle.cs.meta new file mode 100644 index 00000000..53609daf --- /dev/null +++ b/Runtime/Component/Sub/IconStyle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 82c4d360f7b5b4ee7845e9bbe611c8a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/Component/Sub/SerieData.cs b/Runtime/Component/Sub/SerieData.cs index 0e2089f1..14be0cc4 100644 --- a/Runtime/Component/Sub/SerieData.cs +++ b/Runtime/Component/Sub/SerieData.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using System; namespace XCharts { @@ -22,13 +23,7 @@ namespace XCharts [SerializeField] private string m_Name; [SerializeField] private bool m_Selected; [SerializeField] private float m_Radius; - [SerializeField] private bool m_ShowIcon; - [SerializeField] private Sprite m_IconImage; - [SerializeField] private Color m_IconColor = Color.white; - [SerializeField] private float m_IconWidth = 40; - [SerializeField] private float m_IconHeight = 40; - [SerializeField] private Vector3 m_IconOffset; - + [SerializeField] private IconStyle m_IconStyle = new IconStyle(); [SerializeField] private List m_Data = new List(); private bool m_Show = true; @@ -58,32 +53,10 @@ namespace XCharts /// public bool selected { get { return m_Selected; } set { m_Selected = value; } } /// - /// Whether the data icon is show. - /// 是否显示图标。 + /// the icon of data. + /// 数据项图标样式。 /// - public bool showIcon { get { return m_ShowIcon; } set { m_ShowIcon = value; } } - /// - /// The image of icon. - /// 图标的图片。 - /// - public Sprite iconImage { get { return m_IconImage; } set { m_IconImage = value; } } - /// - /// 图标颜色。 - /// - public Color iconColor { get { return m_IconColor; } set { m_IconColor = value; } } - /// - /// 图标宽。 - /// - public float iconWidth { get { return m_IconWidth; } set { m_IconWidth = value; } } - /// - /// 图标高。 - /// - public float iconHeight { get { return m_IconHeight; } set { m_IconHeight = value; } } - /// - /// 图标偏移。 - /// - public Vector3 iconOffset { get { return m_IconOffset; } set { m_IconOffset = value; } } - + public IconStyle iconStyle { get { return m_IconStyle; } set { m_IconStyle = value; } } /// /// An arbitrary dimension data list of data item. /// 可指定任意维数的数值列表。 @@ -124,8 +97,7 @@ namespace XCharts /// 最小值。 /// public float min { get { return m_Data.Min(); } } - public Image icon { get; private set; } - public RectTransform iconRect { get; private set; } + /// /// 关联的gameObject /// @@ -238,28 +210,19 @@ namespace XCharts if (labelRect) labelRect.localPosition = position; } - public void SetIconObj(GameObject iconObj) + [Obsolete("Use SerieData.SetIconImage() instead.", true)] + public void SetIconObj(GameObject iconObj) { } + + public void SetIconImage(Image image) { - icon = iconObj.GetComponent(); - iconRect = iconObj.GetComponent(); - UpdateIcon(); + if (iconStyle == null) return; + iconStyle.SetImage(image); } public void UpdateIcon() { - if (icon == null) return; - if (m_ShowIcon) - { - ChartHelper.SetActive(icon.gameObject, true); - icon.sprite = m_IconImage; - icon.color = m_IconColor; - iconRect.sizeDelta = new Vector2(m_IconWidth, m_IconHeight); - icon.transform.localPosition = m_IconOffset; - } - else - { - ChartHelper.SetActive(icon.gameObject, false); - } + if (iconStyle == null) return; + iconStyle.UpdateIcon(); } } } diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 28fdded0..f4161c28 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -311,9 +311,8 @@ namespace XCharts (Color)m_ThemeInfo.GetColor(i); } var labelObj = SerieLabelPool.Get(textName, labelObject.transform, serie.label, m_ThemeInfo.font, color, serieData); - var iconObj = labelObj.transform.Find("Icon").gameObject; - serieData.SetIconObj(iconObj); - iconObj.GetComponent().SetSiblingIndex(0); + var iconImage = labelObj.transform.Find("Icon").GetComponent(); + serieData.SetIconImage(iconImage); var isAutoSize = serie.label.backgroundWidth == 0 || serie.label.backgroundHeight == 0; serieData.InitLabel(labelObj, isAutoSize, serie.label.paddingLeftRight, serie.label.paddingTopBottom); diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs index 5c35b927..f33ec5f1 100644 --- a/Runtime/Internal/CoordinateChart.cs +++ b/Runtime/Internal/CoordinateChart.cs @@ -1325,7 +1325,7 @@ namespace XCharts for (int j = 0; j < serie.data.Count; j++) { var serieData = serie.data[j]; - if (serie.label.show || serieData.showIcon) + if (serie.label.show || serieData.iconStyle.show) { var pos = serie.dataPoints[j]; var value = serieData.data[1]; diff --git a/Runtime/Internal/SerieLabelPool.cs b/Runtime/Internal/SerieLabelPool.cs index e8704857..2cbff214 100644 --- a/Runtime/Internal/SerieLabelPool.cs +++ b/Runtime/Internal/SerieLabelPool.cs @@ -22,7 +22,7 @@ namespace XCharts element = ChartHelper.AddSerieLabel(name, parent, font, color, label.backgroundColor, label.fontSize, label.fontStyle, label.rotate, label.backgroundWidth, label.backgroundHeight); - ChartHelper.AddIcon("Icon", element.transform, serieData.iconWidth, serieData.iconHeight); + ChartHelper.AddIcon("Icon", element.transform, serieData.iconStyle.width, serieData.iconStyle.height); } else { diff --git a/Runtime/PieChart.cs b/Runtime/PieChart.cs index c8f20146..9efa5f34 100644 --- a/Runtime/PieChart.cs +++ b/Runtime/PieChart.cs @@ -337,7 +337,7 @@ namespace XCharts var currAngle = serieData.runtimePieHalfAngle; var isHighlight = (serieData.highlighted && serie.emphasis.label.show); var showLabel = ((serie.label.show || isHighlight) && serieData.canShowLabel); - if (showLabel || serieData.showIcon) + if (showLabel || serieData.iconStyle.show) { serieData.SetLabelActive(showLabel); float rotate = 0; From abbc81df87a7430bde365c0f6d7c82f2e2743af3 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 12 Nov 2019 08:00:47 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`2018.3`=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E7=89=88=E6=9C=AC=E6=89=93=E5=BC=80=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15f7ff60..700c7317 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # 更新日志 +* (2019.11.12) 修复`2018.3`以下版本打开项目报错的问题 +* (2019.11.12) 增加`IconStyle`子组件，优化`SerieData`的图标配置 +* (2019.11.11) 修复`Serie`的图标显示在上层遮挡`Label`的问题 +* (2019.11.11) 修复饼图当数据过小时视觉引导线会穿透的的问题 +* (2019.11.09) 修复饼图添加数据时`Label`异常的问题 * (2019.11.09) 优化结构，分离为`XCharts`和`XChartsDemo`两部分 * (2019.11.05) 发布`v1.0.4`版本 * (2019.11.05) 增加`Radar`雷达组件文本样式参数配置支持 From 7f9a7ecf96e90859a3427d2b5f1026bdff82f00e Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 12 Nov 2019 09:49:25 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLabel=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/BaseChart.cs | 23 +++++++++++++++++------ Runtime/Internal/CoordinateChart.cs | 2 ++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index f4161c28..0679b554 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -54,12 +54,15 @@ namespace XCharts [NonSerialized] private Legend m_CheckLegend = Legend.defaultLegend; [NonSerialized] private float m_CheckWidth = 0; [NonSerialized] private float m_CheckHeight = 0; + [NonSerialized] private Vector2 m_CheckMinAnchor; + [NonSerialized] private Vector2 m_CheckMaxAnchor; + [NonSerialized] private float m_CheckSerieCount = 0; [NonSerialized] private List m_CheckSerieName = new List(); - [NonSerialized] private bool m_RefreshChart = false; - [NonSerialized] private bool m_RefreshLabel = false; - [NonSerialized] private bool m_ReinitLabel = false; - [NonSerialized] private bool m_CheckAnimation = false; + [NonSerialized] protected bool m_RefreshChart = false; + [NonSerialized] protected bool m_RefreshLabel = false; + [NonSerialized] protected bool m_ReinitLabel = false; + [NonSerialized] protected bool m_CheckAnimation = false; [NonSerialized] protected List m_LegendRealShowName = new List(); protected Vector2 chartAnchorMax { get { return rectTransform.anchorMax; } } @@ -287,8 +290,8 @@ namespace XCharts private void InitSerieLabel() { - var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, - chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); + var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, Vector2.zero, + Vector2.zero, Vector2.zero, new Vector2(chartWidth, chartHeight)); SerieLabelPool.ReleaseAll(labelObject.transform); int count = 0; for (int i = 0; i < m_Series.Count; i++) @@ -358,6 +361,13 @@ namespace XCharts { SetSize(sizeDelta.x, sizeDelta.y); } + + if (m_CheckMinAnchor != rectTransform.anchorMin || m_CheckMaxAnchor != rectTransform.anchorMax) + { + m_CheckMaxAnchor = rectTransform.anchorMax; + m_CheckMinAnchor = rectTransform.anchorMin; + m_ReinitLabel = true; + } } private void CheckTheme() @@ -523,6 +533,7 @@ namespace XCharts InitTitle(); InitLegend(); InitTooltip(); + InitSerieLabel(); } protected virtual void OnThemeChanged() diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs index f33ec5f1..561555c3 100644 --- a/Runtime/Internal/CoordinateChart.cs +++ b/Runtime/Internal/CoordinateChart.cs @@ -1348,6 +1348,7 @@ namespace XCharts } break; } + m_RefreshLabel = true; serieData.labelPosition = pos; if (serie.label.show) DrawLabelBackground(vh, serie, serieData); } @@ -1372,6 +1373,7 @@ namespace XCharts if (j >= serie.dataPoints.Count) break; var serieData = serie.data[j]; var pos = serie.dataPoints[j]; + serieData.SetGameObjectPosition(serieData.labelPosition); serieData.UpdateIcon(); if (serie.show && serie.label.show && serieData.canShowLabel)