From 0ba113ddbcc09b7dc078d7052d6f729ff5ef072b Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 25 Aug 2020 15:25:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E5=86=B2=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab | 10 +++++----- .../Guild/Transcript/GuildTranscriptMainPopup.lua | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab index 5fbe1c3403..5124d3b567 100644 --- a/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab @@ -35877,7 +35877,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9996\u5145\u6EE11$" + m_Text: "\u7D2F\u5145\u6EE1$1" LanguageIndex: 10594 --- !u!1 &4075015836899280644 GameObject: @@ -36803,7 +36803,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: 8.9999695, y: -388.00006} + m_AnchoredPosition: {x: 8.9999695, y: -422.20004} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5526079155444053475 @@ -37613,7 +37613,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: -2.8000016, y: -348.80002} + m_AnchoredPosition: {x: -2.8000016, y: -383} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5526079156605187344 @@ -38177,7 +38177,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: -298.20007} + m_AnchoredPosition: {x: 0, y: -332.40005} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5526079156859329627 @@ -38340,7 +38340,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u5145\u503C15$" + m_Text: "\u7D2F\u5145\u503C$15" LanguageIndex: 10595 --- !u!1001 &6359050367270521292 PrefabInstance: diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index 434b79ef7d..0c9f7749a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -23,6 +23,7 @@ function GuildTranscriptMainPopup:InitComponent() this.endNumBtn = Util.GetGameObject(self.gameObject,"middleGo/endNumBtn") --text this.name = Util.GetGameObject(self.gameObject,"middleGo/endNumBtn"):GetComponent("Text")--军团副本 + this.name.text = "公会副本" this.rewardGoText1 = Util.GetGameObject(self.gameObject,"middleGo/rewardGo/tip/Text1"):GetComponent("Text")--单次奖励 this.rewardGoText2 = Util.GetGameObject(self.gameObject,"middleGo/rewardGo/tip/Text2"):GetComponent("Text")--击杀奖励