Merge branch 'master' into leonard

client_Wu Xijin

2018-08-15 0012445c0109fa67987800a1bac8f32e989b2d19

 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -43,7 +43,7 @@
        {

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            WindowCenter.Instance.windowAfterCloseEvent += windowAfterCloseEvent;



            ModelCenter.Instance.GetModel<OSGiftModel>().giftGetNotify = false;

            model.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;



            Display();