Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/WindowBase/ModelCenter.cs

@@ -199,6 +199,7 @@
            RegisterModel<FlashRushToBuyModel>();

            RegisterModel<TalentModel>();

            RegisterModel<OpenServerActivityNotifyModel>();

            RegisterModel<FairyFeastModel>();

            RegisterModel<WishingPoolModel>();

            RegisterModel<RolePointModel>();

            inited = true;