From daa19569f9e6c097ff2200106695f7a6418f8d75 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Sun, 21 Feb 2021 02:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=E7=9A=84=E7=A9=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Runtime/Internal/BaseChart.cs                   | 4 ++--
 Runtime/Internal/CoordinateChart.cs             | 5 +++--
 Runtime/Internal/CoordinateChart_DrawHeatmap.cs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs
index 71710db1..d2ae755f 100644
--- a/Runtime/Internal/BaseChart.cs
+++ b/Runtime/Internal/BaseChart.cs
@@ -686,7 +686,7 @@ namespace XCharts
             {
                 m_Painter.Refresh();
                 foreach (var painter in m_PainterList) painter.Refresh();
-                m_PainterTop.Refresh();
+                if (m_PainterTop != null) m_PainterTop.Refresh();
                 m_RefreshChart = false;
             }
         }
@@ -696,7 +696,7 @@ namespace XCharts
             if (m_Painter == null) return;
             m_Painter.CheckRefresh();
             foreach (var painter in m_PainterList) painter.CheckRefresh();
-            m_PainterTop.CheckRefresh();
+            if (m_PainterTop != null) m_PainterTop.CheckRefresh();
         }
 
         protected void CheckRefreshLabel()
diff --git a/Runtime/Internal/CoordinateChart.cs b/Runtime/Internal/CoordinateChart.cs
index 40927b2d..485eabaa 100644
--- a/Runtime/Internal/CoordinateChart.cs
+++ b/Runtime/Internal/CoordinateChart.cs
@@ -1369,7 +1369,8 @@ namespace XCharts
 
         private void CheckRaycastTarget()
         {
-            var ray = dataZoom.enable || (visualMap.enable && visualMap.show && visualMap.calculable);
+            var ray = (dataZoom != null && dataZoom.enable)
+                || (visualMap != null && visualMap.enable && visualMap.show && visualMap.calculable);
             if (raycastTarget != ray)
             {
                 raycastTarget = ray;
@@ -1378,7 +1379,7 @@ namespace XCharts
 
         private void CheckDataZoom()
         {
-            if (!dataZoom.enable) return;
+            if (dataZoom == null || !dataZoom.enable) return;
             CheckDataZoomScale();
             CheckDataZoomLabel();
         }
diff --git a/Runtime/Internal/CoordinateChart_DrawHeatmap.cs b/Runtime/Internal/CoordinateChart_DrawHeatmap.cs
index 4fdd51c4..ede979f9 100644
--- a/Runtime/Internal/CoordinateChart_DrawHeatmap.cs
+++ b/Runtime/Internal/CoordinateChart_DrawHeatmap.cs
@@ -18,7 +18,7 @@ namespace XCharts
 
         protected void CheckVisualMap()
         {
-            if (!visualMap.enable || !visualMap.show) return;
+            if (visualMap == null || !visualMap.enable || !visualMap.show) return;
             Vector2 local;
             if (canvas == null) return;