From 02a2374c537bffb52fff6f8385df44cdf7a74dbd Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Wed, 12 Jul 2023 18:23:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=9F=8E=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=B4=9E=E5=BA=9C=EF=BC=8C=E8=B7=A8=E6=9C=8D=E6=88=98=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E5=B1=8F=E8=94=BD=EF=BC=8C=E7=81=B5=E5=85=BD=E5=B1=B1?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainPanel.prefab | 24 +++++++++---------- .../~Lua/Modules/Main/MainPanel.lua | 7 ++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 3e574bf7c2..e115ab08c6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -45610,7 +45610,6 @@ RectTransform: - {fileID: 5749431481947614733} - {fileID: 1631121790323343848} - {fileID: 7975778528748521356} - - {fileID: 1741493654907866535} m_Father: {fileID: 1473827928010218247} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -69149,12 +69148,12 @@ RectTransform: - {fileID: 8424071951339603218} - {fileID: 1449823918479400147} - {fileID: 4727936823561651707} - m_Father: {fileID: 7682634954648963246} - m_RootOrder: 13 + m_Father: {fileID: 1072833264322135079} + m_RootOrder: 18 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: 973.3, y: 338.3} + m_AnchoredPosition: {x: 264, y: 320} m_SizeDelta: {x: 300, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2549606708986302677 @@ -81932,6 +81931,7 @@ RectTransform: - {fileID: 915627652} - {fileID: 6762574921092838611} - {fileID: 1586863079} + - {fileID: 1741493654907866535} m_Father: {fileID: 1473827928010218247} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -94464,12 +94464,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -94704,12 +94704,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -94794,12 +94794,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -94884,12 +94884,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index f3d3584c87..b28e4c8e54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -190,15 +190,18 @@ function this:InitComponent() this.btnElementDrawCard.gameObject:SetActive(false) this.btnSecretBox = Util.GetGameObject(this.gameObject, "scene/layer4/btnSecretBox") this.btnYiYao = Util.GetGameObject(this.gameObject, "scene/layer4/btnYiYao") - this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer6/btnPokemon") + this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer4/btnPokemon") -- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu") this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi") this.btnWaiDi:SetActive(false) --家园 this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer4/btnHomeLand") - this.btnHomeLand:SetActive(true) + --洞府功能屏蔽 + this.btnHomeLand:SetActive(false) --跨服 this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer") + --跨服战斗功能屏蔽 + this.btnJumpServer:SetActive(false) this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero") this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan") this.btnTianShuMiJuan:SetActive(false)