diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 1f4f9c9eb5..1cce8a54af 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -285,6 +285,29 @@ function this.GetActivityInfoByType(type) return this.mission[type] end end + +function this.GetYiYuanUpMaxTime() + + local maxnum=0 + local missions=this.GetActivityInfoByType(ActivityTypeDef.shuaChongTeQuan).mission + local index=1 + if missions then + for i = 1, #missions do + if missions[i].state~=0 then + index=i + end + end + end + local privile=ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,2101) + if privile then + maxnum=privile.Condition[index+1][2] + end + return maxnum +end + + + + function this.SetActivityInfo(type, Id, state) for _, missInfo in pairs(this.mission[type].mission) do if missInfo.missionId == Id then @@ -545,7 +568,7 @@ function this.RefreshActivityProgressData(msg) if this.mission[msg.activityInfo.activityId] then this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value for i = 1, #msg.activityInfo.mission do - --LogGreen("msg.activityInfo.activityId:"..msg.activityInfo.activityId.." msg.activityInfo.mission[i].missionId:"..msg.activityInfo.mission[i].missionId.." missionInfo.state:"..msg.activityInfo.mission[i].state.." missionInfo.progress:"..msg.activityInfo.mission[i].progress) + LogGreen("msg.activityInfo.activityId:"..msg.activityInfo.activityId.." msg.activityInfo.mission[i].missionId:"..msg.activityInfo.mission[i].missionId.." missionInfo.state:"..msg.activityInfo.mission[i].state.." missionInfo.progress:"..msg.activityInfo.mission[i].progress) for _, missionInfo in pairs(this.mission[msg.activityInfo.activityId].mission) do if missionInfo.missionId == msg.activityInfo.mission[i].missionId then missionInfo.state = msg.activityInfo.mission[i].state @@ -1107,7 +1130,8 @@ end --开服福利排序 local OpenSeverWelfareSortTable = { [0] = 1, - [1] = 0, + [1] = 2, + [2] = 0, } function this. OpenSeverWelfareRewardTabsSort(missions) table.sort(missions,function(a,b)