【升级限量礼包】无剩余礼包逻辑缺失修复

dev_chengFeng
ZhangBiao 2021-05-11 10:08:09 +08:00
parent 165c8650a7
commit 7ec3ae01f6
4 changed files with 26 additions and 6 deletions

View File

@ -28,7 +28,7 @@ end
function this.AddUIList(jumpId)
table.insert(this.OpenUIList,jumpId)
for i,v in ipairs(this.OpenUIList) do
LogGreen("AddUIList:"..v)
Log("AddUIList:"..v)
end
end
function this.RemoveUIList()
@ -36,7 +36,7 @@ function this.RemoveUIList()
table.remove(this.OpenUIList,#this.OpenUIList)
end
for i,v in ipairs(this.OpenUIList) do
LogGreen("RemoveUIList:"..v)
Log("RemoveUIList:"..v)
end
end
function this.ChangeUIList(jumpId)
@ -46,7 +46,7 @@ function this.ChangeUIList(jumpId)
this.OpenUIList[#this.OpenUIList] = jumpId
end
for i,v in ipairs(this.OpenUIList) do
LogGreen("ChangeUIList:"..v)
Log("ChangeUIList:"..v)
end
end

View File

@ -88,7 +88,7 @@ local TypeUpdateFunc = {
this.GetExpertData(2,ActivityTypeDef.AccumulativeRechargeExper)
end,
[ActivityTypeDef.UpLvAct] = function ()---日累计充值
this.GetExpertData(2,ActivityTypeDef.UpLvAct)
this.GetExpertData(4,ActivityTypeDef.UpLvAct)
end,
[ActivityTypeDef.TaSuiLingXiao] = function ()--踏碎凌霄
local curData = dataList[ActivityTypeDef.TaSuiLingXiao]
@ -130,6 +130,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 then
curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][1]
@ -196,7 +213,7 @@ end
function this.InitSingleTypeData(actType)
local singleTypeData = {}
local data = ActivityGiftManager.GetActivityTypeInfo(actType)
LogYellow("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime))
Log("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime))
singleTypeData.activityId = data.activityId
singleTypeData.value = data.value
singleTypeData.startTime = data.startTime

View File

@ -134,7 +134,7 @@ end
--刷新数据
function ExpertPage:RefreshData(isTop,isAni)
LogYellow("刷新了么")
Log("ActiveType:"..tostring(self.actConfig.ActiveType))
self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType)
if self.actConfig.RpType > 0 then
CheckRedPointStatus(self.actConfig.RpType)

View File

@ -12,6 +12,7 @@ local BtnState = {
[0] = {Img = "s_slbz_1anniuongse", isRed = true, isGray = false, Text = Language[11948],},
[1] = {Img = "s_slbz_1anniuhuangse", isRed = false, isGray = false, Text = Language[10556]},
[2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[10101]},
[3] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = "已抢空"},
}
--初始化组件(用于子类重写)
@ -90,6 +91,8 @@ function ExpertPre:SetButton()
JumpManager.GoJump(self.data.otherData.Jump)
elseif self.data.otherData.state == 2 then
PopupTipPanel.ShowTip(Language[10101])
elseif self.data.otherData.state == 3 then
PopupTipPanel.ShowTip("奖励已发放完毕!")
end
end)
end