Merge remote-tracking branch 'origin/master' into SubWindow

client_Wu Xijin

2019-04-29 8bb7776084b49463b186b2d721be38079f33c04f

Merge remote-tracking branch 'origin/master' into SubWindow

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs

@@ -147,7 +147,10 @@
            if (PreFightMission.Instance.IsFinished())

            {

                hero.StopAll();

                hero.InitBornPos(package.PosX, package.PosY);

                if (!AdventureStage.Instance.IsInAdventureStage)

                {

                    hero.InitBornPos(package.PosX, package.PosY);

                }

                hero.RequestName();

                hero.ActorInfo.serverDie = false;

                hero.IdleImmediate();

@@ -158,7 +161,8 @@
        ClientDropItemUtility.Instance.ReleaseAll();

        StatusMgr.Instance.ReleaseActor(PlayerDatas.Instance.PlayerId);



        if (!ClientDungeonStageUtility.isClientDungeon)

        if (!ClientDungeonStageUtility.isClientDungeon

         && !AdventureStage.Instance.IsInAdventureStage)

        {

            GAMgr.Instance.UnInit();

        }