diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua index 544ea7b82a..1728f4d6a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua @@ -47,12 +47,19 @@ function this:BindEvent() PopupTipPanel.ShowTip("升品成功") parent:ClosePanel() --删除魂印 - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() - -- this.StartCompoundSoulPrint(curSelectSoulPrint, true) + if heroId then if func then - func() - end - end) + func() + end + else + UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() + -- this.StartCompoundSoulPrint(curSelectSoulPrint, true) + if func then + func() + end + end) + end + end) end) end @@ -124,7 +131,8 @@ function this:GetGodPrintDes(id) if equipConfig[id] then --魂印效果 local txt = "" - if equipConfig[id].PassiveSkill then + if equipConfig[id].PassiveSkill and tonumber(equipConfig[id].PassiveSkill)~=nil then + --LogError("equipConfig[id].PassiveSkill[1]=="..equipConfig[id].PassiveSkill[1]) local str1 = GetLanguageStrById(passiveSkillConfig[equipConfig[id].PassiveSkill[1]].Desc) if str1 then txt=str1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua index 6ce459ac48..4744ebcada 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua @@ -205,7 +205,7 @@ function this:OnShow(_parent,_args) UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, newHeroConfig.Id, newHeroConfig.MaxRank) end) end - + PlayerPrefs.SetInt(PlayerManager.uid.."hotRank",1) end function this:Refresh(_page) curPage = _page @@ -278,7 +278,7 @@ end function this:OnClose() curZanId=0 heros=nil - + CheckRedPointStatus(RedPointType.HotRank) end function this:OnDestroy()