diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 0b819b8a85..6a12de49ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -663,7 +663,7 @@ function this.GMCallBackData(drop) -- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i]) -- end -- end - LogBlue("drop.soulEquip:"..#drop.soulEquip) + -- LogBlue("drop.soulEquip:"..#drop.soulEquip) if (#drop.soulEquip > 0) then --SoulPrintManager.InitServerData(drop.soulEquip) EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index bb4c28c090..b1e3c590b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3818,6 +3818,20 @@ function this.GetHeroIdByEquipId(_id) end end +--通过装备id找英雄idList +function this.GetHeroIdListByEquipId(_id) + local heroList = {} + for _, heroData in ipairs(this.heroDataLists) do + for i = 1, #heroData.equipIdList do + if _id == tonumber(heroData.equipIdList[i]) then + -- return heroData.name + table.insert(heroList,heroData.name) + end + end + end + return heroList +end + function this.CheckIsUpTreasure(Did,index) if not Did then return false diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua index 46dcb84714..31f28af20d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua @@ -141,7 +141,7 @@ function this:ShowSingleData(item,sdata,index) end end) Util.AddOnceClick(equiped,function () - MsgPanel.ShowTwo(string.format("%s穿戴该装备,是否前往卸下?",HeroManager.GetHeroIdByEquipId(sdata.Id)),function() end,function() + MsgPanel.ShowTwo(string.format("%s穿戴该装备,是否前往卸下?",HeroManager.GetHeroIdListByEquipId(sdata.Id)[index]),function() end,function() JumpManager.GoJump(22001) end,"取消","确定") end)