363 【活动内容】开服庆典 庆典兑换 弹框 最后一天 不可以购买 兑换界面 每日红点

hch

9 天以前 5b4b9886cb677c017c720fd538493b12c4915996

363 【活动内容】开服庆典
庆典兑换 弹框
最后一天 不可以购买
兑换界面 每日红点

 Main/System/GeneralConfig/DayRemind.cs

@@ -33,7 +33,8 @@
    }



    public const string DJQTip = "DJQTip"; // 代金券提示

    public const string OSMainLevel = "OSMainLevel"; // 开服主线关卡活动提示

    public const string OSMainLevel = "OSMainLevel"; // 开服主线关卡活动提示红点

    public const string OSGalaChange = "OSGalaChange"; // 开服庆典兑换提示红点



    public Dictionary<string, int[]> dayRemindDic = new Dictionary<string, int[]>();



@@ -76,6 +77,7 @@
    {

        SetDayRemind(DJQTip);

        SetDayRemind(OSMainLevel);

        SetDayRemind(OSGalaChange);

    }



    public void SetDayRemind(string _key)


 Main/System/OSActivity/OSActivityManager.cs

@@ -69,7 +69,7 @@
    }



    // 开服排行活动是否开启

    public bool IsOpened(int rankType)

    public bool IsOpened(int rankType, bool needLastDay = true)

    {

        if (!rankTypeToFuncID.ContainsKey(rankType))

        {

@@ -88,9 +88,19 @@
        }



        var openDays = rankOpenDays[rankType];

        if (needLastDay)

        {

        if (TimeUtility.OpenDay > openDays[1])

        {

            return false;

            }

        }

        else

        {

            if (TimeUtility.OpenDay >= openDays[1])

            {

                return false;

            }

        }



        return true;

@@ -163,12 +173,14 @@
    public void UpdateRedpoint()

    {

        osMainLevelRedpoint.state = !DayRemind.Instance.GetDayRemind(DayRemind.OSMainLevel) ? RedPointState.Simple : RedPointState.None;

        osGalaRedpoint2.state = !DayRemind.Instance.GetDayRemind(DayRemind.OSGalaChange) ? RedPointState.Simple : RedPointState.None;

        
        osHeroCallRedpoint.state = RedPointState.None;

        osGalaRedpoint3.state = RedPointState.None;



        if (StoreModel.Instance.freeShopDict.Count == 0) return;



        if (StoreModel.Instance.freeShopDict.ContainsKey((int)StoreFunc.OSHeroCall))

        if (StoreModel.Instance.freeShopDict.ContainsKey((int)StoreFunc.OSHeroCall) && IsOpened(4, false))

        {

            var shopList = StoreModel.Instance.freeShopDict[(int)StoreFunc.OSHeroCall];



@@ -184,7 +196,7 @@
            }

        }



        if (StoreModel.Instance.freeShopDict.ContainsKey((int)StoreFunc.OSGalaGift))

        if (StoreModel.Instance.freeShopDict.ContainsKey((int)StoreFunc.OSGalaGift) && IsOpenedOSGala(false))

        {

            var shopList = StoreModel.Instance.freeShopDict[(int)StoreFunc.OSGalaGift];



@@ -225,7 +237,7 @@
    public event Action OnOSGalaDataChangeEvent;



    // 兑换商店

    // Redpoint osGalaRedpoint2 = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 2);

    Redpoint osGalaRedpoint2 = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 2);

    // 礼包免费

    Redpoint osGalaRedpoint3 = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 3);

    // 总奖励

@@ -240,15 +252,22 @@
        UpdateGalaRedpoint();

    }



    public bool IsOpenedOSGala()

    public bool IsOpenedOSGala(bool needLastDay = true)

    {

        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.OSGala))

        {

            return false;

        }

        if (needLastDay)

        {

        //结束后延迟一天关闭展示

        return TimeUtility.OpenDay <= osGalaOpenDays;

    }

        else

        {

            return TimeUtility.OpenDay < osGalaOpenDays;

        }

    }



    // 是否已领取奖励

    public bool IsGotAward(int index)


 Main/System/OSActivity/OSGalaChangeCell.cs

