From e02688102401fe869070cf75d705c6f886513c44 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 15 Oct 2021 14:35:57 +0800 Subject: [PATCH] =?UTF-8?q?ID1010484=E3=80=91=20=E6=98=93=E7=BB=8F?= =?UTF-8?q?=E5=AE=9D=E5=BA=93=E5=8F=AF=E9=80=89=E5=A5=96=E5=8A=B1=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 8 ++++---- .../GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 2580b7af43..4dfb445689 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3505,9 +3505,9 @@ 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: 40, y: -20} + m_AnchoredPosition: {x: 129.4, y: -34.9} m_SizeDelta: {x: 100, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5000003, y: 0.5} --- !u!222 &4346489256818483164 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14100,8 +14100,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: 150, y: -20} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 11.5, y: -30} + m_SizeDelta: {x: 100, y: 75.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3601071905900668928 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 431c116a52..ddc12c196d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -118,8 +118,8 @@ function this:SetSingleData(index,item,data) local t2 = true local t3 = true --判断是否可以选择 - if PlayerManager.level >= data.LevelLimit then - num.gameObject:SetActive(true) + num.gameObject:SetActive(true) + if PlayerManager.level >= data.LevelLimit then limit1.gameObject:SetActive(false) select:SetActive(true) else @@ -128,7 +128,6 @@ function this:SetSingleData(index,item,data) t1 = false end if ActData.curLevel >= data.FloorLimit then - num.gameObject:SetActive(true) limit2.gameObject:SetActive(false) select:SetActive(true) else @@ -150,7 +149,6 @@ function this:SetSingleData(index,item,data) num.text = (data.InitializeNum - aData.progress).."/"..data.InitializeNum end - num.gameObject:SetActive(t1 and t2) select:SetActive(t1 and t2 and t3) end