From 61b22edef5bfffdad5fa8bad61c36035f8c2998d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Feb 2021 20:56:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/HandBook/HandBookEquipInfoPanel.prefab | 6 +++--- .../~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua | 11 ++++++++++- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) 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 From 58d0b7874f321f257b89392aaa99ffcde9953bf5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Feb 2021 20:57:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 4 ++-- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index c4c0d03ce3..f1ae2a30fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -28820,7 +28820,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 5, y: 191} - m_SizeDelta: {x: 289.1, y: 64.4} + m_SizeDelta: {x: 450, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7974999999510823691 CanvasRenderer: @@ -28860,7 +28860,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u70B9\u51FB\u9009\u62E9\u6240\u9700\u6C42\u52A9\u76845\u661F\u6B66\u5C06\u788E\u7247" diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 5d5d37b65a..fac82468d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -25449,7 +25449,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: 605, y: -42.001335} + m_AnchoredPosition: {x: 605, y: -74} m_SizeDelta: {x: 253.28, y: 72.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222612018330954196 @@ -57529,7 +57529,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: 551.3, y: 16.27} + m_AnchoredPosition: {x: 551.3, y: -4} m_SizeDelta: {x: 400.1, y: 60.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &217656589654623821 @@ -57570,7 +57570,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u63D0\u5347\u5996\u7075\u5E08\u7B49\u7EA7\u4E0A\u9650" @@ -65158,8 +65158,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: -2.1, y: -40.1} - m_SizeDelta: {x: 81.99, y: 31.18} + m_AnchoredPosition: {x: -2.1, y: -53} + m_SizeDelta: {x: 150, y: 31.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9053474831226381680 CanvasRenderer: @@ -65199,9 +65199,9 @@ MonoBehaviour: m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u971E\u5149" LanguageIndex: 11552 --- !u!1 &1837881354931721650 @@ -75286,8 +75286,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: -88.5, y: 316.38} - m_SizeDelta: {x: 518.4, y: 57} + m_AnchoredPosition: {x: -260, y: 316.38} + m_SizeDelta: {x: 64.165, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5995433904690219934 CanvasRenderer: @@ -75347,10 +75347,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u54C1\u9636"