【超值寂静】提交

dev_chengFeng
张彪 2022-01-24 18:03:04 +08:00
parent 92d47074a4
commit 8e85780697
3 changed files with 38 additions and 54 deletions

View File

@ -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

View File

@ -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,
}

View File

@ -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)