From 4bc5deddceada3e08d3f10dae260560651cc09a0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 四月 2019 19:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/Stage/MapEditor/Game/ClientSceneManager.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
index bc1d41d..c4a81a3 100644
--- a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
+++ b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
@@ -559,7 +559,8 @@
             Init();
         }
 
-        if (m_MapData.triggers == null
+        if (m_MapData == null
+         || m_MapData.triggers == null
          || m_MapData.triggers.Length == 0)
         {
             yield break;

--
Gitblit v1.8.0