From be0bdd0248ae76cd467f29e9308a0eb30e24f348 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 16 Dec 2019 09:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`Overlay`=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA`Tooltip`=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/CHANGELOG.md | 1 + Assets/XCharts/Runtime/Internal/BaseChart.cs | 3 ++- Assets/XCharts/Runtime/Utility/XChartsMgr.cs | 2 +- Assets/XCharts/version.json | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md index 19dfe713..592b247d 100644 --- a/Assets/XCharts/CHANGELOG.md +++ b/Assets/XCharts/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2019.12.16) 修复`Overlay`模式下不显示`Tooltip`的问题 * (2019.12.15) 增加`Title`的`TextStyle`支持 * (2019.12.11) 修复`Legend`都隐藏时`Value轴`还显示数值的问题 * (2019.12.11) 修复`Series->Data->Size`重置为0后设置无效的问题 diff --git a/Assets/XCharts/Runtime/Internal/BaseChart.cs b/Assets/XCharts/Runtime/Internal/BaseChart.cs index 2e474ee1..0534b14d 100644 --- a/Assets/XCharts/Runtime/Internal/BaseChart.cs +++ b/Assets/XCharts/Runtime/Internal/BaseChart.cs @@ -459,8 +459,9 @@ namespace XCharts { if (canvas == null) return; Vector2 local; + var cam = canvas.renderMode == RenderMode.ScreenSpaceOverlay ? null : canvas.worldCamera; if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, - Input.mousePosition, canvas.worldCamera, out local)) + Input.mousePosition, cam, out local)) { pointerPos = Vector2.zero; } diff --git a/Assets/XCharts/Runtime/Utility/XChartsMgr.cs b/Assets/XCharts/Runtime/Utility/XChartsMgr.cs index d6ebd8dd..bcd79d6f 100644 --- a/Assets/XCharts/Runtime/Utility/XChartsMgr.cs +++ b/Assets/XCharts/Runtime/Utility/XChartsMgr.cs @@ -25,7 +25,7 @@ namespace XCharts public class XChartsMgr : MonoBehaviour { public const string version = "1.0.5"; - public const int date = 20191215; + public const int date = 20191216; [SerializeField] private string m_NowVersion; [SerializeField] private string m_NewVersion; diff --git a/Assets/XCharts/version.json b/Assets/XCharts/version.json index 896d94cd..657288ab 100644 --- a/Assets/XCharts/version.json +++ b/Assets/XCharts/version.json @@ -1,7 +1,7 @@ { "version": "1.0.5", - "date": "20191215", - "checkdate": "20191215", - "desc": "欢迎 Github 上点 Star 支持，非常感谢！", + "date": "20191216", + "checkdate": "20191216", + "desc": "如果 XCharts 对您有帮助，希望您能在 Github 上点 Star 支持，非常感谢！", "homepage": "https://github.com/monitor1394/unity-ugui-XCharts" } \ No newline at end of file