From fc714208ff3a320c3bb52bddd5ea3d91f647a206 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 16 四月 2019 15:18:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/Actor/HeroBehaviour.cs |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index f11491e..69ee938 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -887,24 +887,27 @@
 
                 if (_target.ActorInfo.RealHp <= _hurtValue)
                 {
-                    _target.KillerServerInstID = m_Hero.ServerInstID;
-                    _target.ActorInfo.serverDie = true;
-                    GAMgr.Instance.ServerDie(_target.ServerInstID);
-                    GAMgr.Instance.DoDelayDie(_target);
+                    if (_clientNpc.NpcConfig.AIType != 198)
+                    {
+                        _target.KillerServerInstID = m_Hero.ServerInstID;
+                        _target.ActorInfo.serverDie = true;
+                        GAMgr.Instance.ServerDie(_target.ServerInstID);
+                        GAMgr.Instance.DoDelayDie(_target);
 
-                    if (m_Hero.LockTarget == _target)
-                    {
-                        m_Hero.LockTarget = null;
-                    }
-                    if (m_Hero.SelectTarget == _target)
-                    {
-                        m_Hero.SelectTarget = null;
-                    }
+                        if (m_Hero.LockTarget == _target)
+                        {
+                            m_Hero.LockTarget = null;
+                        }
+                        if (m_Hero.SelectTarget == _target)
+                        {
+                            m_Hero.SelectTarget = null;
+                        }
 
-                    if (_clientNpc != null
-                     && _clientNpc.belongEventID != -1)
-                    {
-                        ClientSceneManager.Instance.NpcDead(_clientNpc.belongEventID, _clientNpc, _clientNpc.NpcConfig.NPCID);
+                        if (_clientNpc != null
+                         && _clientNpc.belongEventID != -1)
+                        {
+                            ClientSceneManager.Instance.NpcDead(_clientNpc.belongEventID, _clientNpc, _clientNpc.NpcConfig.NPCID);
+                        }
                     }
                     // 鍓嶆湡鎴樻枟鍙彂閫佺煶澶翠汉鐨�
                     //if (1000 == _target.NpcConfig.NPCID)

--
Gitblit v1.8.0