diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 27fb0565a8..0c3abaf324 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -1141,25 +1141,23 @@ 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 faxiang=ConfigManager.TryGetConfigData(ConfigName.FaxiangConfig,drop.soulEquip[i].equipId) - if faxiang then - 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) itemdata.configData = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemdata.sId) - --ConfigManager.GetConfigData(ConfigName.EquipSign, id) + itemdata.itemType = 5 + local faxiang=ConfigManager.TryGetConfigData(ConfigName.FaxiangConfig,drop.soulEquip[i].equipId) + if faxiang then + itemdata.itemType=51 + elseif itemdata.configData.ItemType==ItemType.Talisman then + itemdata.itemType=ItemType.Talisman + end + --宝物 + + LogError("item33333333333333333 itemid=="..itemdata.sId) itemdata.name = GetLanguageStrById(itemdata.configData.Name) local itemConfig = itemConfig[drop.soulEquip[i].equipId] itemdata.itemConfig = itemConfig @@ -1172,10 +1170,12 @@ function this.GetItemListFromTempBag(drop, isSave) if isSave then if faxiang then FaXiangManager.InitSingleTreasureData(itemdata.backData) + elseif itemdata.configData.ItemType==ItemType.Talisman then + FaLingManager.AddEquipToList(drop) + LogError(" ----------------------------------- 添加法灵") else EquipTreasureManager.InitSingleTreasureData(itemdata.backData) end - end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 79a5459598..35e52cd103 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -198,6 +198,7 @@ function RewardItemPopup:OnOpen(...) end local starItemDataList=BagManager.GetItemListFromTempBag(drop) + --local starItemDataList=BagManager.GetTableByBackDropData(drop) -- LogError("获取宝物的数量:".. LengthOfTable(starItemDataList)) --做装备叠加特殊组拼数据 local equips = {} @@ -529,12 +530,13 @@ function this.SetItemData2(itemdata) elseif bagType==2 then HeroManager.InitMapShotTimeHeroBagData(itemdata.backData) end - elseif itemdata.itemType==4 then - if bagType==1 then - TalismanManager.InitUpdateSingleTalismanData(itemdata.backData) - elseif bagType==2 then - TalismanManager.InitMapShotTimeTalismanBagData(itemdata.backData) - end + elseif itemdata.itemType==14 then + -- if bagType==1 then + -- TalismanManager.InitUpdateSingleTalismanData(itemdata.backData) + -- elseif bagType==2 then + -- TalismanManager.InitMapShotTimeTalismanBagData(itemdata.backData) + -- end + FaLingManager.AddEquipToList(itemdata.backData) elseif itemdata.itemType==5 then if bagType==1 then local faxiang=ConfigManager.TryGetConfigData(ConfigName.FaxiangConfig,itemdata.backData.quipId)