From 4a15931ce18e85f10debf7ae48b33f6c9a884cbc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Fri, 7 Jul 2023 15:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=3D=3D=3D=3D=3D=3D=E5=85=A5=E5=8F=A3=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Carbon/NewCarbon/CarbonsPanel.lua | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 661487c92f..7729b9d8fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -436,6 +436,27 @@ function CarbonsPanel:BtnClick(id) end elseif id==FUNCTION_OPEN_TYPE.QIJIESHILIAN then --七界试炼 if ActTimeCtrlManager.SingleFuncState(id) then + local tipStr="" + local state=0 + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then + state = -1 + tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.QIJIESHILIAN) + end + -- 跨服相关判断 + if not JumpServerManager.GetQiJieIsStart() then + state = -4 + tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek) + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + state = -5 + tipStr = "未划分跨服分组,无法参与!" + else + state = 1 + tipStr = "" + end + if state<1 then + PopupTipPanel.ShowTip(tipStr) + return + end local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage) NetManager.SevenWorldInfoRequest(0,function (msg) QiJieShiLianManager.IsLock = false @@ -447,7 +468,7 @@ function CarbonsPanel:BtnClick(id) end end) else - JumpManager.GoJump(40059) + --JumpManager.GoJump(40059) PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id)) end elseif id==FUNCTION_OPEN_TYPE.HOMELAND then --洞府 @@ -456,7 +477,7 @@ function CarbonsPanel:BtnClick(id) else PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id)) end - elseif id==FUNCTION_OPEN_TYPE.LINGMAIMIJING then --洞府 + elseif id==FUNCTION_OPEN_TYPE.LINGMAIMIJING then --灵脉 if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.LINGMAIMIJING) then PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.LINGMAIMIJING)) return