@@ -54,7 +54,9 @@
            buyBtn.SetActive(true);
            buyBtn.SetListener(() =>
            {
                StoreModel.Instance.SendBuyShopItem(storeConfig, 1);
                // StoreModel.Instance.SendBuyShopItem(storeConfig, 1);
                StoreModel.Instance.buyShopID = id;
                UIManager.Instance.OpenWindow<BuyItemWin>();
            });
        }   
        var buyCnt = StoreModel.Instance.GetShopLimitBuyCount(id);

 Main/System/OSActivity/OSGalaChangeWin.cs

@@ -19,6 +19,13 @@
        scrollerController.OnRefreshCell += OnRefreshCell;
        StoreModel.Instance.RefreshBuyShopLimitEvent += RefreshStore;
        OSActivityManager.Instance.RefreshOSGalaChangeSortList();

        if (!DayRemind.Instance.GetDayRemind(DayRemind.OSGalaChange))
        {
            DayRemind.Instance.SetDayRemind(DayRemind.OSGalaChange, true);
            OSActivityManager.Instance.UpdateRedpoint();
        }

        Display();
    }


 Main/System/OSActivity/OSGalaGiftCell.cs

@@ -48,6 +48,11 @@
                buyBtn.SetActive(true);
                buyBtn.SetListener(() =>
                {
                    if (!OSActivityManager.Instance.IsOpenedOSGala(false))
                    {
                        SysNotifyMgr.Instance.ShowTip("ActivityOver");
                        return;
                    }
                    RechargeManager.Instance.CTG(id);
                });

@@ -103,6 +108,12 @@
                buyBtn.SetActive(true);
                buyBtn.SetListener(() =>
                {
                    if (!OSActivityManager.Instance.IsOpenedOSGala(false))
                    {
                        SysNotifyMgr.Instance.ShowTip("ActivityOver");
                        return;
                    }

                    StoreModel.Instance.SendBuyShopItemWithPopCheck(storeConfig, 1);
                });
                moneyText.text = storeConfig.MoneyNum == 0 ? Language.Get("L1127") : storeConfig.MoneyNum.ToString();

 Main/System/OSActivity/OSRankHeroCallGiftCell.cs

@@ -48,6 +48,12 @@
                buyBtn.SetActive(true);
                buyBtn.SetListener(() =>
                {
                    if (!OSActivityManager.Instance.IsOpened(4, false))
                    {
                        SysNotifyMgr.Instance.ShowTip("ActivityOver");
                        return;
                    }
                    
                    RechargeManager.Instance.CTG(id);
                });

@@ -103,6 +109,12 @@
                buyBtn.SetActive(true);
                buyBtn.SetListener(() =>
                {
                    if (!OSActivityManager.Instance.IsOpened(4, false))
                    {
                        SysNotifyMgr.Instance.ShowTip("ActivityOver");
                        return;
                    }

                    StoreModel.Instance.SendBuyShopItemWithPopCheck(storeConfig, 1);
                });
                moneyText.text = storeConfig.MoneyNum == 0 ? Language.Get("L1127") : storeConfig.MoneyNum.ToString();

 Main/System/Store/BuyItemWin.cs

@@ -16,6 +16,9 @@
    [SerializeField] Text moneyText;
    [SerializeField] Button buyButton;

    [SerializeField] Text titleText;
    [SerializeField] Text buyBtnText;


    int useCnt;
    int maxCnt;
@@ -53,6 +56,17 @@

        OnSliderChange(useCnt);
        sliderPanel.Init((value) => { OnSliderChange(value); }, maxCnt);

        if (shopConfig.ShopType == (int)StoreFunc.OSGalaChange)
        {
            titleText.text = Language.Get("OSActivity13");
            buyBtnText.text = Language.Get("OSActivity9");
        }
        else
        {
            titleText.text = Language.Get("storename3");
            buyBtnText.text = Language.Get("storename4");
        }
    }

    void OnSliderChange(int value)