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

client_Wu Xijin

2019-06-28 b14ea709b82e5a478c47175527018bb8b73fb72b

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

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0608_tagNPCDie.cs

@@ -57,7 +57,7 @@
        }



        GActorNpcFight _targetFight = _actor as GActorNpcFight;



        GActorFight _actorFight = _actor as GActorFight;

        if (_targetFight != null)

        {

            if (MapTransferUtility.Instance.lastMoveToWorldBossNpcID == _targetFight.NpcConfig.NPCID)

@@ -84,10 +84,10 @@
        {

            GAMgr.Instance.Release(_actor);

        }

        else if (_actor is GActorNpcFight

              || _actor is GA_NpcFightSgzcZZ)

        else if (_actorFight is GActorNpcFight

              || _actorFight is GA_NpcFightSgzcZZ)

        {

            if (_actor != null)

            if (_actorFight != null)

            {



                if (_hero != null)

@@ -111,8 +111,8 @@
                _actor.ActorInfo.serverDie = true;

                _actor.ReleaseName();

                _actor.ReleaseShadow();

                _targetFight.SkillMgr.Clear();

                GAMgr.Instance.DoDelayDie(_targetFight);

                _actorFight.SkillMgr.Clear();

                GAMgr.Instance.DoDelayDie(_actorFight);



                GActorFight _killer = GAMgr.Instance.GetBySID(vNetData.KillerID) as GActorFight;



@@ -133,11 +133,11 @@


                    if (_transToMainUser)

                    {

                        _targetFight.Die(vNetData.KillerID / 10);

                        _actorFight.Die(vNetData.KillerID / 10);

                    }

                    else

                    {

                        _targetFight.Die(vNetData.KillerID);

                        _actorFight.Die(vNetData.KillerID);

                    }

                }

                else

@@ -153,13 +153,13 @@
                                _content = string.Format("DTC0608_tagNPCDie => {0} 死亡的时候凶手: {1} 已经将招式: {2} 演示完毕, 这里直接死亡.", vNetData.ObjID, vNetData.KillerID, vNetData.Reason);

                                RuntimeLogUtility.AddLog_Red(_content, (uint)vNetData.ObjID);

#endif

                                _targetFight.Die(vNetData.KillerID);

                                _actorFight.Die(vNetData.KillerID);



                            }

                        }

                        else

                        {

                            _targetFight.Die(vNetData.KillerID);

                            _actorFight.Die(vNetData.KillerID);

                        }

                    }

                    else


 System/Chat/ChatFloatWin.cs

@@ -33,11 +33,11 @@
        protected override void OnPreOpen()

        {

            m_ContainerFloat.gameObject.SetActive(false);

            ChatCtrl.Inst.chatFloatUpdate += ChatFloatUpdate;

        }



        protected override void OnAfterOpen()

        {

            ChatCtrl.Inst.chatFloatUpdate += ChatFloatUpdate;

        }



        protected override void OnPreClose()


 System/Chat/ChatWin.cs

@@ -88,7 +88,8 @@
            ChatCtrl.Inst.openFromGem = false;

            ChatCtrl.Inst.needCheckAssitChat = false;

            ChatCtrl.Inst.openFromFairyTask = false;

            chatCenter.ChangeChatValue(string.Empty, false, true);

            //chatCenter.ChangeChatValue(string.Empty, false, true);

            //ChatCtrl.Inst.itemPlaceList.Clear();

        }



        protected override void OnAfterClose()