diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 762222d5b6..e590be7580 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -93,8 +93,8 @@ local TypeUpdateFunc = { this.GetMissionData(1,ActivityTypeDef.AccumulativeRechargeExper) end end, - [ActivityTypeDef.UpLvAct] = function ()---日累计充值 - this.GetExpertData(2,ActivityTypeDef.UpLvAct) + [ActivityTypeDef.UpLvAct] = function ()---升级限时 + this.GetExpertData(4,ActivityTypeDef.UpLvAct) end, [ActivityTypeDef.DynamicAct_recharge] = function ()---周累计充值 this.GetMissionData(1,ActivityTypeDef.DynamicAct_recharge) @@ -230,7 +230,7 @@ function this.GetExpertData(indexType,actType) local actRewardConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId", actId) for i = 1, #curData.rewards do for j = 1, #actRewardConfigs do - if curData.rewards[i].missionId == actRewardConfigs[j].Id then + if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] curData.rewards[i].otherData.info = "" @@ -241,6 +241,23 @@ function this.GetExpertData(indexType,actType) else curData.rewards[i].otherData.state = 1 end + elseif indexType == 4 then --升级限量豪礼 + curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[2][1] + curData.rewards[i].otherData.info = "" + if curData.rewards[i].state == 1 then + curData.rewards[i].otherData.state = 2 + else + if curData.rewards[i].progress > 0 then + if PlayerManager.level >= curData.rewards[i].otherData.Values then + curData.rewards[i].otherData.state = 0 + else + curData.rewards[i].otherData.state = 1 + end + else + curData.rewards[i].otherData.state = 3 + end + curData.rewards[i].otherData.info = string.format("剩余:%s",curData.rewards[i].progress) + end else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper or actType == ActivityTypeDef.DynamicAct_recharge then curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][1]