From 3674cdd88608ee735411c8b8e6ac88a070b340a0 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 23 Feb 2021 14:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E8=A3=85=E5=A4=87=E7=95=8C=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 48 +++++++++---------- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 3 +- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 5ae257ed26..68f93a494d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -47219,7 +47219,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8412781053891457112 @@ -47275,9 +47275,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u5168\u90E8" LanguageIndex: 11543 --- !u!1 &1842776736655617186 @@ -56980,7 +56980,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2539474575079667379 @@ -57036,9 +57036,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u7075\u5B9D" LanguageIndex: 11346 --- !u!1 &2320522813040598354 @@ -130526,7 +130526,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9222142365797290585 @@ -130582,9 +130582,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u9B42\u5B9D" LanguageIndex: 11345 --- !u!1 &6908546977092012050 @@ -145119,7 +145119,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6031811929480031179 @@ -145175,9 +145175,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u9774" LanguageIndex: 11545 --- !u!1 &7293736979709754577 @@ -169245,7 +169245,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5799991397920675855 @@ -169301,9 +169301,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u670D" LanguageIndex: 10334 --- !u!1 &7849608610486849781 @@ -178869,7 +178869,7 @@ 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: 0, y: 3.5149994} + m_AnchoredPosition: {x: 0, y: 8} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4343649736118813185 @@ -178925,9 +178925,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6218\u9774" LanguageIndex: 11545 --- !u!1 &8215104791689758812 @@ -189701,7 +189701,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775710720111501234 @@ -189757,9 +189757,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6B66\u5668" LanguageIndex: 11543 --- !u!1 &8852061367680299650 @@ -196478,7 +196478,7 @@ 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: -0.0000023842, y: 3.515} + m_AnchoredPosition: {x: -0.0000023842, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6655377552230782079 @@ -196534,9 +196534,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u5934\u9970" LanguageIndex: 11544 --- !u!1 &9079202659749227066 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index ae8b925cd6..122c18e19a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -87,6 +87,7 @@ function RoleEquipPanel:InitComponent() this.effect = Util.GetGameObject(self.transform, "bg/effect") for i = 0, 6 do tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i) + Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 48 or 40 effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect") end this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn") @@ -726,7 +727,7 @@ function this:SetSelectBtn() this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0) --this.selectBtn.transform.localScale = Vector3.one --this.selectBtn:GetComponent("Image"):SetNativeSize() - Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = typeTab[indexBtnNum] + Util.GetGameObject(this.selectBtn.transform, "Text"):GetComponent("Text").text = GetCurLanguage() == 0 and typeTab[indexBtnNum] or ""..typeTab[indexBtnNum]..""--typeTab[indexBtnNum] end function this:OpenTips(nextEquipData,pos)