【每日特惠】注释代码
parent
81660bd819
commit
d56afde090
|
@ -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
|
||||
|
|
|
@ -740,29 +740,30 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType,actType)
|
|||
else
|
||||
data.tipImageText = nil
|
||||
end
|
||||
--每日特惠改回以前一件购买,取消了购买后礼包变任务的形式
|
||||
-- LogGreen("actType:"..tostring(actType))
|
||||
if actType then
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(actType)
|
||||
-- LogGreen("actData:"..tostring(actData))
|
||||
if actData then
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",actType,"Sort",data.shopItemData.Sequence)
|
||||
data.price = "可领取"
|
||||
data.linkAct = true
|
||||
data.missionId = configData.Id
|
||||
data.activityId = actData.activityId
|
||||
data.state = actData.mission[data.shopItemData.Sequence].state
|
||||
data.buyInfo = ""
|
||||
else
|
||||
data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
|
||||
data.linkAct = false
|
||||
data.missionId = 0
|
||||
data.activityId = 0
|
||||
data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
|
||||
end
|
||||
else
|
||||
-- if actType then
|
||||
-- local actData = ActivityGiftManager.GetActivityTypeInfo(actType)
|
||||
-- -- LogGreen("actData:"..tostring(actData))
|
||||
-- if actData then
|
||||
-- local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",actType,"Sort",data.shopItemData.Sequence)
|
||||
-- data.price = "可领取"
|
||||
-- data.linkAct = true
|
||||
-- data.missionId = configData.Id
|
||||
-- data.activityId = actData.activityId
|
||||
-- data.state = actData.mission[data.shopItemData.Sequence].state
|
||||
-- data.buyInfo = ""
|
||||
-- else
|
||||
-- data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
|
||||
-- data.linkAct = false
|
||||
-- data.missionId = 0
|
||||
-- data.activityId = 0
|
||||
-- data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
|
||||
-- end
|
||||
-- else
|
||||
data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
|
||||
data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
|
||||
end
|
||||
-- end
|
||||
data.endTime = shopData.endTime
|
||||
else
|
||||
return nil
|
||||
|
|
Loading…
Reference in New Issue