Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 System/Vip/LimitedTimePackageWin.cs

@@ -57,8 +57,7 @@

        protected override void OnAfterOpen()
        {
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
            limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;
           
        }

        private void UpdateLimitedTimePackageItem()
@@ -101,15 +100,17 @@
                        m_Buy_Btn.RemoveAllListeners();
                        m_Buy_Btn.AddListener(()=> 
                        {
                            m_Buy_Btn.interactable = false;
                            time = 0;
                           
                            if (limitedTimePackageItemModel.IsExpired())
                            {
                                m_Buy_Btn.interactable = false;
                                time = 0;
                                limitedTimePackageItemModel.OpenFreePlat(str, giftpackage.gifts[0].rmb, giftpackage.gifts[0].OrderInfo);
                            }
                            else
                            {
                                SysNotifyMgr.Instance.ShowTip("LimitGift9");
                                return;
                            }
                            
                        });
@@ -161,6 +162,8 @@

        protected override void OnPreClose()
        {
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
            limitedTimePackageItemModel.UpdateLimitedTimePackageItem -= UpdateLimitedTimePackageItem;
        }

        protected override void OnAfterClose()