diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 154cafd070..d5dd27726a 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -135,7 +135,7 @@ function HandBookHeroInfoPanel:BindEvent() end) Util.AddClick(this.posBtn, function() - UIManager.OpenPanel(UIName.RolePosInfoPopup,heroConFigData) + UIManager.OpenPanel(UIName.RolePosInfoPopup,heroConFigData,_curStar) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index caf4469d4a..fb1887cdb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -136,7 +136,7 @@ function RoleInfoPanel:BindEvent() --角色定位按钮 Util.AddClick(this.posBtn,function() - UIManager.OpenPanel(UIName.RolePosInfoPopup,curHeroData.heroConfig) + UIManager.OpenPanel(UIName.RolePosInfoPopup,curHeroData.heroConfig,curHeroData.star) end) --左切换按钮 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua index 1c1f161389..ab57ab1bb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua @@ -5,6 +5,7 @@ local this=RolePosInfoPopup local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local curHeroData +local star --属性容器 local preList = {} @@ -40,8 +41,9 @@ function RolePosInfoPopup:OnSortingOrderChange() end -function RolePosInfoPopup:OnOpen(_curHeroData) +function RolePosInfoPopup:OnOpen(_curHeroData,_star) curHeroData=_curHeroData-- 传递表数据 + star = _star end function RolePosInfoPopup:OnShow() @@ -61,7 +63,7 @@ function this.RefreshPanel() this.content.transform:DOAnchorPosY(0,0) --设置顶部表现 this.posInfo.text=curHeroData.HeroLocationDesc1 - local hDesc=curHeroData.HeroLocationDesc2 + local hDesc=star == HeroManager.awakeNextStarIndex and curHeroData.HeroLocationDesc3 or curHeroData.HeroLocationDesc2 this.posText.text=string.gsub(hDesc,"|","\n") for j = 1,this.grid.transform.childCount do