Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-14 15b2388e0b1e4e6f2ab88366f951c549fc2dd68c

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Fight/GameActor/GActorPlayerBase.cs

@@ -1059,6 +1059,11 @@
        {

            if (null != m_Guard)

            {

                if (m_Guard.itemID == guardID)

                {

                    return;

                }



                m_Guard.UnInit();

                m_Guard = null;

            }