From 982137c9b7bf121560ca4e6bc54b4c92fbc3dfd4 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 10 Dec 2021 14:14:08 +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/Popup/GeneralPopup.prefab | 17 ++++++++++++++++- .../View/GeneralBigPopup_SelectGem.lua | 2 +- .../~Lua/Modules/Practice/PracticePanel.lua | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index aa2e131b26..845c445921 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -28504,6 +28504,7 @@ GameObject: m_Component: - component: {fileID: 4584260235421669206} - component: {fileID: 8251968032118431953} + - component: {fileID: 4630181782163424167} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -28528,7 +28529,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -850, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8251968032118431953 MonoBehaviour: @@ -28553,6 +28554,20 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!114 &4630181782163424167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4866589428553563947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4894879778907874288 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua index 5884c182db..2b6ac67c3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua @@ -65,7 +65,7 @@ function SelectGem:SingleDataShow(go,data,index) local view = SubUIManager.Open(SubUIConfig.ItemView,icon.transform) self.itemList[go] = view end - self.itemList[go]:OnOpen(false, {data.id,0}, 1.1, false,false,false,sortingOrder + 1) + self.itemList[go]:OnOpen(false, {data.id,0}, 1.1, true,false,false,sortingOrder + 1) self.itemList[go].gameObject:SetActive(true) name.text = GetStringByEquipQua(itemConfig[data.id].Quantity1,data.name) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 9331d73d10..8c7fdd9873 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -333,6 +333,7 @@ function Practice:RefreshTabs() for i = 1,self.tab.transform.childCount do self.tab.transform:GetChild(i-1).gameObject:SetActive(false) if ActTimeCtrlManager.SingleFuncState(funcType[i]) then + self.tab.transform:GetChild(i-1).gameObject:SetActive(true) num = num + 1 end end