From c8b604bde44eb77b03cd9ea59d284a417b690830 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 6 Jan 2022 11:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1011007=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=8A=9F=E8=83=BD=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=9D=A1=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityGift/ActivityGiftManager.lua | 2 +- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 6 ++---- .../Modules/Carbon/NewCarbon/CarbonsPanel.lua | 7 +++---- .../~Lua/Modules/Fight/FightManager.lua | 19 +++++++++++++++++++ .../GlobalActTimeCtrl/ActTimeCtrlManager.lua | 2 ++ .../~Lua/Modules/Main/MainPanel.lua | 4 ++-- .../~Lua/Modules/Practice/PracticePanel.lua | 7 ++++--- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 3 +-- 8 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 1fafc30466..209354cfc2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1113,7 +1113,7 @@ function this.IsQualifiled(type) elseif openRule[1] == 2 then -- 等级开启 qualifiled = playerLv >= openRule[2] elseif openRule[1] == 3 then -- 工坊等级开启 - qualifiled = WorkShopManager.WorkShopData.lv >= openRule[2] + qualifiled = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) >= openRule[2] end return qualifiled end diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 25cbeb5fd3..c2ed625be2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -389,12 +389,10 @@ function this.BtnClick(id) LogBlue("嘤嘤嘤") else if not ActTimeCtrlManager.IsQualifiled(id) then - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) else PopupTipPanel.ShowTip(Language[10280]) end - end elseif id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then if ActTimeCtrlManager.IsQualifiled(id) then @@ -402,7 +400,7 @@ function this.BtnClick(id) UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) else local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then if ActTimeCtrlManager.SingleFuncState(id) then diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 0e36c50199..95771e472e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -234,7 +234,7 @@ function CarbonsPanel:TipShow(_go,_value) end else openLevel:SetActive(true) - openLevelText.text = string.format("%s级开启",systemConfig[_value.id].OpenRules[2]) + openLevelText.text = string.format(ActTimeCtrlManager.GetFuncTip(_value.id)) if (_value.id == FUNCTION_OPEN_TYPE.EXPEDITION or _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL) and ActTimeCtrlManager.IsQualifiled(_value.id) then--无尽副本、森罗幻境 openLevel:SetActive(false) redPoint:SetActive(false) @@ -344,7 +344,7 @@ function CarbonsPanel:BtnClick(id) else if not ActTimeCtrlManager.IsQualifiled(id) then local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,id) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) else PopupTipPanel.ShowTip(Language[10280]) end @@ -354,8 +354,7 @@ function CarbonsPanel:BtnClick(id) CarbonManager.difficulty = 1 UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) else - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,id) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then if ActTimeCtrlManager.IsQualifiled(id) then diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua index 7f405554e4..59be55d142 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightManager.lua @@ -428,6 +428,10 @@ function this.GetPlayerAndLevelPassOpenFun(playerLv) if v.OpenRules[2] == playerLv and v.IsOpen == 1 and v.IsShow == 1 then table.insert(openFunDataList,v) end + elseif type == 3 then + if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) == v.OpenRules[2] and v.IsOpen == 1 and v.IsShow == 1 then + table.insert(openFunDataList,v) + end end end end @@ -438,6 +442,7 @@ function this.GetNextPlayerAndLevelPassOpenFun(playerLv) local openFunDataList = {} local needLv = 0 local nextFightId = 0 + local needHongMengLv = 0 local nextFightSortId = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight).SortId - 1 --if FightPointPassManager.curOpenFight == nil or FightPointPassManager.curOpenFight and FightPointPassManager.curOpenFight <= 0 then -- nextFightSortId = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.lastPassFightId).SortId @@ -470,6 +475,16 @@ function this.GetNextPlayerAndLevelPassOpenFun(playerLv) end end end + elseif type == 3 then--2玩家等级开启 + if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) > v.OpenRules[2] and v.IsOpen == 1 and v.IsShow == 1 then + if needHongMengLv == 0 then + needHongMengLv = v.OpenRules[2] + else + if needHongMengLv > v.OpenRules[2] then + needHongMengLv = v.OpenRules[2] + end + end + end end end end @@ -484,6 +499,10 @@ function this.GetNextPlayerAndLevelPassOpenFun(playerLv) if v.OpenRules[2] == needLv and v.IsOpen == 1 and v.IsShow == 1 then table.insert(openFunDataList,v) end + elseif type == 3 then--2玩家等级开启 + if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) == v.OpenRules[2] and v.IsOpen == 1 and v.IsShow == 1 then + table.insert(openFunDataList,v) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index bad188bf3e..8c088dd417 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -552,6 +552,8 @@ function this.SystemOpenTip(type) str=string.format(Language[10786],GetLanguageStrById(censorshipConfig[AllActSetConfig[type].OpenRules[2]].Name)) elseif AllActSetConfig[type].OpenRules[1]==2 then str=string.format(Language[10787],AllActSetConfig[type].OpenRules[2]) + elseif AllActSetConfig[type].OpenRules[1]==3 then + str=string.format("鸿蒙阵共鸣神将等级达到%s开启",AllActSetConfig[type].OpenRules[2]) end return str end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 92ef3f99ce..439dfbb4a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -542,8 +542,8 @@ function this:BindEvent() if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer) then UIManager.OpenPanel(UIName.JumpServerPanel) else - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.JumpServer) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.JumpServer) + PopupTipPanel.ShowTip(tip) end this.ScenceBtnClick(FUNCTION_OPEN_TYPE.JumpServer) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 1b31156b6a..54fd08776f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -112,8 +112,9 @@ function Practice:BindEvent() end) --四象心法按钮 Util.AddClick(self.fourQuadrantBtn, function() - if PlayerManager.level < globalSystemConfig.OpenRules[2] then - PopupTipPanel.ShowTip(string.format("到达%s级后解锁!",globalSystemConfig.OpenRules[2])) + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FOURQUADRANT) then + local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.FOURQUADRANT) + PopupTipPanel.ShowTip(tip) else UIManager.OpenPanel(UIName.FourQuadrantPopup) end @@ -419,7 +420,7 @@ end function Practice:RefreshBtn() --神印按钮筑基期后开启 Util.SetGray(self.imprintBtn,PracticeManager.PracticeBigLevel < 2) - Util.SetGray(self.fourQuadrantBtn,PlayerManager.level < globalSystemConfig.OpenRules[2]) + Util.SetGray(self.fourQuadrantBtn,not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FOURQUADRANT)) self.fourQuadrantBtn:SetActive(globalSystemConfig.IsOpen==1) self.talsmanSoulBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul)) self.incarnationBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Incarnation)) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 06f4da7dac..77165bcfeb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -677,7 +677,6 @@ function this:UpdateHeroInfoData() this:SetSelectBtn(_CurPageIndex) this:OnPageTabChange(_CurPageIndex) local EquipSignUnlock = ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipSignUnlock - local EquipSignUnlockTwo = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,87).OpenRules[2] if teamHero[curHeroData.dynamicId] then isUpZhen = true local isCanUpEquipTreasure @@ -725,7 +724,7 @@ function this:UpdateHeroInfoData() end end --魂印按钮逻辑 - this.soulPrintBtn:SetActive(PlayerManager.level>=EquipSignUnlockTwo and curHeroData.heroConfig.MaxRank >= EquipSignUnlock[2][2]) + this.soulPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(87) and curHeroData.heroConfig.MaxRank >= EquipSignUnlock[2][2]) this:SetDragView()