Merge branch 'master' into StrangleGodBoss

client_linchunjie

2019-01-18 bbc2a85578a3b3d834fb9f5d0d214d12f40fe902

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -599,6 +599,8 @@
                        var sendInfo = new CA108_tagCMRefreshMainServerRole();

                        GameNetSystem.Instance.SendInfo(sendInfo);

                        baseData.MapID = baseData.mainServerMapIdRecord;

                        baseData.dungeonLineId = 0;

                        DTCA127_tagMCStartChangeMap.LineID = 0;

                        ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();

                        StageManager.Instance.Load<DungeonStage>(baseData.MapID, GameNetSystem.SocketType.CrossSever, true);

                        extersion.pkState = 0;