Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng
ZhangBiao 2020-10-12 16:08:23 +08:00
commit e2b0244881
2 changed files with 15 additions and 11 deletions

View File

@ -27,13 +27,13 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
isNoSendNewItemEvent = isNoSendNewItemEvent or false
local itemdata = {}
--Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
local _itemCfgData = itemConfig[_itemData.itemId]
if _itemCfgData ~= nil then
-- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据,
if _itemCfgData.ItemType == ItemType.EquipTreasure then
return
end
--
local _itemCfgData = itemConfig[_itemData.itemId]
if _itemCfgData ~= nil then
itemdata.itembackData = _itemData
itemdata.itemConfig = _itemCfgData
itemdata.id = _itemCfgData.Id

View File

@ -631,7 +631,8 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
end
end
--加自身分解消耗的东西
local rewardShowStr1 = {}
-- local rewardShowStr1 = {}
if curEquipTreasureData.refineLv <= 0 and curEquipTreasureData.lv <= 0 then
local resolveRewardStr = curEquipTreasureData.itemConfig.ResolveReward
if resolveRewardStr and rewardGroup[tonumber(resolveRewardStr)] then
local curRewardGroupData = rewardGroup[tonumber(resolveRewardStr)]
@ -639,6 +640,9 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
this.GetEquipTreasureResolveItems2(curRewardGroupDatavalue[1], curRewardGroupDatavalue[2])
end
end
else
this.GetEquipTreasureResolveItems2(curEquipTreasureData.id, 1)
end
end
local dropList = {}
for ShowItemlistkey, ShowItemlistvalue in pairs(ShowItemlist) do