From e8acbe1c863eb0be8009896579ba4991f9567678 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 18 Mar 2021 15:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=87=AA=E9=80=89=E7=AE=B1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RewardBox/RewardBoxPanel.prefab | 50 +++++++++---------- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 4 ++ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index f914e39fb2..69f1ed6b7b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -423,10 +423,10 @@ RectTransform: m_Father: {fileID: 1759585470645775885} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -110} - m_SizeDelta: {x: 1000, y: 70} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6247518587750639663 MonoBehaviour: @@ -638,10 +638,10 @@ RectTransform: m_Father: {fileID: 8126913021008556213} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 185, y: -35} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3499665449579621445 CanvasRenderer: @@ -1386,7 +1386,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3210126133790844263} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1436,10 +1436,10 @@ RectTransform: m_Father: {fileID: 8126913021008556213} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 605, y: -35} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1503583757653798130 CanvasRenderer: @@ -1552,10 +1552,10 @@ RectTransform: m_Father: {fileID: 1759585470645775885} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -40} - m_SizeDelta: {x: 1000, y: 70} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4460466962581947724 CanvasRenderer: @@ -2008,10 +2008,10 @@ RectTransform: m_Father: {fileID: 8126913021008556213} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 815, y: -35} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8854254542223782766 CanvasRenderer: @@ -2494,10 +2494,10 @@ RectTransform: m_Father: {fileID: 8126913021008556213} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 395, y: -35} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8307884902098969747 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 2f3e8f0fd8..50e4f8f1ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -190,6 +190,10 @@ function RewardBoxPanel:SetTopBar() this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条 this.di:SetActive(#this.rewardGroup ~= 1) this.tip:SetActive(BagManager.isBagPanel) + this.di.transform.localPosition = Vector3.New(0, 473, 0) + if #this.rewardGroup ~= 1 and not BagManager.isBagPanel then + this.di.transform.localPosition = Vector3.New(0, 510, 0) + end end --设置底部滑动条