From f56fa9d4e819f2fd784759c3e35ef606d1bccd15 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 9 Oct 2020 15:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=20=20?= =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E6=8B=9B=E5=8B=9F=E5=B8=A6?= =?UTF-8?q?=E5=AE=9D=E5=99=A8=E7=9A=84=E8=8B=B1=E9=9B=84=E6=98=AF=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/View/ExpeditionMonsterInfo_Recruit.lua | 6 +++++- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index 99f70ac272..35b595b978 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -38,7 +38,11 @@ function this:BtnClickEvent() if curSelectHero then --LogError("monsterData.sortId,curSelectHero.dynamicId "..monsterData.sortId.." "..curSelectHero.id) NetManager.HeroNodeRequest(monsterData.sortId,curSelectHero.id,function (msg) - -- LogError("#msg.drop.Hero "..#msg.drop.Hero) + if msg.drop and msg.drop.soulEquip and #msg.drop.soulEquip > 0 then + for i = 1, #msg.drop.soulEquip do + ExpeditionManager.InitSingleTreasureData(msg.drop.soulEquip[i]) + end + end if msg.drop and msg.drop.Hero and msg.drop.Hero[1] then ExpeditionManager.UpdateHeroDatas(msg.drop.Hero[1]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 0d1cf19774..e9f4f4f24e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -367,6 +367,9 @@ function this.EquipInfo() for n = 1, #curHeroData.jewels do local did=curHeroData.jewels[n] local data=EquipTreasureManager.GetSingleTreasureByIdDyn(did) or ExpeditionManager.GetSingleTreasureByIdDyn(did) or GoodFriendManager.GetSingleTreasureByIdDyn(did) + if not data then + return + end --是魂宝1 还是灵宝2 local pos= jewelConfig[data.id].Location