From 15b2388e0b1e4e6f2ab88366f951c549fc2dd68c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 14 十一月 2018 16:50:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/GameActor/GActorPlayerBase.cs |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index eb19823..8ed1859 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -1059,6 +1059,11 @@
         {
             if (null != m_Guard)
             {
+                if (m_Guard.itemID == guardID)
+                {
+                    return;
+                }
+
                 m_Guard.UnInit();
                 m_Guard = null;
             }

--
Gitblit v1.8.0