From ad9c72717a62cde3fd6efcd267ef44037bdd48ed Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 27 Nov 2020 10:49:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=91=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=82=B9=E5=87=BB=E6=B3=95=E5=AE=9D=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E6=B3=95=E5=AE=9D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Chat/ChatPanel.lua | 2 ++ .../~Lua/Modules/Popup/TalismanInfoPopup.lua | 17 +++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) 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 --当前法宝数据 From 1e282981274eabfa1e34e53bd9c029942bc341c5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 27 Nov 2020 14:55:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E6=B3=95?= =?UTF-8?q?=E5=AE=9D=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 8eb823937e6be8cca68e28bb3f4cbff9df4f1557 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 27 Nov 2020 14:55:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E6=B3=95?= =?UTF-8?q?=E5=AE=9D=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Chat/ChatPanel.lua | 2 +- .../~Lua/Modules/Popup/TalismanInfoPopup.lua | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) 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 --当前法宝数据