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

client_Wu Xijin

2018-08-30 10c12a7df05dc78a3f595f6f55e47e86db4f50e9

 Fight/GameActor/GAMgr.cs

@@ -574,16 +574,6 @@
    /// <param name="actor"></param>

    public void Release(GActor actor)

    {

        var _npcfight = actor as GActorNpcFight;



        if (_npcfight != null)

        {

            if (OnFightNpcRequest != null)

            {

                OnFightNpcRequest((uint)_npcfight.NpcConfig.NPCID);

            }

        }



#if UNITY_EDITOR

        string _content = string.Format("GAMgr => 对角色 SID: {0}, CID: {1} 进行了回收", actor.ServerInstID, actor.ClientInstID);

        RuntimeLogUtility.AddLog_Green(_content, actor.ServerInstID);

@@ -653,6 +643,16 @@
            m_Cid2GA.Remove(actor.ClientInstID);

        }



        var _npcfight = actor as GActorNpcFight;



        if (_npcfight != null)

        {

            if (OnFightNpcRelease != null)

            {

                OnFightNpcRelease((uint)_npcfight.NpcConfig.NPCID);

            }

        }



        if (_needReSyncPlayerCount)

        {

            OnPlayerSyncCountChange();