Merge branch 'master' into UserCenter

client_Wu Xijin

2018-10-15 bd19eadbee8a0d3ec67c36a166a8cca4f87f454e

 System/OpenServerActivity/ImpactRankModel.cs

@@ -786,6 +786,8 @@
            FairyLeagueNotice,

            [Header("骑宠争夺预告")]

            FairyGrabBossNotice,

            [Header("限时抢购")]

            FlashRushToBuy,

        }

    }