From 4462e6f814ff3cb85890113eeb827d4ad362fc77 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 27 Jan 2021 14:21:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E=E6=A0=91?= =?UTF-8?q?=E3=80=91=E7=A5=9E=E5=BA=94=E5=B1=9E=E6=80=A7=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 12 ++++++------ .../View/GeneralBigPopup_ShenYingShuXing.lua | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 38bae5301b..e72fb63ac9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1610,7 +1610,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -50} + m_AnchoredPosition: {x: 25, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6647905203552132254 @@ -2761,7 +2761,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 123.99011} - m_SizeDelta: {x: 800, y: 230} + m_SizeDelta: {x: 800, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6861799424909416049 CanvasRenderer: @@ -2873,8 +2873,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 22.5, y: -150} - m_SizeDelta: {x: 25, y: 100} + m_AnchoredPosition: {x: 22.5, y: -125} + m_SizeDelta: {x: 25, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4811476578694021459 CanvasRenderer: @@ -3227,7 +3227,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: 148, y: 0} + m_AnchoredPosition: {x: 100, y: 0} m_SizeDelta: {x: 102.79999, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4853678151928099076 @@ -3265,7 +3265,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua index 8da29d98ed..460d939539 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_ShenYingShuXing.lua @@ -44,12 +44,11 @@ function this:OnShow(_parent) go.gameObject:SetActive(true) local name = Util.GetGameObject(go,"name"):GetComponent("Text") local num = Util.GetGameObject(go,"num"):GetComponent("Text") + num.gameObject:SetActive(false) if SacredTreeManager.GetTowerLevel() >= data[i].allNum then - name.text = ""..PropertyConfig[data[i].id].Info..":" - num.text = "".."四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" + name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" else - name.text = PropertyConfig[data[i].id].Info..":" - num.text = "四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" + name.text = ""..PropertyConfig[data[i].id].Info..":四灵试炼通关"..data[i].allNum.."层("..data[i].curNum.."/"..data[i].allNum..")" end end end