法相背包修改提交
parent
d84f374bf2
commit
726b53355e
|
@ -26,7 +26,7 @@ end
|
||||||
function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
|
function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
|
||||||
isNoSendNewItemEvent = isNoSendNewItemEvent or false
|
isNoSendNewItemEvent = isNoSendNewItemEvent or false
|
||||||
local itemdata = {}
|
local itemdata = {}
|
||||||
--LogGreen("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
|
LogGreen("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
|
||||||
local _itemCfgData = itemConfig[_itemData.itemId]
|
local _itemCfgData = itemConfig[_itemData.itemId]
|
||||||
if _itemCfgData ~= nil then
|
if _itemCfgData ~= nil then
|
||||||
-- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据,
|
-- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据,
|
||||||
|
@ -1016,9 +1016,12 @@ function this.GetItemListFromTempBag(drop, isSave)
|
||||||
local itemdata = {}
|
local itemdata = {}
|
||||||
local equipId = drop.equipId[i].equipId
|
local equipId = drop.equipId[i].equipId
|
||||||
local equip = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, equipId)
|
local equip = ConfigManager.TryGetConfigData(ConfigName.JewelConfig, equipId)
|
||||||
|
local faxiang ConfigManager.TryGetConfigData(ConfigName.FaxiangConfig, equipId)
|
||||||
if equip then
|
if equip then
|
||||||
itemdata.itemType = 5
|
itemdata.itemType = 5
|
||||||
--宝物
|
--宝物
|
||||||
|
elseif faxiang then
|
||||||
|
itemdata.itemType=51
|
||||||
else
|
else
|
||||||
itemdata.itemType = 2
|
itemdata.itemType = 2
|
||||||
--装备
|
--装备
|
||||||
|
@ -1062,14 +1065,21 @@ function this.GetItemListFromTempBag(drop, isSave)
|
||||||
|
|
||||||
if drop.soulEquip ~= nil and #drop.soulEquip > 0 then
|
if drop.soulEquip ~= nil and #drop.soulEquip > 0 then
|
||||||
for i = 1, #drop.soulEquip do
|
for i = 1, #drop.soulEquip do
|
||||||
|
|
||||||
local itemdata = {}
|
local itemdata = {}
|
||||||
itemdata.itemType = 5
|
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.sId = drop.soulEquip[i].equipId
|
||||||
itemdata.backData = drop.soulEquip[i]
|
itemdata.backData = drop.soulEquip[i]
|
||||||
itemdata.data = drop.soulEquip
|
itemdata.data = drop.soulEquip
|
||||||
itemdata.lv = drop.soulEquip[i].exp
|
itemdata.lv = drop.soulEquip[i].exp
|
||||||
itemdata.refineLv = drop.soulEquip[i].rebuildLevel
|
itemdata.refineLv = drop.soulEquip[i].rebuildLevel
|
||||||
|
LogError("item33333333333333333 itemid=="..itemdata.sId.."111111")
|
||||||
--SoulPrintManager.UpSoulPrintLevel(drop.soulEquip[i].equipId, drop.soulEquip[i].exp)
|
--SoulPrintManager.UpSoulPrintLevel(drop.soulEquip[i].equipId, drop.soulEquip[i].exp)
|
||||||
--itemdata.level = SoulPrintManager.soulPrintLevel[drop.soulEquip[i].equipId]
|
--itemdata.level = SoulPrintManager.soulPrintLevel[drop.soulEquip[i].equipId]
|
||||||
--local id = SoulPrintManager.GetSoulPrintId(drop.soulEquip[i].equipId, itemdata.level)
|
--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.icon = GetResourcePath(itemConfig.ResourceID)
|
||||||
itemdata.num = 1
|
itemdata.num = 1
|
||||||
itemdata.id = drop.soulEquip[i].id
|
itemdata.id = drop.soulEquip[i].id
|
||||||
|
|
||||||
table.insert(itemDataList, itemdata)
|
table.insert(itemDataList, itemdata)
|
||||||
if isSave then
|
if isSave then
|
||||||
EquipTreasureManager.InitSingleTreasureData(itemdata.backData)
|
if faxiang2==nil then
|
||||||
|
FaXiangManager.InitSingleTreasureData(itemdata.backData)
|
||||||
|
else
|
||||||
|
EquipTreasureManager.InitSingleTreasureData(itemdata.backData)
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if drop.pokemon ~= nil and #drop.pokemon > 0 then
|
if drop.pokemon ~= nil and #drop.pokemon > 0 then
|
||||||
for i = 1, #drop.pokemon do
|
for i = 1, #drop.pokemon do
|
||||||
|
LogError("item44444444444444")
|
||||||
local itemdata = {}
|
local itemdata = {}
|
||||||
itemdata.itemType = 6
|
itemdata.itemType = 6
|
||||||
itemdata.sId = drop.pokemon[i].tempId
|
itemdata.sId = drop.pokemon[i].tempId
|
||||||
|
|
|
@ -535,7 +535,13 @@ function this.SetItemData2(itemdata)
|
||||||
end
|
end
|
||||||
elseif itemdata.itemType==5 then
|
elseif itemdata.itemType==5 then
|
||||||
if bagType==1 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
|
elseif bagType==2 then
|
||||||
end
|
end
|
||||||
elseif itemdata.itemType==6 then
|
elseif itemdata.itemType==6 then
|
||||||
|
|
|
@ -442,7 +442,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
UIManager.OpenPanel(UIName.RewardGemSingleShowPopup, _itemData.backData.itemId,3)
|
||||||
end)
|
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)
|
self.fragmentIcon:SetActive(true)
|
||||||
if itemConfig[itemSId].PropertyName > 0 then
|
if itemConfig[itemSId].PropertyName > 0 then
|
||||||
self.fragmentIcon.gameObject:SetActive(true)
|
self.fragmentIcon.gameObject:SetActive(true)
|
||||||
|
|
Loading…
Reference in New Issue