diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index bb1e9593e6..4ab85c755b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -359,6 +359,8 @@ function this.SystemItemAdapter(node, data, isShowTime) end elseif itemDataConFig.ItemType == ItemType.Equip then UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, data.itemId) + elseif itemDataConFig.ItemType == ItemType.Talisman then + UIManager.OpenPanel(UIName.TalismanInfoPopup, data.itemId, 2, 1) else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, data.itemId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua index d018f2661e..c39da19935 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -58,11 +58,13 @@ end function TalismanInfoPopup:OnOpen(...) local args={...} curHeroData=args[1] - if args[2] then - Type=1 - curHeroConfig=args[1] - TypeLv=args[3] - end + Type = args[2] + TypeLv = args[3] + -- if args[2] then + -- Type=1 + -- curHeroConfig=args[1] + -- TypeLv=args[3] + -- end end function TalismanInfoPopup:OnShow() @@ -85,9 +87,12 @@ function this.Show() if Type==1 then data = ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroConfig.Id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID curLv=TypeLv + elseif Type == 2 then + data[2] = curHeroData -- + curLv = TypeLv else data = ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroData.id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID - curLv=HeroManager.GetTalismanLv(curHeroData.dynamicId) + curLv= TypeLv or HeroManager.GetTalismanLv(curHeroData.dynamicId) end --当前法宝数据