From 3dffd7192420a88f3bb6c4fc4cbc7d3be69c1988 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 8 Nov 2021 14:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B7=A8=E6=9C=8D=E6=88=98=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=BC=80=E8=B7=A8=E6=9C=8D=E6=88=98?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E8=AF=B7=E6=B1=82=E8=BF=87=E5=A4=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=95=8C=E9=9D=A2=E4=B8=8D=E5=8F=AF=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/JumpServer/JumpServerPanel.prefab | 26 +++--- .../Modules/JumpServer/JumpServerPanel.lua | 80 +++++++++---------- 2 files changed, 50 insertions(+), 56 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab index 57037132e9..f000ed4e56 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab @@ -612,7 +612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1709950243102644360 RectTransform: m_ObjectHideFlags: 0 @@ -5433,7 +5433,7 @@ ParticleSystem: --- !u!199 &5104331235060178184 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -5509,7 +5509,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3549260751842462633 RectTransform: m_ObjectHideFlags: 0 @@ -10438,7 +10438,7 @@ ParticleSystem: --- !u!199 &8643527419215915995 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15709,7 +15709,7 @@ ParticleSystem: --- !u!199 &4987984508322184416 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22582,7 +22582,7 @@ ParticleSystem: --- !u!199 &3262653027282754651 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27551,7 +27551,7 @@ ParticleSystem: --- !u!199 &253417761310031868 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27853,7 +27853,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7161819338335154618 RectTransform: m_ObjectHideFlags: 0 @@ -32986,7 +32986,7 @@ ParticleSystem: --- !u!199 &2319293122981156966 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38264,7 +38264,7 @@ ParticleSystem: --- !u!199 &7771438493932148345 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43288,7 +43288,7 @@ ParticleSystem: --- !u!199 &1758218800894468996 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48309,7 +48309,7 @@ ParticleSystem: --- !u!199 &7978786288442372732 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53436,7 +53436,7 @@ ParticleSystem: --- !u!199 &2554868232433594259 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 467ce8f641..0e0e6b1a8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -113,7 +113,10 @@ function JumpServerPanel:OnShow(...) CheckRedPointStatus(v.redPointType) end end - self:UpdateCarbonContent() + JumpServerManager.GetWorldArenaInfoRequest(function() + self:UpdateCarbonContent() + end) + -- 音效 -- SoundManager.PlayMusic(SoundConfig.BGM_Carbon) end @@ -223,20 +226,17 @@ function JumpServerPanel:SystemState(id,fun) func() return end - JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetHightLadderDataIsStart() then - type[id].state = -4 - type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek) - elseif not JumpServerManager.GetHightLadderDataIsGroup() then - type[id].state = -5 - type[id].tipStr = "未划分跨服分组,无法参与!" - else - type[id].state = 1 - type[id].tipStr = "" - end - func() - return - end) + if not JumpServerManager.GetHightLadderDataIsStart() then + type[id].state = -4 + type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek) + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + type[id].state = -5 + type[id].tipStr = "未划分跨服分组,无法参与!" + else + type[id].state = 1 + type[id].tipStr = "" + end + func() elseif id== JumpServer_Type.YuXuLunDao then -- 判断功能是否开启 if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then @@ -246,20 +246,17 @@ function JumpServerPanel:SystemState(id,fun) return end -- 跨服相关判断 - JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetYuxuIsStart() then - type[id].state = -4 - type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek) - elseif not JumpServerManager.GetHightLadderDataIsGroup() then - type[id].state = -5 - type[id].tipStr = "未划分跨服分组,无法参与!" - else - type[id].state = 1 - type[id].tipStr = "" - end - func() - return - end) + if not JumpServerManager.GetYuxuIsStart() then + type[id].state = -4 + type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek) + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + type[id].state = -5 + type[id].tipStr = "未划分跨服分组,无法参与!" + else + type[id].state = 1 + type[id].tipStr = "" + end + func() elseif id== JumpServer_Type.QiJieShiLian then -- 判断功能是否开启 if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then @@ -269,20 +266,17 @@ function JumpServerPanel:SystemState(id,fun) return end -- 跨服相关判断 - JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetQiJieIsStart() then - type[id].state = -4 - type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek) - elseif not JumpServerManager.GetHightLadderDataIsGroup() then - type[id].state = -5 - type[id].tipStr = "未划分跨服分组,无法参与!" - else - type[id].state = 1 - type[id].tipStr = "" - end - func() - return - end) + if not JumpServerManager.GetQiJieIsStart() then + type[id].state = -4 + type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek) + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + type[id].state = -5 + type[id].tipStr = "未划分跨服分组,无法参与!" + else + type[id].state = 1 + type[id].tipStr = "" + end + func() end end