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

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs

@@ -50,7 +50,8 @@
            {

                return;

            }

            if (!WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)

            if (!WindowCenter.Instance.IsOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding

                && !BossShowModel.Instance.BossShowing && !FairyFeastTransmitShow.Instance.IsOpen)

            {

                WindowCenter.Instance.Open<RealmUpHoldWin>();

            }