From 6c83a6b82b32f408aae4d55fc4cc0a68b2fa2573 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 19 十一月 2018 17:53:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/Actor/State/SMB/STM_BaseAttack.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Fight/Actor/State/SMB/STM_BaseAttack.cs b/Fight/Actor/State/SMB/STM_BaseAttack.cs
index 8ed7b6f..3699e66 100644
--- a/Fight/Actor/State/SMB/STM_BaseAttack.cs
+++ b/Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -220,6 +220,14 @@
 
         GActorFight _fight = owner as GActorFight;
 
+        if (_fight == null)
+        {
+#if UNITY_EDITOR
+            Debug.LogError("owner绫诲瀷闂: " + owner.GetType());
+#endif
+            return;
+        }
+
         _fight.SkillMgr.DoingPrepareSkill = false;
 
         if (owner.ActorType == GameObjType.gotPlayer)

--
Gitblit v1.8.0