From 199326c74bff45a9dc34f5bd9d529ec5d8ee38a8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Oct 2020 14:34:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=83=8C=E5=8C=85?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=AE=9D=E5=99=A8=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE=E7=9A=84=E5=AF=BC=E8=87=B4=E8=83=8C?= =?UTF-8?q?=E5=8C=85=E7=95=8C=E9=9D=A2=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E8=BF=99=E9=87=8C=E4=B8=B4=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=AE=A9=E7=8E=A9=E5=AE=B6=E8=BF=9B=E5=8E=BB=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=90=8E=E7=AB=AF=E5=A4=84=E7=90=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Bag/BagManager.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 From 721418b30a35a48f6faeb4c566a8b8bc03cbb0ac Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 12 Oct 2020 15:54:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=20=20?= =?UTF-8?q?=20=E5=AE=9D=E5=99=A8=E5=88=86=E8=A7=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/RoleInfo/EquipTreasureManager.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 = {}