From fbed4d34ff9ac2c8c6280c95e3044e0afe6f359b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 23 Mar 2021 17:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=94=81=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TianShuMiJuanMainPanel.prefab | 75 +++++++++++++++++++ .../TianShuMiJuan/TianShuMiJuanMainPanel.lua | 22 +++--- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab index 0e10f97aea..253cd4568f 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/TianShuMiJuanMainPanel.prefab @@ -2094,6 +2094,7 @@ RectTransform: - {fileID: 3746196357489720638} - {fileID: 8783085136368094142} - {fileID: 914312545127852260} + - {fileID: 1391451663208606841} m_Father: {fileID: 8396209728857207438} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2561,3 +2562,77 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &9011176422332360032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1391451663208606841} + - component: {fileID: 6316141985379437530} + - component: {fileID: 3832789380871958617} + m_Layer: 0 + m_Name: lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1391451663208606841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011176422332360032} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1994294546225590454} + m_RootOrder: 3 + 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: 0, y: 0} + m_SizeDelta: {x: 106, y: 74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6316141985379437530 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011176422332360032} + m_CullTransparentMesh: 0 +--- !u!114 &3832789380871958617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9011176422332360032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 8f797b996c03faa4abffb3134701a8bc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index b97e346cb1..d9c70f9364 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -51,6 +51,7 @@ function TianShuMiJuanMainPanel.SetTabAdapter(newTab, index, status) local img = Util.GetGameObject(newTab.gameObject,"img"):GetComponent("Image") local redpot = Util.GetGameObject(newTab.gameObject,"redpot") local tabName = Util.GetGameObject(newTab.gameObject,"Text"):GetComponent("Text") + local lock = Util.GetGameObject(newTab.gameObject,"lock") if tabs[index].rpType > 0 then if redPointList[tabs[index].rpType] then ClearRedPointObject(tabs[index].rpType,redPointList[tabs[index].rpType]) @@ -60,20 +61,23 @@ function TianShuMiJuanMainPanel.SetTabAdapter(newTab, index, status) end img.sprite = Util.LoadSprite(tabs[index][status]) tabName.text = tabs[index].tabName - - if tabs[index].funcType > 0 then - if ActTimeCtrlManager.SingleFuncState(tabs[index].funcType) then - newTab.gameObject:SetActive(true) - else - newTab.gameObject:SetActive(false) - end + if status == "lock" then + lock.gameObject:SetActive(true) else - newTab.gameObject:SetActive(true) + lock.gameObject:SetActive(false) end end function TianShuMiJuanMainPanel.TabIsLockCheck(index) - return false + if tabs[index].funcType > 0 then + if ActTimeCtrlManager.SingleFuncState(tabs[index].funcType) then + return false + else + return true,ActTimeCtrlManager.SystemOpenTip(tabs[index].funcType) + end + else + return false + end end function TianShuMiJuanMainPanel.SetChangeTabCallBack(index) if curPage == index then