From 726b53355e1d4db3da5075c7fa271b2da445890c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sun, 19 Feb 2023 21:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E7=9B=B8=E8=83=8C=E5=8C=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagManager.lua | 21 +++++++++++++++++-- .../~Lua/Modules/Popup/RewardItemPopup.lua | 8 ++++++- .../ManagedResources/~Lua/View/ItemView.lua | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 2c282aca5a..d1ba9bbbd4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -26,7 +26,7 @@ end function this.UpdateBagData(_itemData, isNoSendNewItemEvent) isNoSendNewItemEvent = isNoSendNewItemEvent or false local itemdata = {} - --LogGreen("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum) + LogGreen("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum) local _itemCfgData = itemConfig[_itemData.itemId] if _itemCfgData ~= nil then -- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据, @@ -1016,9 +1016,12 @@ function this.GetItemListFromTempBag(drop, isSave) local itemdata = {} local equipId = drop.equipId[i].equipId local equip = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, equipId) + local faxiang ConfigManager.TryGetConfigData(ConfigName.FaxiangConfig, equipId) if equip then itemdata.itemType = 5 --宝物 + elseif faxiang then + itemdata.itemType=51 else itemdata.itemType = 2 --装备 @@ -1062,14 +1065,21 @@ function this.GetItemListFromTempBag(drop, isSave) if drop.soulEquip ~= nil and #drop.soulEquip > 0 then for i = 1, #drop.soulEquip do + local itemdata = {} itemdata.itemType = 5 + local faxiang2 ConfigManager.TryGetConfigData(ConfigName.JewelConfig,drop.soulEquip[i].equipId) + if faxiang2==nil then + LogError("111111111111111111111111111111") + itemdata.itemType=51 + end --宝物 itemdata.sId = drop.soulEquip[i].equipId itemdata.backData = drop.soulEquip[i] itemdata.data = drop.soulEquip itemdata.lv = drop.soulEquip[i].exp itemdata.refineLv = drop.soulEquip[i].rebuildLevel + LogError("item33333333333333333 itemid=="..itemdata.sId.."111111") --SoulPrintManager.UpSoulPrintLevel(drop.soulEquip[i].equipId, drop.soulEquip[i].exp) --itemdata.level = SoulPrintManager.soulPrintLevel[drop.soulEquip[i].equipId] --local id = SoulPrintManager.GetSoulPrintId(drop.soulEquip[i].equipId, itemdata.level) @@ -1082,14 +1092,21 @@ function this.GetItemListFromTempBag(drop, isSave) itemdata.icon = GetResourcePath(itemConfig.ResourceID) itemdata.num = 1 itemdata.id = drop.soulEquip[i].id + table.insert(itemDataList, itemdata) if isSave then - EquipTreasureManager.InitSingleTreasureData(itemdata.backData) + if faxiang2==nil then + FaXiangManager.InitSingleTreasureData(itemdata.backData) + else + EquipTreasureManager.InitSingleTreasureData(itemdata.backData) + end + end end end if drop.pokemon ~= nil and #drop.pokemon > 0 then for i = 1, #drop.pokemon do + LogError("item44444444444444") local itemdata = {} itemdata.itemType = 6 itemdata.sId = drop.pokemon[i].tempId diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index a352d38444..d99eb05cd6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -535,7 +535,13 @@ function this.SetItemData2(itemdata) end elseif itemdata.itemType==5 then if bagType==1 then - EquipTreasureManager.InitSingleTreasureData(itemdata.backData) + local faxiang=ConfigManager.TryGetConfigData(ConfigName.JewelConfig,itemdata.backData.quipId) + if faxiang==nil then + FaXiangManager.InitSingleTreasureData(itemdata.backData) + else + EquipTreasureManager.InitSingleTreasureData(itemdata.backData) + end + elseif bagType==2 then end elseif itemdata.itemType==6 then diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index da3db8ca7c..5e0ee0be5b 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -442,7 +442,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3) end) - elseif itemDataConFig.ItemType == ItemType.likeabilityItemChip or itemDataConFig.ItemType == ItemType.EquipChip then + elseif _itemData.ItemType == ItemType.likeabilityItemChip or _itemData.ItemType == ItemType.EquipChip then self.fragmentIcon:SetActive(true) if itemConfig[itemSId].PropertyName > 0 then self.fragmentIcon.gameObject:SetActive(true)