0312 集字首日红点，0代表无限制

hch

2021-02-03 24034114e0623470f339441731f4bb7cc0eb66d8

0312 集字首日红点，0代表无限制

# Conflicts:
#	System/DailyQuest/DayRemind.cs

 System/OpenServerActivity/CollectWordsCell.cs

@@ -44,7 +44,7 @@


        //按钮
        //数量不足    按钮灰色不可点击
        //数量不足    按钮灰色不可点击 (0代表不限制兑换次数)
        //可兑换      按钮亮起可点击
        //达兑换上限  隐藏按钮显示上限
        public void Display(int index)
@@ -113,8 +113,8 @@
            int exchangedCnt; //已兑换次数
            model.exchangeDict.TryGetValue(exchangeNum, out exchangedCnt);

            Img_Complete.gameObject.SetActive(exchangedCnt >= maxNum);
            ExChangeBtn.gameObject.SetActive(exchangedCnt < maxNum);
            Img_Complete.gameObject.SetActive(maxNum != 0 && exchangedCnt >= maxNum);
            ExChangeBtn.gameObject.SetActive(maxNum == 0 || exchangedCnt < maxNum);
            ExChangeBtn.SetColorful(null, isEnough);
            ExChangeBtn.interactable = isEnough;
            ExChangeBtn.AddListener(() =>
@@ -131,11 +131,13 @@
                ItemTipUtility.Show(tagItemID);
            });

            ExChangeCnt.text = Language.Get("CollectWordsLimit", exchangedCnt, maxNum);
            
            if (maxNum != 0)
                ExChangeCnt.text = Language.Get("CollectWordsLimit", exchangedCnt, maxNum);
            else
                ExChangeCnt.text = Language.Get("DailyQuest_NoLevelLimit");

            updateFrame = 0;
        }



        //layout contentsizefilter 镶嵌使用的情况下会发生位置未正常刷新的情况

 System/OpenServerActivity/CollectWordsModel.cs

@@ -193,6 +193,12 @@
            {
                return;
            }
            if (!DayRemind.Instance.GetDayRemind(DayRemind.WORD_YY_REDPOINT))
            {
                redpoint.state = RedPointState.Simple;
                return;
            }

            jumpIndex = 0;
            OperationCollectWords operation;
            if (OperationTimeHepler.Instance.TryGetOperation(collectWordsType, out operation))

 System/OpenServerActivity/CollectWordsWin.cs

@@ -46,6 +46,11 @@

        protected override void OnAfterOpen()
        {
            if (!DayRemind.Instance.GetDayRemind(DayRemind.WORD_YY_REDPOINT))
            { 
                DayRemind.Instance.SetDayRemind(DayRemind.WORD_YY_REDPOINT, true);
                model.UpdateRedpoint();
            }
        }

        protected override void OnPreClose()