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 (TimeUtility.OpenDay > openDays[1])
        if (needLastDay)
        {
            return false;
            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,14 +252,21 @@
        UpdateGalaRedpoint();
    }
    public bool IsOpenedOSGala()
    public bool IsOpenedOSGala(bool needLastDay = true)
    {
        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.OSGala))
        {
            return false;
        }
        //结束后延迟一天关闭展示
        return TimeUtility.OpenDay <= osGalaOpenDays;
        if (needLastDay)
        {
            //结束后延迟一天关闭展示
            return TimeUtility.OpenDay <= osGalaOpenDays;
        }
        else
        {
            return TimeUtility.OpenDay < osGalaOpenDays;
        }
    }
    // 是否已领取奖励