【宝物】一键装备替下来的,不在背包显示

dev_chengFeng
jiaoyangna 2020-07-13 15:00:07 +08:00
parent 0ae50e09be
commit 3953a76280
4 changed files with 11 additions and 15 deletions

View File

@ -547,6 +547,7 @@ function this.GoIntoBackData(drop)
-- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i]) -- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i])
-- end -- end
-- end -- end
LogBlue("drop.soulEquip:"..#drop.soulEquip)
if (#drop.soulEquip > 0) then if (#drop.soulEquip > 0) then
--SoulPrintManager.InitServerData(drop.soulEquip) --SoulPrintManager.InitServerData(drop.soulEquip)
EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip) EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip)
@ -572,6 +573,7 @@ function this.GMCallBackData(drop)
-- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i]) -- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i])
-- end -- end
-- end -- end
LogBlue("drop.soulEquip:"..#drop.soulEquip)
if (#drop.soulEquip > 0) then if (#drop.soulEquip > 0) then
--SoulPrintManager.InitServerData(drop.soulEquip) --SoulPrintManager.InitServerData(drop.soulEquip)
EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip) EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip)
@ -649,6 +651,7 @@ function this.GetTableByBackDropData(drop)
-- TalismanManager.InitUpdateSingleTalismanData(itemdata.backData) -- TalismanManager.InitUpdateSingleTalismanData(itemdata.backData)
-- end -- end
-- end -- end
LogBlue("drop.soulEquip:"..#drop.soulEquip)
if drop.soulEquip ~= nil and #drop.soulEquip > 0 then if drop.soulEquip ~= nil and #drop.soulEquip > 0 then
Log("drop.especialEquipId " .. #drop.soulEquip) Log("drop.especialEquipId " .. #drop.soulEquip)
for i = 1, #drop.soulEquip do for i = 1, #drop.soulEquip do

View File

@ -80,8 +80,6 @@ function BagPanel:BindEvent()
Util.AddClick(this.fenJieBtn, function() Util.AddClick(this.fenJieBtn, function()
if sortIndex == ItemBaseType.Equip then if sortIndex == ItemBaseType.Equip then
UIManager.OpenPanel(UIName.EquipSellSelectPopup)--宝器 UIManager.OpenPanel(UIName.EquipSellSelectPopup)--宝器
elseif sortIndex == ItemBaseType.EquipTreasure then
UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 3)--宝器
elseif sortIndex == ItemBaseType.SoulPrint then elseif sortIndex == ItemBaseType.SoulPrint then
UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 4)--魂印 UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel, 4)--魂印
end end

View File

@ -320,9 +320,9 @@ end
function this.GetAllTreasuresByQuantity(Quantity) function this.GetAllTreasuresByQuantity(Quantity)
local curAllEquipTreasure = {} local curAllEquipTreasure = {}
for key, value in pairs(allTreasures) do for key, value in pairs(allTreasures) do
if value.upHeroDid == "" and value.itemConfig.Quantity == Quantity then if (value.upHeroDid == "" or value.upHeroDid == "0") and value.itemConfig.Quantity == Quantity then
table.insert(curAllEquipTreasure, value) table.insert(curAllEquipTreasure, value)
elseif value.upHeroDid == "" and Quantity == 1 then --1 全部 elseif (value.upHeroDid == "" or value.upHeroDid == "0") and Quantity == 1 then --1 全部
table.insert(curAllEquipTreasure, value) table.insert(curAllEquipTreasure, value)
end end
end end
@ -333,7 +333,7 @@ function this.GetAllTreasuresByLocation(Location, PropertyName)
local curAllEquipTreasure = {} local curAllEquipTreasure = {}
for key, value in pairs(allTreasures) do for key, value in pairs(allTreasures) do
if if
value.upHeroDid == "" and jewelConfig[value.id].Location == Location and (value.upHeroDid == "" or value.upHeroDid == "0" ) and jewelConfig[value.id].Location == Location and
jewelConfig[value.id].Race == PropertyName jewelConfig[value.id].Race == PropertyName
then then
table.insert(curAllEquipTreasure, value) table.insert(curAllEquipTreasure, value)
@ -347,7 +347,7 @@ function this.GetAllTreasures(PropertyName)
end end
local curAllEquipTreasure = {} local curAllEquipTreasure = {}
for key, value in pairs(allTreasures) do for key, value in pairs(allTreasures) do
if value.upHeroDid == "" then if value.upHeroDid == "" or value.upHeroDid == "0" then
if PropertyName then if PropertyName then
if jewelConfig[value.id].Race == PropertyName then if jewelConfig[value.id].Race == PropertyName then
table.insert(curAllEquipTreasure, value) table.insert(curAllEquipTreasure, value)

View File

@ -296,7 +296,6 @@ function this:AllEquipUpBtnOnClick()
local equipEffectPos = {} local equipEffectPos = {}
local treasureEffectPos = {} local treasureEffectPos = {}
--如果身上的装备 带锁 则不替换
for i = 1, 6 do for i = 1, 6 do
local curPosEquip = {} local curPosEquip = {}
local index = i local index = i
@ -342,7 +341,7 @@ function this:AllEquipUpBtnOnClick()
if equiData.idDyn and isCanUpEquipTreasure and ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn) or (not curHeroEquipDatas[index])) then if equiData.idDyn and isCanUpEquipTreasure and ((curHeroEquipDatas[index] and equiData.idDyn ~= curHeroEquipDatas[index].idDyn) or (not curHeroEquipDatas[index])) then
table.insert(allTreasureIds, equiData.idDyn) table.insert(allTreasureIds, equiData.idDyn)
else else
if not equiData.idDyn and (not curHeroEquipDatas[index] or tonumber(equiData.id) ~= tonumber(curHeroEquipDatas[index].id))then if not curHeroEquipDatas[index] or tonumber(equiData.id) ~= tonumber(curHeroEquipDatas[index].id) then
table.insert(allEquipIds, tostring(equiData.id)) table.insert(allEquipIds, tostring(equiData.id))
end end
end end
@ -365,9 +364,9 @@ function this:AllEquipUpBtnOnClick()
if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then
--isCanUpEquipTreasure --isCanUpEquipTreasure
if allEquipIds and #allEquipIds > 0 then if allEquipIds and #allEquipIds > 0 then
for i = 1, #allEquipIds do -- for i = 1, #allEquipIds do
LogGreen(curHeroData.dynamicId .. " " .. allEquipIds[i]) -- LogGreen(curHeroData.dynamicId .. " " .. allEquipIds[i])
end -- end
--穿装备协议 --穿装备协议
NetManager.EquipWearRequest( NetManager.EquipWearRequest(
curHeroData.dynamicId, curHeroData.dynamicId,
@ -973,8 +972,6 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
--刷新界面 --刷新界面
this.ShowHeroEquip() this.ShowHeroEquip()
--上阵刷新红点 --上阵刷新红点
LogBlue("961:"..#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId))
LogBlue(tostring(isUpZhen))
this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and isUpZhen) this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and isUpZhen)
--刷新当前英雄可穿装备 --刷新当前英雄可穿装备
if indexBtnNum == PosIdConst.All then if indexBtnNum == PosIdConst.All then
@ -1008,8 +1005,6 @@ function this:AddRedPointVale(_equipDatas)
end end
function this:SortEquipDatas(_equipDatas) function this:SortEquipDatas(_equipDatas)
LogBlue("995:"..#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId))
LogBlue(tostring(isUpZhen))
if teamHero[curHeroData.dynamicId] then if teamHero[curHeroData.dynamicId] then
isUpZhen = true isUpZhen = true
this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0) this.allEquipUpRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0)