diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
index 9d07b1079a..3dd5c0e792 100644
--- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
@@ -122,7 +122,6 @@ end
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
function this.GetTableDataByTypeId(typeId)
if not ActTypeConfigList[typeId] then
- LogError("ffffffffffffffffffffffffff"..tostring(typeId))
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId)
end
return ActTypeConfigList[typeId]
diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
index 7146d0cfda..36e94d8d01 100644
--- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
@@ -61,12 +61,24 @@ function this.SetBasicValues(giftGoodsList)
" 是否已买:" .. tostring(giftGoodsInfo.isBought))
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))
+ if rechargeConfigLocal.Type == 16 then
+ LogError("ggggggggggggggggggg礼包id:" .. giftGoodsInfo.goodsId)
+
+ end
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
-- LogError("前置条件不满足================")
--LogError("礼包时间不对ddddddddddddddddddddd" .. tostring(rechargeConfigLocal.Type))
else
if giftGoodsInfoList[rechargeConfigLocal.Type] then
+ if rechargeConfigLocal.Type == 16 then
+ LogError("ggggggggggggggggggg礼包id:" .. giftGoodsInfo.goodsId)
+
+ end
table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo)
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
index dda0735428..866f6a0b6c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua
@@ -190,10 +190,12 @@ function this.ShowPokemonInfo()
for i = 1, #curUpLvConsume do
local curMaterialBagNum = BagManager.GetItemCountById(upLvConFig.Consume[i][1])
if curMaterialBagNum >= upLvConFig.Consume[i][2] then
- this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ --this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ this.upLvItemParentText.text = string.format("%s/%s",curMaterialBagNum,upLvConFig.Consume[i][2])
else
isMaterial = upLvConFig.Consume[i][1]
- this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ --this.upLvItemParentText.text = string.format("%s/%s",PrintWanNum2(curMaterialBagNum),PrintWanNum2(upLvConFig.Consume[i][2]))
+ this.upLvItemParentText.text = string.format("%s/%s",curMaterialBagNum,upLvConFig.Consume[i][2])
end
end
if isMaterial ~= 0 then
diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua
index 366138b086..eaee1657df 100644
--- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua
@@ -173,7 +173,8 @@ end
function RecruitTreasurePanel:refresh()
this.treasureData = RecruitTreasureManager.GetRecruitTreasureData(configs[curPage].ActId,configs[curPage].ShopData[1][1])
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:showTaskList()
end