TCX_LongZhu
parent
85ef3d4980
commit
1653645249
|
|
@ -122,7 +122,6 @@ end
|
||||||
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
|
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
|
||||||
function this.GetTableDataByTypeId(typeId)
|
function this.GetTableDataByTypeId(typeId)
|
||||||
if not ActTypeConfigList[typeId] then
|
if not ActTypeConfigList[typeId] then
|
||||||
LogError("ffffffffffffffffffffffffff"..tostring(typeId))
|
|
||||||
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId)
|
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId)
|
||||||
end
|
end
|
||||||
return ActTypeConfigList[typeId]
|
return ActTypeConfigList[typeId]
|
||||||
|
|
|
||||||
|
|
@ -61,12 +61,24 @@ function this.SetBasicValues(giftGoodsList)
|
||||||
" 是否已买:" .. tostring(giftGoodsInfo.isBought))
|
" 是否已买:" .. tostring(giftGoodsInfo.isBought))
|
||||||
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then
|
||||||
--LogError("礼包时间不对ddddddddddddddddddddd" .. tostring(rechargeConfigLocal.Type))
|
--LogError("礼包时间不对ddddddddddddddddddddd" .. tostring(rechargeConfigLocal.Type))
|
||||||
|
if rechargeConfigLocal.Type == 16 then
|
||||||
|
LogError("ggggggggggggggggggg礼包id:" .. giftGoodsInfo.goodsId)
|
||||||
|
|
||||||
|
end
|
||||||
elseif rechargeConfigLocal.Package == 2 and AppConst.SdkChannel == "XQDC" then
|
elseif rechargeConfigLocal.Package == 2 and AppConst.SdkChannel == "XQDC" then
|
||||||
|
if rechargeConfigLocal.Type == 16 then
|
||||||
|
LogError("ggggggggggggggggggg礼包id:" .. giftGoodsInfo.goodsId)
|
||||||
|
|
||||||
|
end
|
||||||
-- elseif this.CheckGiftFrontIsOpen(giftGoodsInfo.goodsId)==false then
|
-- elseif this.CheckGiftFrontIsOpen(giftGoodsInfo.goodsId)==false then
|
||||||
-- LogError("前置条件不满足================")
|
-- LogError("前置条件不满足================")
|
||||||
--LogError("礼包时间不对ddddddddddddddddddddd" .. tostring(rechargeConfigLocal.Type))
|
--LogError("礼包时间不对ddddddddddddddddddddd" .. tostring(rechargeConfigLocal.Type))
|
||||||
else
|
else
|
||||||
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
if giftGoodsInfoList[rechargeConfigLocal.Type] then
|
||||||
|
if rechargeConfigLocal.Type == 16 then
|
||||||
|
LogError("ggggggggggggggggggg礼包id:" .. giftGoodsInfo.goodsId)
|
||||||
|
|
||||||
|
end
|
||||||
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
|
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -190,10 +190,12 @@ function this.ShowPokemonInfo()
|
||||||
for i = 1, #curUpLvConsume do
|
for i = 1, #curUpLvConsume do
|
||||||
local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[i][1])
|
local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[i][1])
|
||||||
if curMaterialBagNum >= upLvConFig.Consume[i][2] then
|
if curMaterialBagNum >= upLvConFig.Consume[i][2] then
|
||||||
this.upLvItemParentText.text = string.format("<color=#FFFFFF>%s/%s</color>",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
|
--this.upLvItemParentText.text = string.format("<color=#FFFFFF>%s/%s</color>",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
|
||||||
|
this.upLvItemParentText.text = string.format("<color=#FFFFFF>%s/%s</color>",curMaterialBagNum,upLvConFig.Consume[i][2])
|
||||||
else
|
else
|
||||||
isMaterial = upLvConFig.Consume[i][1]
|
isMaterial = upLvConFig.Consume[i][1]
|
||||||
this.upLvItemParentText.text = string.format("<color=#FF0000>%s/%s</color>",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
|
--this.upLvItemParentText.text = string.format("<color=#FF0000>%s/%s</color>",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
|
||||||
|
this.upLvItemParentText.text = string.format("<color=#FF0000>%s/%s</color>",curMaterialBagNum,upLvConFig.Consume[i][2])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if isMaterial ~= 0 then
|
if isMaterial ~= 0 then
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,8 @@ end
|
||||||
function RecruitTreasurePanel:refresh()
|
function RecruitTreasurePanel:refresh()
|
||||||
this.treasureData = RecruitTreasureManager.GetRecruitTreasureData(configs[curPage].ActId,configs[curPage].ShopData[1][1])
|
this.treasureData = RecruitTreasureManager.GetRecruitTreasureData(configs[curPage].ActId,configs[curPage].ShopData[1][1])
|
||||||
this.actData = ActivityGiftManager.GetActivityInfoByType(configs[curPage].ActId)
|
this.actData = ActivityGiftManager.GetActivityInfoByType(configs[curPage].ActId)
|
||||||
this.isBuy = RecruitTreasureManager.CheckIsBuyTreasureByGoodsId(configs[curPage].ShopData[1][1])
|
LogError("ttttttttttttttttt***:"..configs[curPage].ShopData[1][1])
|
||||||
|
this.isBuy = RecruitTreasureManager.CheckIsBuyTreasureByGoodsId(configs[curPage].ShopData[1][1])
|
||||||
self:topBar()
|
self:topBar()
|
||||||
self:showTaskList()
|
self:showTaskList()
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue