From 5834e08ee2ad413586832c1961eec65ff95f1c83 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Feb 2021 20:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DemonSlayer/DemonSlayerPanel.prefab | 6 +++--- .../Prefabs/UI/Guild/GuildCreatePopup.prefab | 20 +++++++++---------- .../Prefabs/UI/Guild/GuildFindPopup.prefab | 8 ++++---- .../~Lua/Modules/Guild/GuildCreatePopup.lua | 5 +++++ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab index 3b32c956f5..46ef7c50c4 100644 --- a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab @@ -1845,7 +1845,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2051,7 +2051,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 23.4, y: -587.5} - m_SizeDelta: {x: 178.71, y: 50} + m_SizeDelta: {x: 800, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4490186667657502468 CanvasRenderer: @@ -2091,7 +2091,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: "\u6D3B\u52A8\u89C4\u5219\uFF1A\u5F00\u670D7\u5929\u540E\u6839\u636E\u5FC3\u9B54\u8BD5\u70BC\u6392\u540D\u53D1\u653E\u5956\u52B1" diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab index e4ab2273e7..11b1fd69bc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab @@ -108,8 +108,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: -390.5, y: 0} - m_SizeDelta: {x: 160, y: 60} + m_AnchoredPosition: {x: -400, y: 0} + m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &947121123497756367 CanvasRenderer: @@ -149,8 +149,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u540D\u79F0" LanguageIndex: 0 @@ -527,8 +527,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: -388.6, y: 30.8} - m_SizeDelta: {x: 160, y: 60} + m_AnchoredPosition: {x: -400, y: 24} + m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9019220988123484628 CanvasRenderer: @@ -568,8 +568,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u516C\u4F1A\u5BA3\u8A00" LanguageIndex: 0 @@ -747,7 +747,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -166.2} - m_SizeDelta: {x: 466, y: 46} + m_SizeDelta: {x: 350, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1216682546454095854 CanvasRenderer: @@ -788,7 +788,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u521B\u5EFA\u516C\u4F1A\u6D88\u8017100\u5996\u6676" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab index b824185a89..6cd7b23e10 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab @@ -677,8 +677,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 2.8, y: 0.81} + m_SizeDelta: {x: -52.17, y: -10.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6076602248896240522 CanvasRenderer: @@ -1122,8 +1122,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.78, y: 0.7} + m_SizeDelta: {x: -51.75, y: -9.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2470421610833348116 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua index 2492d51fe3..39ebadf576 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua @@ -10,6 +10,9 @@ function GuildCreatePopup:InitComponent() this.inputAnnounce = Util.GetGameObject(self.transform, "tipImage/content"):GetComponent("InputField") this.costTip = Util.GetGameObject(self.transform, "tipImage/costTips"):GetComponent("Text") + + this.text1 = Util.GetGameObject(self.transform, "tipImage/name/Text"):GetComponent("Text") + this.text2 = Util.GetGameObject(self.transform, "tipImage/content/Text"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -74,6 +77,8 @@ function GuildCreatePopup:OnOpen(successFunc) local cost = ConfigManager.GetConfigData(ConfigName.GuildSetting, 1).CreatCost local costName = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig, cost[1][1]).Name) this.costTip.text = string.format(Language[10848], cost[1][2], costName) + this.text1.fontSize = GetCurLanguage() ~= 2 and 48 or 40 + this.text2.fontSize = GetCurLanguage() ~= 2 and 48 or 40 end --界面打开或者重新打开后,界面刷新时调用(用于子类重写)