diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 0e0ad7ed1e..4eff3c8bde 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -777,13 +777,9 @@ local jumpDic = { this.JumpActivity(JumpType.linglongShangShi,data[1]) end, [JumpType.QiJieShiLian] = function(data) - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then + QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.QIJIESHILIAN,3,function () UIManager.OpenPanel(UIName.QiJieShiLianPanel) - else - PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.QIJIESHILIAN)) - this.isOpen = false - return - end + end) end, [JumpType.linglongBaojing] = function(data) this.JumpActivity(JumpType.linglongBaojing % 10000,data[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index 6544246c8a..5b45f8a1cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -343,9 +343,54 @@ function this.CheckQiJieTreasureRedPoint() end function this.CheckQiJieRedPoint() - local bool1 = this.CheckQiJieTreasureRedPoint() - local bool2 = PrivilegeManager.GetPrivilegeRemainValue(3201) > 0 and true or false - return bool1 or bool2 + --判断功能是否开启 + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then + return false + end + --判断世界等级是否够 + local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).WorldLevel + if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 + return false + end + -- 跨服相关判断 + JumpServerManager.GetWorldArenaInfoRequest(function() + if not JumpServerManager.GetHightLadderDataIsStart() then + return false + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + return false + end + local bool1 = this.CheckQiJieTreasureRedPoint() + local bool2 = PrivilegeManager.GetPrivilegeRemainValue(3201) > 0 and true or false + return bool1 or bool2 + end) +end + +--功能ID,MServerArenaSetting,回调 +function this.CheckQiJieJump(funcType,SettingNum,func) + --判断功能是否开启 + if not ActTimeCtrlManager.IsQualifiled(funcType) then + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(funcType)) + return + end + --判断世界等级是否够 + local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).WorldLevel + if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足 + PopupTipPanel.ShowTip(string.format("七界试炼将在世界等级到达%s后开启!",conFigWorldLevel)) + return + end + -- 跨服相关判断 + JumpServerManager.GetWorldArenaInfoRequest(function() + if not JumpServerManager.GetHightLadderDataIsStart() then + PopupTipPanel.ShowTip(string.format("七界试炼将在开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek)) + return + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + PopupTipPanel.ShowTip("未划分跨服分组,无法参与!") + return + end + if func then + func() + end + end) end return QiJieShiLianManager \ No newline at end of file