diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab index e220a6d7ae..235be208b9 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab @@ -6110,8 +6110,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 62.600002, y: 60.9} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 66.29999, y: 60.9} + m_SizeDelta: {x: 167.4, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5066216696204770011 CanvasRenderer: @@ -6151,7 +6151,7 @@ MonoBehaviour: m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A" diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua index 34447ef9ed..7b16897543 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua @@ -32,6 +32,10 @@ function HandBookEquipInfoPanel:InitComponent() skillGos[i] = Util.GetGameObject(self.transform, "Content/bg/skillGrid/skillGrid1 ("..i..")") end + self.text1 = Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/Text"):GetComponent("Text") + self.text2 = Util.GetGameObject(self.transform, "Content/bg/proRect/GameObject/Text"):GetComponent("Text") + self.text3 = Util.GetGameObject(self.transform, "Content/bg/skillObject/GameObject/Text"):GetComponent("Text") + end --绑定事件(用于子类重写) @@ -131,7 +135,12 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function HandBookEquipInfoPanel:OnShow() - + self.text1.fontSize = GetCurLanguage() ~= 2 and 36 or 25 + self.text2.fontSize = GetCurLanguage() ~= 2 and 36 or 25 + self.text3.fontSize = GetCurLanguage() ~= 2 and 36 or 25 + self.text1.horizontalOverflow = GetCurLanguage() ~= 2 and 1 or 0 + self.text2.horizontalOverflow = GetCurLanguage() ~= 2 and 1 or 0 + self.text3.horizontalOverflow = GetCurLanguage() ~= 2 and 1 or 0 end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index dc0cd1e5fd..3b5bb28c6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -209,12 +209,12 @@ function this:UpdateHeroUpLvAndBreakMaterialShow() if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then this.noUpLvText:SetActive(true) this.upLv:SetActive(false) - this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(2098, -42.00134 ) + this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(2098, -75) else Util.ClearChild(this.itemGrid.transform) this.noUpLvText:SetActive(false) this.upLv:SetActive(true) - this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(605, -42.00134 ) + this.upLvBtn:GetComponent("RectTransform").anchoredPosition = Vector2.New(605, -75) isUpLvMaterials=true for i = 1, #costItemList do if costItemList[i][1]~=14 then