diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab index c94a8d0a91..baf988ae34 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab @@ -39,7 +39,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 131.35999, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 457.28, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2109907428584329651 @@ -233,7 +233,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 228.64, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2701847110321517952 @@ -534,7 +534,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 228.64, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 430, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6618502649577932062 @@ -1200,7 +1200,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 228.64, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7773822478194374651 @@ -1819,7 +1819,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 228.64, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 476.4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1170074132256267591 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index cee3a55b6d..5ad3c0b57d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -5131,4 +5131,19 @@ function this.RefreshRedShow(curHeroData) return isSHow end +function this.GetTrainingPasivvSkill(skillstar,heroConfig) + local PassSKillList={} + local tdata=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.Train,"HeroID",heroConfig) + if not tdata then + return nil + end + local t=nil + for i=1, #tdata do + if skillstar == tdata[i].PassiveSkillStar then + t=tdata[i] + end + end + + return t +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index e7e3d218c6..7b8d7f6f3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -61,6 +61,7 @@ function this:OnOpen(...) nextCfg=nil --args[6] local soulLv=args[7] local isFaBao = args[8] + local trainingDta=args[9] if openType == 1 then this.content.anchoredPosition = Vector2.New(0, 0) elseif openType == 2 then @@ -120,6 +121,12 @@ function this:OnOpen(...) this.line:SetActive(true) this.hintTxt2.text=" ".."11星解锁" this.desList[2].des.text = "觉醒后效果:\n"..GetCurrSkillConfigDesc(nextCfg.skillConfig,soulLv) + elseif trainingDta then + this.desList[2].go.gameObject:SetActive(true) + this.hintTxt2.gameObject:SetActive(false) + this.line:SetActive(true) + this.hintTxt2.text=" ".."特训解锁后" + this.desList[2].des.text = string.format("特训%s级解锁效果:\n",NumToChinese[trainingDta.Level])..GetCurrSkillConfigDesc(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,trainingDta.PassiveSkill[1]),soulLv) else this.hintTxt2.gameObject:SetActive(false) this.line:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 5f1d60582d..447339443b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -458,7 +458,8 @@ function this.SkillInfo() if i==6 then panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i) else - panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData) + local training=HeroManager.GetTrainingPasivvSkill(nextData.needStar,curHeroData.heroConfig.Id) + panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData,nil,nil,training) end else panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)