From 8e85780697922bde9e37e3d5341b2de227ed7256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AA?= <2han9b1a0@gmial.com> Date: Mon, 24 Jan 2022 18:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=AF=82=E9=9D=99?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityGift/ActivityGiftManager.lua | 4 +- .../NewActivity/CommonActPageManager.lua | 87 ++++++++----------- .../Modules/Operating/UppperMonthCard.lua | 1 + 3 files changed, 38 insertions(+), 54 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 4c11f56a45..97ba7804c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -138,9 +138,9 @@ function this.InitActivityServerData(msg, isUpdate) if GlobalActivity[v.activityId] then this.CheckMoneyProgress(v) this.mission[v.activityId] = v - -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + 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) + LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then this.onlineOpen = true this.onlineGetRewardState[m.missionId] = m.state diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 793fab1316..9cfedfeca5 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -388,77 +388,60 @@ local TypeUpdateFunc = { end, [ActivityTypeDef.ChaoZhiJiJin_128] = function ()--超值基金128 local curData = dataList[ActivityTypeDef.ChaoZhiJiJin_128] + --数据 + local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LuxuryFundConfig,"Type",ActivityTypeDef.ChaoZhiJiJin_128) + for i = 1, #curData.rewards do + for j = 1, #configData do + if curData.rewards[i].missionId == configData[j].Id then + curData.rewards[i].otherData.Day = configData[j].Day + curData.rewards[i].otherData.Reward = configData[j].reward + curData.rewards[i].otherData.State = curData.rewards[i].state + 1 --1未达成--2可领取--3已经领取 + end + end + end + + table.sort(curData.rewards,function (a,b) + return a.missionId < b.missionId + end) --判断是否可领取 curData.FreelyData.isGet = false curData.FreelyData.isAllGet = true for i = 1,#curData.rewards do - if curData.rewards[i].state == 0 then + if curData.rewards[i].otherData.State == 2 then curData.FreelyData.isGet = true end - end - --数据 - local tempData = {} - local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LuxuryFundConfig,"Type",ActivityTypeDef.ChaoZhiJiJin_128) - curData.FreelyData.isAllGet = #curData.rewards == #configData - for j = 1, #configData do - tempData[j] = {} - tempData[j].missionId = configData[j].Id - tempData[j].otherData = {} - tempData[j].otherData.Day = configData[j].Day - tempData[j].otherData.Reward = configData[j].reward - tempData[j].otherData.State = 1 - for i = 1, #curData.rewards do - if curData.rewards[i].missionId == configData[j].Id then - if curData.rewards[i].state == 0 or - curData.rewards[i].state == 1 then - tempData[j].otherData.State = 2--可领取 - elseif curData.rewards[i].state == 2 then - tempData[j].otherData.State = 3--已经领取 - end - end + if curData.rewards[i].otherData.State ~= 3 then + curData.FreelyData.isAllGet = false end end - curData.rewards = tempData - table.sort(curData.rewards,function (a,b) - return a.missionId < b.missionId - end) end, [ActivityTypeDef.ChaoZhiJiJin_328] = function ()--超值基金328 local curData = dataList[ActivityTypeDef.ChaoZhiJiJin_328] + --数据 + local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LuxuryFundConfig,"Type",ActivityTypeDef.ChaoZhiJiJin_328) + for i = 1, #curData.rewards do + for j = 1, #configData do + if curData.rewards[i].missionId == configData[j].Id then + curData.rewards[i].otherData.Day = configData[j].Day + curData.rewards[i].otherData.Reward = configData[j].reward + curData.rewards[i].otherData.State = curData.rewards[i].state + 1 --1未达成--2可领取--3已经领取 + end + end + end + table.sort(curData.rewards,function (a,b) + return a.missionId < b.missionId + end) --判断是否可领取 curData.FreelyData.isGet = false curData.FreelyData.isAllGet = true for i = 1,#curData.rewards do - if curData.rewards[i].state == 0 then + if curData.rewards[i].otherData.State == 2 then curData.FreelyData.isGet = true end - end - --数据 - local tempData = {} - local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LuxuryFundConfig,"Type",ActivityTypeDef.ChaoZhiJiJin_328) - curData.FreelyData.isAllGet = #curData.rewards == #configData - for j = 1, #configData do - tempData[j] = {} - tempData[j].missionId = configData[j].Id - tempData[j].otherData = {} - tempData[j].otherData.Day = configData[j].Day - tempData[j].otherData.Reward = configData[j].reward - tempData[j].otherData.State = 1 - for i = 1, #curData.rewards do - if curData.rewards[i].missionId == configData[j].Id then - if curData.rewards[i].state == 0 or - curData.rewards[i].state == 1 then - tempData[j].otherData.State = 2--可领取 - elseif curData.rewards[i].state == 2 then - tempData[j].otherData.State = 3--已经领取 - end - end + if curData.rewards[i].otherData.State ~= 3 then + curData.FreelyData.isAllGet = false end end - curData.rewards = tempData - table.sort(curData.rewards,function (a,b) - return a.missionId < b.missionId - end) end, } diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 0bd9a53f5b..369025f5ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -179,6 +179,7 @@ function UpperMonthCard:SetRewardInfo() local reward = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LuxuryFundConfig,"Type",self.baseType,"Day",i).reward[1] self.itemLst[i].itemView:OnOpen(false, reward, 1.1, false, false, false, self.sortingOrder) --1 已领取 0 未领 + -- LogGreen(tostring(mission[i].missionId).." ".."state:"..tostring(mission[i].otherData.State)) self.itemLst[i].yiGet.gameObject:SetActive(false) if mission[i].otherData.State == 1 then self.itemLst[i].redPoint.gameObject:SetActive(false)