Merge branch '3442运营活动修改'

client_linchunjie

2018-09-17 db0192c0e911dc86d828ec650e995282e6eacdf2

 System/Vip/LimitedTimePackageWin.cs

@@ -89,36 +89,34 @@
            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase))

            {

                GiftPackageClass operation = operationBase as GiftPackageClass;

               // m_Text_ActivityTimeTo.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), operation.ToDisplayTime());

                var index = operation.IndexOfFlashShop();

                if (index != -1 && index < operation.giftpackage1.Count)

                GiftPackageClass.Gift_Package gift;

                if (operation.TryGetGift(TimeUtility.ServerNow, out gift))

                {

                    var giftpackage = operation.giftpackage1[index];

                    if (giftpackage.gifts.Length > 0)

                    if (gift.gifts.Length > 0)

                    {

                        string str = string.Empty;

                        str= giftpackage.gifts[0].rmb + Language.Get("RMB_Package_Z");

                        str = gift.gifts[0].rmb + Language.Get("RMB_Package_Z");

                        m_Text_PackageName.text = str;

                        m_Money1.text = giftpackage.gifts[0].rmbOriginal + Language.Get("RMB_Z");//原价

                        m_Money2.text = giftpackage.gifts[0].rmb + Language.Get("RMB_Z");//现价

                        int BuyCountLimit = giftpackage.gifts[0].limitNum;//限购数量

                        int GiftID = giftpackage.gifts[0].id;//礼包ID

                        m_Money1.text = gift.gifts[0].rmbOriginal + Language.Get("RMB_Z");//原价

                        m_Money2.text = gift.gifts[0].rmb + Language.Get("RMB_Z");//现价

                        int BuyCountLimit = gift.gifts[0].limitNum;//限购数量

                        int GiftID = gift.gifts[0].id;//礼包ID

                        m_Buy_Btn.RemoveAllListeners();

                        m_Buy_Btn.AddListener(()=> 
                        m_Buy_Btn.AddListener(() =>

                        {

                           


                            if (limitedTimePackageItemModel.IsExpired())

                            {

                                m_Buy_Btn.interactable = false;

                                time = 0;

                                limitedTimePackageItemModel.OpenFreePlat(str, giftpackage.gifts[0].rmb, giftpackage.gifts[0].OrderInfo);

                                limitedTimePackageItemModel.OpenFreePlat(str, gift.gifts[0].rmb, gift.gifts[0].OrderInfo);

                            }

                            else

                            {

                                SysNotifyMgr.Instance.ShowTip("LimitGift9");

                                return;

                            }

                            


                        });

                        if (limitedTimePackageItemModel.DicBuyPackage.ContainsKey(GiftID) && limitedTimePackageItemModel.DicBuyPackage[GiftID] >= BuyCountLimit)

                        {

@@ -130,7 +128,7 @@
                            m_Buy_Btn.gameObject.SetActive(true);

                            m_BoughtObj.SetActive(false);

                        }

                        var items = giftpackage.gifts[0].items;

                        var items = gift.gifts[0].items;

                        for (int i = 0; i < items.Length; i++)

                        {

                            int type = i;

@@ -162,6 +160,7 @@
                        }

                    }

                }

                // m_Text_ActivityTimeTo.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), operation.ToDisplayTime());

            }

        }