5767 【前端】【1.5】新增8-14天活动功能（制作成7日运营活动的模板）

client_Zxw

2019-01-14 7b73cffa7851878c665aab380fe4676bd494ce26

5767 【前端】【1.5】新增8-14天活动功能（制作成7日运营活动的模板）

 System/OpenServerActivity/OpenServiceAchievementCell.cs

@@ -71,9 +71,10 @@
                    Obj.SetActive(false);

                }

            }

            if (model.SelectedNow != model.DayNow)

            bool IsOpenPreviewTime = model.IsPreviewTime();

            if (model.SelectedNow != model.DayNow || IsOpenPreviewTime)

            {

                if (model.SelectedNow > model.DayNow)//还未到达的天数

                if (model.SelectedNow > model.DayNow || IsOpenPreviewTime)//还未到达的天数

                {

                    m_Btn.gameObject.SetActive(false);

                    m_TextNumber.gameObject.SetActive(false);


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -271,7 +271,7 @@
    }

    public int GetRewardNumber(int Day, int ID)//获取领奖次数

    {

        int Num = -1;

        int Num =0;

        if (WeekPartyDayInfoDic.ContainsKey(Day))

        {

            var WeekPartyDay = WeekPartyDayInfoDic[Day];


 System/OpenServerActivity/OpenServiceAchievementWin.cs

@@ -298,7 +298,7 @@
                {

                    TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;

                }

                if (TaypeNumber <= 0)

                if (TaypeNumber <= 0 && number> rewardNum)

                {

                    Bool = true;

                }

@@ -314,7 +314,7 @@
                int number = WeekPartyAction.TotalTimes / WeekPartyAction.SingleTimes;

                int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//已领奖次数

                int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//已完成次数

                if (rewardNum > number)

                if (rewardNum >= number)

                {

                    Bool = true;

                }


 System/OpenServerActivity/OpenServiceItem.cs

@@ -41,8 +41,8 @@
            int Point = model.GetPoint(day);           

            m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint);

            bool IsBool = model.IsDayReward(model.SelectedNow, index);

            bool IsOpenPreviewTime = model.IsPreviewTime();

            if (model.SelectedNow > model.DayNow || IsOpenPreviewTime)

        
            if (model.SelectedNow > model.DayNow)

            {

                m_ReceiveBtn.gameObject.SetActive(false);

                m_IsReachImage.SetActive(false);