diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 1048521c41..8aeced03c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -138,7 +138,6 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index d7e7cecece..38e9f0091d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -177,7 +177,13 @@ function CommonActPage:RefreshTime() self.localTimer = nil end self.time:SetActive(true) - local freshTime = self.ActData.endTime - GetTimeStamp() + local freshTime + if self.actType == ActivityTypeDef.AccumulativeRechargeExper then + freshTime = CalculateSecondsNowTo_N_OClock(24) + else + freshTime = self.ActData.endTime - GetTimeStamp() + end + local update = function() if self.actConfig.ShowTime == 1 then self.timeText.text = Language[10023]..TimeToFelaxible(freshTime) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9ec68d4047..d42365afe2 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -90,7 +90,7 @@ local TypeUpdateFunc = { if configData.ShowArt == FUNCTION_OPEN_TYPE.EXPERT then this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper) else - this.GetMissionData(2,ActivityTypeDef.AccumulativeRechargeExper) + this.GetMissionData(1,ActivityTypeDef.AccumulativeRechargeExper) end end, [ActivityTypeDef.UpLvAct] = function ()---日累计充值 @@ -204,7 +204,8 @@ function this.GetMissionData(indexType,actType) curData.rewards[i].state = 1 end end - LogGreen("actRewardConfigs[j].Reward :"..#actRewardConfigs[j].Reward ) + curData.rewards[i].title = string.format("累计充值金额:%s元",curData.rewards[i].value) + curData.rewards[i].buyInfo = string.format("(%s/%s)",curData.rewards[i].progress,curData.rewards[i].value) curData.rewards[i].shows = actRewardConfigs[j].Reward curData.rewards[i].jump = actRewardConfigs[j].Jump[1] end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 104232c6c1..60291976ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -190,7 +190,7 @@ function ExpertPage:RefreshTime() self.timeText.text = Language[10023]..TimeToFelaxible(freshTime) end if freshTime <= 0 then - self.parent:ClosePanel() + self.timeText.text = Language[10023]..TimeToFelaxible(0) end end, 1, -1, true) self.localTimer:Start() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 6595f499ff..6ce5e27c45 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -79,7 +79,6 @@ end --添加事件监听(用于子类重写) function MissionPre:AddListener() end - --移除事件监听(用于子类重写) function MissionPre:RemoveListener() @@ -155,7 +154,7 @@ function MissionPre:SetContent1() -- self.scrollView.transform.localPosition = Vector3.New(-370,7,0) self.upLayout.gameObject:SetActive(false) if self.actConfig then - if self.actConfig.ActiveType == ActivityTypeDef.DynamicAct_recharge then + if self.actConfig.ActiveType == ActivityTypeDef.DynamicAct_recharge or self.actConfig.ActiveType == ActivityTypeDef.AccumulativeRechargeExper then -- self.scrollView.transform.localPosition = Vector3.New(-370,-9,0) self.upLayout.gameObject:SetActive(true) self:SetType1("累计充值",self.data.value,Language[10477].."("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")") @@ -184,7 +183,10 @@ function MissionPre:SetIcon1(_itemdata) Util.SetGray(self.redPoint,false) self.btnGet:GetComponent("Button").enabled = _itemdata.state ~= 2 self.btnGetText.text = type[_itemdata.state].text - if _itemdata.state ~= 0 then + if _itemdata.state ~= 0 then + if _itemdata.state == 2 then + self.buyInfo.text = "" + end return end if _itemdata.type and _itemdata.type > 0 then