3442运营活动修改

client_linchunjie

2018-09-14 d1140483cb38de94a74e4b62634cd70e57dda830

3442运营活动修改

 System/OpenServerActivity/FlashSaleCoolDown.cs

@@ -29,7 +29,8 @@
            OperationBase operationBase;

            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))

            {

                var seconds = (operationBase as OperationFlashSale).GetSurplusTime();

                var operation = (operationBase as OperationFlashSale);

                var seconds = operation.GetSurplusTime();

                m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);

            }

        }


 System/Vip/LimitedTimePackageModel.cs

@@ -141,14 +141,13 @@
        if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase))

        {

            GiftPackageClass operation = operationBase as GiftPackageClass;

            var index = operation.IndexOfGift(TimeUtility.ServerNow);

            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)

                {

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

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

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

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

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

                    {

                        IsBuyBool = true;


 System/Vip/LimitedTimePackageWin.cs

@@ -89,20 +89,18 @@
            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.IndexOfGift(TimeUtility.ServerNow);

                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(()=> 

                        {

@@ -111,7 +109,7 @@
                            {

                                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

                            {

@@ -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());

            }

        }




 System/Welfare/GiftPackageClass.cs

@@ -8,7 +8,19 @@
    {

        public List<Gift_Package> giftpackage1 = new List<Gift_Package>();



        public int IndexOfGift(DateTime time)

        public bool TryGetGift(DateTime time, out Gift_Package flashSale)

        {

            flashSale = default(Gift_Package);

            var index = IndexOfGift(time);

            index = Mathf.Min(index, giftpackage1.Count - 1);

            if (index >= 0)

            {

                flashSale = giftpackage1[index];

            }

            return index >= 0;

        }



        int IndexOfGift(DateTime time)

        {

            if (allDay)

            {