diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index 4ab85c755b..a3f122b9b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -360,7 +360,7 @@ function this.SystemItemAdapter(node, data, isShowTime) 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) + -- 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 c39da19935..262be80e62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -58,13 +58,11 @@ end function TalismanInfoPopup:OnOpen(...) local args={...} curHeroData=args[1] - Type = args[2] + if args[2] then + Type=1 + curHeroConfig=args[1] TypeLv = args[3] - -- if args[2] then - -- Type=1 - -- curHeroConfig=args[1] - -- TypeLv=args[3] - -- end + end end function TalismanInfoPopup:OnShow() @@ -87,12 +85,9 @@ 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= TypeLv or HeroManager.GetTalismanLv(curHeroData.dynamicId) + curLv=HeroManager.GetTalismanLv(curHeroData.dynamicId) end --当前法宝数据