diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index f44510c2de..996c99001b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -155,7 +155,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.38, y: -1.7} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 188.53, y: 188.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3600356607099224985 CanvasRenderer: @@ -1416,7 +1416,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.38, y: -1.7} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 188.53, y: 188.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6294866471335089268 CanvasRenderer: @@ -3766,7 +3766,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.38, y: -1.7} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 188.53, y: 188.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8884087063132106728 CanvasRenderer: @@ -3914,7 +3914,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.38, y: -1.7} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 188.53, y: 188.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8949513887021752622 CanvasRenderer: @@ -7461,7 +7461,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.38, y: -1.7} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 188.53, y: 188.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7576884311585187991 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 29dc7a5055..7cc1057f3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -432,19 +432,7 @@ function this.GetSkillsData() local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum heroSkill.state = 1 - if curHeroData.star < 10 then - heroSkill.Icon = "r_tongyong_feisheng_icon" --9星以下 - heroSkill.Type = 5 - heroSkill.quality = 0 - elseif curHeroData.star == 10 then - heroSkill.Icon = "r_tongyong_tianfu_icon" --10星 - heroSkill.Type = 6 - heroSkill.quality = 0 - elseif curHeroData.star == 11 then - heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒 - heroSkill.Type = 7 - heroSkill.quality = 1 - elseif curHeroData.star == 12 then + if curHeroData.star == 12 then heroSkill.Icon = "r_tongyong_feisheng_icon1" --飞升一 heroSkill.Type = 7 heroSkill.quality = 1 @@ -456,6 +444,18 @@ function this.GetSkillsData() heroSkill.Icon = "r_tongyong_feisheng_icon3" --飞升三 heroSkill.Type = 7 heroSkill.quality = 1 + elseif curHeroData.star == 11 then + heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒 + heroSkill.Type = 7 + heroSkill.quality = 1 + elseif curHeroData.heroConfig.Natural <= 5 then + heroSkill.Icon = "r_tongyong_feisheng_icon" --9星以下 + heroSkill.Type = 5 + heroSkill.quality = 0 + elseif curHeroData.heroConfig.Natural == 6 or curHeroData.heroConfig.Natural == 7 then + heroSkill.Icon = "r_tongyong_tianfu_icon" --10星 + heroSkill.Type = 6 + heroSkill.quality = 0 end table.insert(skillList, heroSkill) else