From 384c6a842e7d9da4b370591dc4fa7270df7408ec Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Thu, 4 Jun 2020 07:46:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0`Tooltip`=E7=9A=84`alwayShow`?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E8=A7=A6=E5=8F=91=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/CHANGELOG.md | 1 + Assets/XCharts/Documentation/XCharts配置项手册.md | 1 + Assets/XCharts/Runtime/Component/Main/Tooltip.cs | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md index d4addd2b..e8a2e3ef 100644 --- a/Assets/XCharts/CHANGELOG.md +++ b/Assets/XCharts/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2020.06.04) 增加`Tooltip`的`alwayShow`参数设置触发后一直显示 * (2020.06.04) 优化`Tooltip`的`formatter`支持`{.1}`通配符 * (2020.06.04) 优化`Legend`数量过多时自动换行显示 * (2020.06.03) 发布`v1.5.1`版本 diff --git a/Assets/XCharts/Documentation/XCharts配置项手册.md b/Assets/XCharts/Documentation/XCharts配置项手册.md index 744959a1..681e5168 100644 --- a/Assets/XCharts/Documentation/XCharts配置项手册.md +++ b/Assets/XCharts/Documentation/XCharts配置项手册.md @@ -217,6 +217,7 @@ * `paddingTopBottom`：文字和边框的上下边距。 * `backgroundImage`：提示框的背景图。 * `ignoreDataDefaultContent`：被忽略数据的默认显示字符信息。 +* `alwayShow`：是否触发后一直显示。 * `lineStyle`：指示器线条样式 [LineStyle](#LineStyle)。 * `textStyle`：显示内容文本样式 [TextStyle](#TextStyle)。 diff --git a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs index a1ff257b..2f01f68f 100644 --- a/Assets/XCharts/Runtime/Component/Main/Tooltip.cs +++ b/Assets/XCharts/Runtime/Component/Main/Tooltip.cs @@ -63,6 +63,7 @@ namespace XCharts [SerializeField] private float m_PaddingLeftRight = 5f; [SerializeField] private float m_PaddingTopBottom = 5f; [SerializeField] private string m_IgnoreDataDefaultContent = "-"; + [SerializeField] private bool m_AlwayShow = true; [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); @@ -170,6 +171,10 @@ namespace XCharts /// public Sprite backgroundImage { get { return m_BackgroundImage; } set { m_BackgroundImage = value; SetBackground(m_BackgroundImage); } } /// + /// 是否触发后一直显示。 + /// + public bool alwayShow { get { return m_AlwayShow; } set { m_AlwayShow = value; } } + /// /// 提示框内容文本样式。 /// public TextStyle textStyle @@ -383,6 +388,7 @@ namespace XCharts /// public void SetActive(bool flag) { + if(!flag && m_AlwayShow) return; lastDataIndex[0] = lastDataIndex[1] = -1; if (m_GameObject && m_GameObject.activeInHierarchy != flag) m_GameObject.SetActive(flag);