diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index bf8ba43722..e559c5b6a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -27,13 +27,13 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent) isNoSendNewItemEvent = isNoSendNewItemEvent or false local itemdata = {} --Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum) - -- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据, - if _itemCfgData.ItemType == ItemType.EquipTreasure then - return - end - -- local _itemCfgData = itemConfig[_itemData.itemId] if _itemCfgData ~= nil then + -- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据, + if _itemCfgData.ItemType == ItemType.EquipTreasure then + return + end + -- itemdata.itembackData = _itemData itemdata.itemConfig = _itemCfgData itemdata.id = _itemCfgData.Id diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index b96647679c..51cbfd7d6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -631,13 +631,17 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData) end end --加自身分解消耗的东西 - local rewardShowStr1 = {} - local resolveRewardStr = curEquipTreasureData.itemConfig.ResolveReward - if resolveRewardStr and rewardGroup[tonumber(resolveRewardStr)] then - local curRewardGroupData = rewardGroup[tonumber(resolveRewardStr)] - for key, curRewardGroupDatavalue in ipairs(curRewardGroupData.ShowItem) do - this.GetEquipTreasureResolveItems2(curRewardGroupDatavalue[1], curRewardGroupDatavalue[2]) + -- 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)] + for key, curRewardGroupDatavalue in ipairs(curRewardGroupData.ShowItem) do + this.GetEquipTreasureResolveItems2(curRewardGroupDatavalue[1], curRewardGroupDatavalue[2]) + end end + else + this.GetEquipTreasureResolveItems2(curEquipTreasureData.id, 1) end end local dropList = {}