From bd65007851a41c082387e42a10b9640058d4fcc2 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 7 Jul 2020 07:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0`Tooltip`=E7=9A=84`offset`?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/CHANGELOG.md | 1 + .../Documentation/XCharts配置项手册.md | 2 + .../Editor/PropertyDrawers/TooltipDrawer.cs | 4 + .../XCharts/Runtime/Component/Main/Tooltip.cs | 5 + .../Runtime/Internal/CoordinateChart.cs | 2 +- .../Internal/Helper/SerieDataHelper.cs.meta | 11 - .../Internal/Helper/VisualMapHelper.cs.meta | 11 - Assets/XCharts/Runtime/PieChart.cs | 2 +- Assets/XCharts/Runtime/PolarChart.cs | 2 +- Assets/XCharts/Runtime/RadarChart.cs | 2 +- Assets/XCharts/Runtime/RingChart.cs | 2 +- Assets/XCharts/Runtime/ScatterChart.cs | 2 +- Assets/XChartsDemo/demo_xchart.unity | 221 ++++++++++++++++++ 13 files changed, 239 insertions(+), 28 deletions(-) delete mode 100644 Assets/XCharts/Runtime/Internal/Helper/SerieDataHelper.cs.meta delete mode 100644 Assets/XCharts/Runtime/Internal/Helper/VisualMapHelper.cs.meta diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md index 30dd12fa..61265d75 100644 --- a/Assets/XCharts/CHANGELOG.md +++ b/Assets/XCharts/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2020.07.07) 增加`Tooltip`的`offset`参数配置偏移 * (2020.07.06) 增加`LiquidChart`水位图 * (2020.07.01) 增加`PolarChart`极坐标图表 * (2020.06.25) 发布`v1.5.2`版本 diff --git a/Assets/XCharts/Documentation/XCharts配置项手册.md b/Assets/XCharts/Documentation/XCharts配置项手册.md index decdcfc8..46ef056a 100644 --- a/Assets/XCharts/Documentation/XCharts配置项手册.md +++ b/Assets/XCharts/Documentation/XCharts配置项手册.md @@ -232,6 +232,8 @@ * `backgroundImage`：提示框的背景图。 * `ignoreDataDefaultContent`：被忽略数据的默认显示字符信息。 * `alwayShow`：是否触发后一直显示。 +* `offset`：`(since v1.5.3)`提示框相对于鼠标位置的偏移。 + * `lineStyle`：指示器线条样式 [LineStyle](#LineStyle)。 * `textStyle`：显示内容文本样式 [TextStyle](#TextStyle)。 diff --git a/Assets/XCharts/Editor/PropertyDrawers/TooltipDrawer.cs b/Assets/XCharts/Editor/PropertyDrawers/TooltipDrawer.cs index f3409ee7..3b440467 100644 --- a/Assets/XCharts/Editor/PropertyDrawers/TooltipDrawer.cs +++ b/Assets/XCharts/Editor/PropertyDrawers/TooltipDrawer.cs @@ -35,6 +35,7 @@ namespace XCharts SerializedProperty m_IgnoreDataDefaultContent = prop.FindPropertyRelative("m_IgnoreDataDefaultContent"); SerializedProperty m_LineStyle = prop.FindPropertyRelative("m_LineStyle"); SerializedProperty m_TextStyle = prop.FindPropertyRelative("m_TextStyle"); + SerializedProperty m_Offset = prop.FindPropertyRelative("m_Offset"); ChartEditorHelper.MakeFoldout(ref drawRect, ref m_TooltipModuleToggle, "Tooltip", show); drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; @@ -67,6 +68,8 @@ namespace XCharts drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; EditorGUI.PropertyField(drawRect, m_IgnoreDataDefaultContent); drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(drawRect, m_Offset); + drawRect.y += EditorGUI.GetPropertyHeight(m_Offset); EditorGUI.PropertyField(drawRect, m_LineStyle); drawRect.y += EditorGUI.GetPropertyHeight(m_LineStyle); EditorGUI.PropertyField(drawRect, m_TextStyle); @@ -79,6 +82,7 @@ namespace XCharts { if (m_TooltipModuleToggle) return 14 * EditorGUIUtility.singleLineHeight + 13 * EditorGUIUtility.standardVerticalSpacing + + EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Offset")) + EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_LineStyle")) + EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_TextStyle")); else diff --git a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs index 1600e566..29772472 100644 --- a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs +++ b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs @@ -64,6 +64,7 @@ namespace XCharts [SerializeField] private float m_PaddingTopBottom = 5f; [SerializeField] private string m_IgnoreDataDefaultContent = "-"; [SerializeField] private bool m_AlwayShow = false; + [SerializeField] private Vector2 m_Offset = new Vector2(18f, -25f); [SerializeField] private Sprite m_BackgroundImage; [SerializeField] private TextStyle m_TextStyle = new TextStyle(18, FontStyle.Normal); [SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.Solid, 0.7f); @@ -175,6 +176,10 @@ namespace XCharts /// public bool alwayShow { get { return m_AlwayShow; } set { m_AlwayShow = value; } } /// + /// 提示框相对于鼠标位置的偏移。 + /// + public Vector2 offset { get { return m_Offset; } set { m_Offset = value; } } + /// /// 提示框内容文本样式。 /// public TextStyle textStyle diff --git a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs index c003d114..14f7dfbb 100644 --- a/Assets/XCharts/Runtime/Internal/CoordinateChart.cs +++ b/Assets/XCharts/Runtime/Internal/CoordinateChart.cs @@ -358,7 +358,7 @@ namespace XCharts } if (m_Tooltip.IsSelected()) { - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); if (m_Tooltip.IsDataIndexChanged() || m_Tooltip.type == Tooltip.Type.Corss) { diff --git a/Assets/XCharts/Runtime/Internal/Helper/SerieDataHelper.cs.meta b/Assets/XCharts/Runtime/Internal/Helper/SerieDataHelper.cs.meta deleted file mode 100644 index b497cb52..00000000 --- a/Assets/XCharts/Runtime/Internal/Helper/SerieDataHelper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e78d1b28fc61d4b1b995a1eca16cf3b6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XCharts/Runtime/Internal/Helper/VisualMapHelper.cs.meta b/Assets/XCharts/Runtime/Internal/Helper/VisualMapHelper.cs.meta deleted file mode 100644 index 2183dfde..00000000 --- a/Assets/XCharts/Runtime/Internal/Helper/VisualMapHelper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 15e5106bd46f5484596429d512f6af5d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XCharts/Runtime/PieChart.cs b/Assets/XCharts/Runtime/PieChart.cs index 9b60b692..633c30ce 100644 --- a/Assets/XCharts/Runtime/PieChart.cs +++ b/Assets/XCharts/Runtime/PieChart.cs @@ -457,7 +457,7 @@ namespace XCharts } if (selected) { - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); } else if (m_Tooltip.IsActive()) diff --git a/Assets/XCharts/Runtime/PolarChart.cs b/Assets/XCharts/Runtime/PolarChart.cs index 4c404d12..83683177 100644 --- a/Assets/XCharts/Runtime/PolarChart.cs +++ b/Assets/XCharts/Runtime/PolarChart.cs @@ -576,7 +576,7 @@ namespace XCharts break; } } - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); if (m_Tooltip.type == Tooltip.Type.Corss) { diff --git a/Assets/XCharts/Runtime/RadarChart.cs b/Assets/XCharts/Runtime/RadarChart.cs index fd399957..e806f457 100644 --- a/Assets/XCharts/Runtime/RadarChart.cs +++ b/Assets/XCharts/Runtime/RadarChart.cs @@ -678,7 +678,7 @@ namespace XCharts } else { - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); RefreshChart(); } diff --git a/Assets/XCharts/Runtime/RingChart.cs b/Assets/XCharts/Runtime/RingChart.cs index 6442d92f..f6382b19 100644 --- a/Assets/XCharts/Runtime/RingChart.cs +++ b/Assets/XCharts/Runtime/RingChart.cs @@ -279,7 +279,7 @@ namespace XCharts } if (selected) { - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); } else if (m_Tooltip.IsActive()) diff --git a/Assets/XCharts/Runtime/ScatterChart.cs b/Assets/XCharts/Runtime/ScatterChart.cs index bca81f8b..d014a386 100644 --- a/Assets/XCharts/Runtime/ScatterChart.cs +++ b/Assets/XCharts/Runtime/ScatterChart.cs @@ -99,7 +99,7 @@ namespace XCharts } if (selected) { - m_Tooltip.UpdateContentPos(new Vector2(local.x + 18, local.y - 25)); + m_Tooltip.UpdateContentPos(local + m_Tooltip.offset); UpdateTooltip(); } else if (m_Tooltip.IsActive()) diff --git a/Assets/XChartsDemo/demo_xchart.unity b/Assets/XChartsDemo/demo_xchart.unity index 1ddd0167..6ac33c17 100644 --- a/Assets/XChartsDemo/demo_xchart.unity +++ b/Assets/XChartsDemo/demo_xchart.unity @@ -6603,6 +6603,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -13047,6 +13048,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -37509,6 +37511,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -49544,6 +49547,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -73311,6 +73315,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -84571,6 +84576,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -91375,6 +91381,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -118078,6 +118085,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &215911819 MonoBehaviour: @@ -126981,6 +127000,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &237218502 MonoBehaviour: @@ -130520,6 +130551,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -136198,6 +136230,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &252560113 MonoBehaviour: @@ -139166,6 +139210,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -177507,6 +177552,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -184239,6 +184285,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -200954,6 +201001,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -211724,6 +211772,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -221648,6 +221697,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -237184,6 +237234,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &449913328 MonoBehaviour: @@ -239228,6 +239290,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &453606764 MonoBehaviour: @@ -246485,6 +246559,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -264569,6 +264644,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -275892,6 +275968,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -290969,6 +291046,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -293117,6 +293195,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -334820,6 +334899,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -356649,6 +356729,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -358416,6 +358497,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -365188,6 +365270,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -374623,6 +374706,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -391288,6 +391372,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -408131,6 +408216,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &728093146 MonoBehaviour: @@ -408686,6 +408783,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -429005,6 +429103,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -482668,6 +482767,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -513307,6 +513407,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &855605996 MonoBehaviour: @@ -525618,6 +525730,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -533663,6 +533776,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -546375,6 +546489,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -548874,6 +548989,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -555850,6 +555966,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -562974,6 +563091,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &946052564 MonoBehaviour: @@ -563961,6 +564090,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -572883,6 +573013,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -582403,6 +582534,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &986402342 MonoBehaviour: @@ -583586,6 +583729,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -719399,6 +719543,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -723962,6 +724107,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -745569,6 +745715,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &1064300881 MonoBehaviour: @@ -751247,6 +751405,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -764791,6 +764950,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -774042,6 +774202,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -784532,6 +784693,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -794379,6 +794541,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -802496,6 +802659,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -806147,6 +806311,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -848731,6 +848896,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -853512,6 +853678,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -870745,6 +870912,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -881505,6 +881673,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -884688,6 +884857,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1047274,6 +1047444,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1076124,6 +1076295,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1103473,6 +1103645,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1107987,6 +1108160,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1120603,6 +1120777,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1123754,6 +1123929,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1136416,6 +1136592,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1167472,6 +1167649,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1188717,6 +1188895,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1193120,6 +1193299,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1214310,6 +1214490,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1217163,6 +1217344,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1233569,6 +1233751,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1257927,6 +1258110,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1275389,6 +1275573,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1287906,6 +1288091,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1293127,6 +1293313,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1303737,6 +1303924,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &1888110917 MonoBehaviour: @@ -1312388,6 +1312587,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1318117,6 +1318317,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1325418,6 +1325619,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1344400,6 +1344602,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1346154,6 +1346357,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1374348,6 +1374552,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1377296,6 +1377501,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1384201,6 +1384407,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1391204,6 +1391411,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: @@ -1408327,6 +1408535,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + - 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: 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 &2129811974 MonoBehaviour: @@ -1409239,6 +1409459,7 @@ MonoBehaviour: m_PaddingTopBottom: 5 m_IgnoreDataDefaultContent: '-' m_AlwayShow: 0 + m_Offset: {x: 18, y: -25} m_BackgroundImage: {fileID: 0} m_TextStyle: m_JsonData: