From e1a9459101e1fe524e1060d6e6b19808486e5a64 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 14 Dec 2021 16:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91=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/Bag/BagPanel.prefab | 22 +++++++++---------- .../Prefabs/UI/Gem/GemPanel.prefab | 2 +- .../View/GeneralBigPopup_SelectGem.lua | 16 ++++++++++---- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index f08b7db864..116b5947fc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -480,9 +480,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 82} + m_AnchoredPosition: {x: -569, y: 82} m_SizeDelta: {x: 0, y: 164} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &396553229042369324 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9503,10 +9503,10 @@ RectTransform: m_Father: {fileID: 224457215098483846} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 202} - m_SizeDelta: {x: 1080, y: 164} + m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8980420565915447280 MonoBehaviour: @@ -37601,7 +37601,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5B9D\u77F3" + m_Text: "\u547D\u77F3" LanguageIndex: 10142 --- !u!1 &7212086096276223421 GameObject: @@ -39068,7 +39068,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1407933580564980333 RectTransform: m_ObjectHideFlags: 0 @@ -39085,10 +39085,10 @@ RectTransform: m_Father: {fileID: 396553229042369325} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 887, y: -82} - m_SizeDelta: {x: 184, y: 126} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &759208157959335064 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index dd6ec95e84..df65768231 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -2919,7 +2919,7 @@ Canvas: m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 - m_OverrideSorting: 1 + m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua index 322a09f4ae..2b85877739 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua @@ -11,6 +11,7 @@ local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) function SelectGem:InitComponent(gameObject) self.spLoader = SpriteLoader.New() self.itemPre=Util.GetGameObject(gameObject,"ItemPre") + self.empty=Util.GetGameObject(gameObject,"Empty") self.itemPre:SetActive(false) --滚动条根节点 self.root = Util.GetGameObject(gameObject, "Scroll") @@ -44,10 +45,17 @@ function SelectGem:OnShow(_parent,_args) end function SelectGem:Refresh(Id) local dataList = GemManager.GetGemsFromBagByType(Id) - self.ScrollView:SetData(dataList, function(index, go) - self:SingleDataShow(go,dataList[index],index) - go:SetActive(true) - end) + if #dataList > 0 then + self.root:SetActive(true) + self.empty:SetActive(false) + self.ScrollView:SetData(dataList, function(index, go) + self:SingleDataShow(go,dataList[index],index) + go:SetActive(true) + end) + else + self.empty:SetActive(true) + self.root:SetActive(false) + end end function SelectGem:SingleDataShow(go,data,index)