0312 每次战斗后3秒内验证是否提醒点击战锤；官职提升按钮只在能提升时才提醒

hch

10 天以前 61b784c4ba16fc56ef1e83cd12701af2ac9ee723

 Main/System/OSActivity/OSActivityManager.cs

@@ -13,11 +13,14 @@


    public List<int> osHeroCallGiftSortList = new List<int>();    //开服招募礼包 充值ID + 100000000



    //开服榜对应的功能ID

    Dictionary<int, int> rankTypeToFuncID = new Dictionary<int, int>()

    {

        {3, 45},

        {4, 46},

    };







    public override void Init()

    {

@@ -38,6 +41,8 @@


    void BeforePlayerDataInitialize()

    {

        osGalaScore = 0; //当前积分 累计的；消耗的是货币55

        osGalaAwardState = 0; //按位记录是否领取

    }



    void ParseConfig()

@@ -60,10 +65,11 @@
            osHeroCallGiftSortList.Add(_list[i] + 100000000);

        }



        ParseOSGalaConfig();

    }



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

    public bool IsOpened(int rankType)

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

    {

        if (!rankTypeToFuncID.ContainsKey(rankType))

        {

@@ -82,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;

@@ -139,6 +155,7 @@
        return a.CompareTo(b);

    }



    //开服招募榜礼包

    public void RefreshGiftSortList()

    {

        osHeroCallGiftSortList.Sort(CmpGift);

@@ -156,11 +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];



@@ -171,6 +191,22 @@
                if (StoreModel.Instance.GetShopLimitBuyCount(shopID) < config.LimitCnt)

                {

                    osHeroCallRedpoint.state = RedPointState.Simple;

                    break;

                }

            }

        }



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

        {

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



            for (int i = 0; i < shopList.Count; i++)

            {

                var shopID = shopList[i];

                var config = StoreConfig.Get(shopID);

                if (StoreModel.Instance.GetShopLimitBuyCount(shopID) < config.LimitCnt)

                {

                    osGalaRedpoint3.state = RedPointState.Simple;

                    break;

                }

            }

@@ -187,4 +223,129 @@
                break;

        }

    }



    #region 开服庆典

    //开服庆典

    public int osGalaOpenDays = 0; //持续天数

    public Dictionary<int, int[][]> osGalaScoreAwards = new Dictionary<int, int[][]>();  // 开服庆典积分奖励 积分：奖励

    public Dictionary<int, int> typeToGuideID = new Dictionary<int, int>();

    public List<int> osGalaChangeSortList = new List<int>();    //兑换列表（商店5）

    public List<int> osGalaGiftSortList = new List<int>();    //开服庆典礼包 充值ID + 100000000



    public int osGalaScore = 0; //当前积分 累计的；消耗的是货币55

    public int osGalaAwardState = 0; //按位记录是否领取

    public event Action OnOSGalaDataChangeEvent;



    // 兑换商店

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

    // 礼包免费

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

    // 总奖励

    Redpoint osGalaRedpoint4 = new Redpoint(MainRedDot.RedPoint_OSGala, MainRedDot.RedPoint_OSGala * 10 + 4);





    public void UpdateOSGalaData(HAB05_tagSCOSACelebrationInfo netPack)

    {

        osGalaScore = (int)netPack.PointTotal;

        osGalaAwardState = (int)netPack.PointAward;

        OnOSGalaDataChangeEvent?.Invoke();

        UpdateGalaRedpoint();

    }



    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)

    {

        return (osGalaAwardState & (1 << index)) != 0;

    }



    // 是否可领取奖励

    public bool CanGetAward(int index, int score)

    {

        if (IsGotAward(index))

        {

            return false;

        }



        if (osGalaScore < score)

        {

            return false;

        }



        return true;

    }



    void ParseOSGalaConfig()

    {

        var config = FuncConfigConfig.Get("OSACelebration");

        osGalaOpenDays = int.Parse(config.Numerical1);

        osGalaScoreAwards = ConfigParse.ParseIntArray2Dict(config.Numerical2);



        config = FuncConfigConfig.Get("Achievement");

        typeToGuideID = ConfigParse.ParseIntDict(config.Numerical1);





        var list = StoreModel.Instance.storeTypeDict[(int)StoreFunc.OSGalaChange];

        for (int i = 0; i < list.Count; i++)

        {

            var item = list[i];

            osGalaChangeSortList.Add(item.shopId);

        }



        var _list1 = StoreModel.Instance.storeTypeDict[(int)StoreFunc.OSGalaGift];

        var _list2 = RechargeManager.Instance.GetCTGIDListByType(19);

        for (int i = 0; i < _list1.Count; i++)

        {

            var item = _list1[i];

            osGalaGiftSortList.Add(item.shopId);

        }

        for (int i = 0; i < _list2.Count; i++)

        {

            osGalaGiftSortList.Add(_list2[i] + 100000000);

        }

    }



    public void RefreshOSGalaGiftSortList()

    {

        osGalaGiftSortList.Sort(CmpGift);

    }



    public void RefreshOSGalaChangeSortList()

    {

        osGalaGiftSortList.Sort(CmpGift);

    }



    void UpdateGalaRedpoint()

    {

        osGalaRedpoint4.state = RedPointState.None;

        var keys = osGalaScoreAwards.Keys.ToList();

        keys.Sort();

        for (int i = 0; i < keys.Count; i++)

        {

            var score = keys[i];

            if (CanGetAward(i, score))

            {

                osGalaRedpoint4.state = RedPointState.Simple;

                return;

            }

        }



    }

    #endregion

}