Merge branch 'master' into CrossServerBoss

client_Wu Xijin

2019-01-07 cbb4009abdf84cf020be9cfc1de88dc436652bb3

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -295,11 +295,6 @@
                break;

            case PlayerDataRefresh.HP:

                baseData.HP = value;

                if (hero != null)

                {

                    hero.ActorInfo.SyncServerHp = value;

                    hero.ActorInfo.ResetHp((int)value);

                }

                baseData.RecordMainServerData(isMainServerData, _type, value);

                break;

            case PlayerDataRefresh.MaxMP: