Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -574,6 +574,7 @@
                        var sendInfo = new CA108_tagCMRefreshMainServerRole();

                        GameNetSystem.Instance.SendInfo(sendInfo);

                        baseData.MapID = baseData.mainServerMapIdRecord;

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

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

                        extersion.pkState = 0;

                    }