限时召唤】点十连,单抽的免费不显示了
parent
fb8a020790
commit
40fa614a52
|
|
@ -203,12 +203,9 @@ function TimeLimitedCall:RefreshNextLevelReward()
|
||||||
if reMaintimes == 0 then
|
if reMaintimes == 0 then
|
||||||
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count
|
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count
|
||||||
end
|
end
|
||||||
--LogBlue("reMaintimes:"..reMaintimes)
|
|
||||||
self.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes)
|
self.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes)
|
||||||
|
|
||||||
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||||
--LogBlue(info.endTime)
|
|
||||||
--LogBlue(info.startTime)
|
|
||||||
info = info.endTime - info.startTime
|
info = info.endTime - info.startTime
|
||||||
info = self:TimeToDHMS(info)
|
info = self:TimeToDHMS(info)
|
||||||
self.recruitTimeUpdate.text = string.format(Language[12230]..info)
|
self.recruitTimeUpdate.text = string.format(Language[12230]..info)
|
||||||
|
|
@ -227,9 +224,7 @@ function TimeLimitedCall:TimeToDHMS(second)
|
||||||
end
|
end
|
||||||
|
|
||||||
function TimeLimitedCall:GetMissionStateById(num,activityId)
|
function TimeLimitedCall:GetMissionStateById(num,activityId)
|
||||||
--LogBlue("activityId:"..activityId.. ",num:"..num)
|
|
||||||
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
|
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
|
||||||
LogBlue(mission.progress.." "..mission.state)
|
|
||||||
return mission.progress,mission.state
|
return mission.progress,mission.state
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -243,7 +238,6 @@ function TimeLimitedCall:RefreshGetHeroTimes()
|
||||||
local freeTime= 0
|
local freeTime= 0
|
||||||
if freeTimesId>0 then
|
if freeTimesId>0 then
|
||||||
freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId)
|
||||||
LogBlue("freeTime:"..freeTime)
|
|
||||||
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
RecruitManager.freeUseTimeList[freeTimesId]=freeTime
|
||||||
end
|
end
|
||||||
--按钮赋值
|
--按钮赋值
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ end
|
||||||
function PrivilegeManager.InitPrivilegeData(data)
|
function PrivilegeManager.InitPrivilegeData(data)
|
||||||
this._PrivilegeInfoList = {}
|
this._PrivilegeInfoList = {}
|
||||||
for i = 1, #data do
|
for i = 1, #data do
|
||||||
|
|
||||||
--[[data:从后端接受到的数据 data是个列表 列表元素的结构id与priviledge的id对应 usedTimes使用次数 endTime 有效时间]]
|
--[[data:从后端接受到的数据 data是个列表 列表元素的结构id与priviledge的id对应 usedTimes使用次数 endTime 有效时间]]
|
||||||
this._PrivilegeInfoList[data[i].id] = { id = data[i].id, usedTimes = data[i].usedTimes, endTime = data[i].effectTime }
|
this._PrivilegeInfoList[data[i].id] = { id = data[i].id, usedTimes = data[i].usedTimes, endTime = data[i].effectTime }
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ function this.RecruitRequest(recruitType, func, privilegeId)
|
||||||
if BagManager.GetItemCountById(itemId) >= itemNum or (this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1) or isFindFairyFree then
|
if BagManager.GetItemCountById(itemId) >= itemNum or (this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1) or isFindFairyFree then
|
||||||
NetManager.RecruitRequest(recruitType, function(msg)
|
NetManager.RecruitRequest(recruitType, function(msg)
|
||||||
local lotteryType=ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType).LotteryType --若是活动招募,目前活动招募是东海寻仙,分多期
|
local lotteryType=ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType).LotteryType --若是活动招募,目前活动招募是东海寻仙,分多期
|
||||||
if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or lotteryType==3) then --若某抽卡类型有免费次数
|
if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or RecruitType.QianKunBoxSingle==recruitType) then --若某抽卡类型有免费次数
|
||||||
if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then
|
if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1)
|
PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1)
|
||||||
this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId)
|
this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId)
|
||||||
|
|
|
||||||
|
|
@ -77,9 +77,13 @@ function EquipSellSelectPopup:BindEvent()
|
||||||
starList[i] = i
|
starList[i] = i
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if LengthOfTable(qualityList) == 0 or LengthOfTable(starList) == 0 then
|
||||||
|
PopupTipPanel.ShowTip("未查询到符合条件的装备!")
|
||||||
|
return
|
||||||
|
end
|
||||||
local data = BagManager.GetEquipDataByEquipQualityAndStar(qualityList,starList)
|
local data = BagManager.GetEquipDataByEquipQualityAndStar(qualityList,starList)
|
||||||
if #data < 1 then
|
if #data < 1 then
|
||||||
PopupTipPanel.ShowTip("没有满足条件的装备")
|
PopupTipPanel.ShowTip("未查询到符合条件的装备!")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue