From 984bb12611c27a8d66bf008fe2fba742a3fe5d57 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 21 Oct 2021 11:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=BB=E8=A7=92=E4=BF=AE=E4=B8=BA?= =?UTF-8?q?=E3=80=91=E9=97=AE=E5=8F=B7=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab | 4 ++-- .../GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index fd113c1505..9bbbc15883 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -1688,7 +1688,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 40} + m_CellSize: {x: 260, y: 40} m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -2139,7 +2139,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 40} + m_CellSize: {x: 260, y: 40} m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua index b0d383879e..21a2b512e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua @@ -13,7 +13,7 @@ function this:InitComponent(gameObject) local rootHight = self.scrollItem.transform.rect.height local width = self.scrollItem.transform.rect.width self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform, - self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) + self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 20)) self.ScrollView.moveTween.MomentumAmount = 1 self.ScrollView.moveTween.Strength = 2 self.ScrollView.elastic = false @@ -62,8 +62,8 @@ function this:SingleDataShow(_go,_data,_index) Util.GetGameObject(_go,"Title/Text"):GetComponent("Text").text = string.format("%s期",_data.RealmName) local color = PracticeManager.PracticeBigLevel == _data.RealmId and "00ff00" or "AEBEB6" for i = 1, 4 do - Util.GetGameObject(_go,"baseAttri/TextPre ("..i..")"):GetComponent("Text").text = string.format("基础%s%s",color,propertyConfig[_data.ProRank[i][1]].Info,_data.ProRank[i][2]) - Util.GetGameObject(_go,"proAttri/TextPre ("..i..")"):GetComponent("Text").text = string.format("每级%s%s",color,propertyConfig[_data.ProLevel[i][1]].Info,_data.ProLevel[i][2]) + Util.GetGameObject(_go,"baseAttri/TextPre ("..i..")"):GetComponent("Text").text = string.format("基础%s %s",color,propertyConfig[_data.ProRank[i][1]].Info,_data.ProRank[i][2]) + Util.GetGameObject(_go,"proAttri/TextPre ("..i..")"):GetComponent("Text").text = string.format("每级%s %s",color,propertyConfig[_data.ProLevel[i][1]].Info,_data.ProLevel[i][2]) end end