From 1a866b1068c3c423a51b4f650830a343d32baa5b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 24 Sep 2021 19:23:30 +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=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/GeneralTreasureMangaer.lua | 38 ++++++++++++++----- .../Modules/JumpServer/JumpServerManager.lua | 17 +++++---- .../Modules/JumpServer/JumpServerPanel.lua | 2 +- .../~Lua/Modules/Net/IndicationManager.lua | 6 +++ .../~Lua/Modules/Player/JumpManager.lua | 3 ++ ...eralPopup_HeavenUnlockExtraRewardPanel.lua | 2 +- .../View/GeneralPopup_QiJieSingleTreasure.lua | 8 ++++ .../QiJieShiLian/QiJieShiLianManager.lua | 4 +- 8 files changed, 60 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua index 4679ffd540..69be4aa482 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasureMangaer.lua @@ -91,16 +91,36 @@ end function this.GetAllRewardData() local directData = {} local indirectData = {} - local value = this.TreasureList[this.curType].value - for k,v in ConfigPairs(ConfigManager.GetConfig(this.TreasureList[this.curType].configName)) do - local curDataList = v.Integral[1][2] <= value and directData or indirectData - for i = 1, #v.TreasureReward do - if not curDataList[v.TreasureReward[i][1]] then - curDataList[v.TreasureReward[i][1]] = 0 - end - curDataList[v.TreasureReward[i][1]] = curDataList[v.TreasureReward[i][1]] + v.TreasureReward[i][2] + local tempScore = BagManager.GetTotalItemNum(this.TreasureList[this.curType].itemId) + local config = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig,"Id",108) + for i = 1,#config.BaseReward do + if config.BaseReward[i][1] == this.TreasureList[this.curType].itemId then + tempScore = tempScore + config.BaseReward[i][2] + end + end + for k,v in ConfigPairs(ConfigManager.GetConfig(this.TreasureList[this.curType].configName)) do + if tempScore >= v.Integral[1][2] then + for i = 1, #v.Reward do + if this.TreasureList[this.curType].dataList[v.Id].State ~= 3 then + if not directData[v.Reward[i][1]] then + directData[v.Reward[i][1]] = 0 + end + directData[v.Reward[i][1]] = directData[v.Reward[i][1]] + v.Reward[i][2] + end + end + for i = 1, #v.TreasureReward do + if not directData[v.TreasureReward[i][1]] then + directData[v.TreasureReward[i][1]] = 0 + end + directData[v.TreasureReward[i][1]] = directData[v.TreasureReward[i][1]] + v.TreasureReward[i][2] + end + end + for i = 1, #v.TreasureReward do + if not indirectData[v.TreasureReward[i][1]] then + indirectData[v.TreasureReward[i][1]] = 0 + end + indirectData[v.TreasureReward[i][1]] = indirectData[v.TreasureReward[i][1]] + v.TreasureReward[i][2] end - end return directData,indirectData end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index ec0d0347be..916f692737 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -77,10 +77,10 @@ function this.IndicationHightLadderData(_msg) stage = _msg.stage endTime = _msg.endTime myRank = _msg.arenaInfo.score - LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys) - LogPink("_msg.stage ".._msg.stage) - LogPink("_msg.endTime ".._msg.endTime) - LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score) + -- LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys) + -- LogPink("_msg.stage ".._msg.stage) + -- LogPink("_msg.endTime ".._msg.endTime) + -- LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score) Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel) end --战斗更新 @@ -92,8 +92,8 @@ function this.BattleHightLadderData(_msg) arenaInfo = _msg.arenaInfo myRank =_msg.arenaInfo.score end - LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys) - LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score) + -- LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys) + -- LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score) end --获得天梯阶段 function this.GetHightLadderDataArenaInfo() @@ -118,7 +118,10 @@ function this.GetHightLadderDataIsGroup() return isGroup ~= 0 end function this.GetHightLadderDataIsStart() - return isStart == 1 + return isStart >= mServerArenaSetting[1].OpenWeek +end +function this.GetQiJieIsStart() + return isStart >= mServerArenaSetting[3].OpenWeek end -- 获取剩余挑战次数 特权 function this.GetCanBattleCount() diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 9adcb82655..6e9eb9c433 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -268,7 +268,7 @@ function JumpServerPanel:SystemState(id,fun) end -- 跨服相关判断 JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetHightLadderDataIsStart() then + 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 389abb4391..eb9c9068cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -1022,6 +1022,12 @@ function this.SevenWorldInfoIndication(buffer) msg:ParseFromString(data) QiJieShiLianManager.GetServerData(msg,function () Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.RefreshPanel) + if UIManager.IsOpen(UIName.FormationPanelV2) then + UIManager.ClosePanel(UIName.FormationPanelV2) + end + if UIManager.IsOpen(UIName.ExpeditionMonsterInfoPopup) then + UIManager.ClosePanel(UIName.ExpeditionMonsterInfoPopup) + end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 4eff3c8bde..2bc065407b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -777,6 +777,9 @@ local jumpDic = { this.JumpActivity(JumpType.linglongShangShi,data[1]) end, [JumpType.QiJieShiLian] = function(data) + if UIManager.IsOpen(UIName.GeneralRankRewardPanel) then + UIManager.ClosePanel(UIName.GeneralRankRewardPanel) + end QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.QIJIESHILIAN,3,function () UIManager.OpenPanel(UIName.QiJieShiLianPanel) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index fc70ad63f5..5399d21dfb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -84,7 +84,7 @@ function this:OnShow(_parent,...) elseif curType == 4 then --七界秘宝 rewardData,rewardData1 = GeneralTreasureMangaer.GetAllRewardData() this:SetItem(rewardData,rewardData1) - this.tip.text = "解锁秘宝,激活进阶专属奖励+1500积分,可获取1280妖晶" + this.tip.text = "解锁秘宝,激活进阶专属奖励+1500积分,可获取1980妖晶" this.dealBtnIma.gameObject:SetActive(false) this.dealBtnText.gameObject:SetActive(true) local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua index 37be0bc5db..02e1cdfba4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QiJieSingleTreasure.lua @@ -29,9 +29,17 @@ end function QiJieSingleTreasure:BindEvent() Util.AddClick(self.activeBtn,function() if BagManager.GetTotalItemNum(self.data.Cost[1])>=self.data.Cost[2] then + local state = self.data.state NetManager.SevenWorldRelicRequest(self.data.Id,function () Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.BuySingleTreasure) self.parent:ClosePanel() + if state == 0 then + PopupTipPanel.ShowTip("已取消遗物激活状态!") + elseif state == 1 then + PopupTipPanel.ShowTip("成功解锁遗物并将其激活!") + elseif state == 2 then + PopupTipPanel.ShowTip("已激活遗物!") + end end) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index 3c4c840ebc..244a475d80 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -354,7 +354,7 @@ function this.CheckQiJieRedPoint() end -- 跨服相关判断 JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetHightLadderDataIsStart() then + if not JumpServerManager.GetQiJieIsStart() then return false elseif not JumpServerManager.GetHightLadderDataIsGroup() then return false @@ -380,7 +380,7 @@ function this.CheckQiJieJump(funcType,SettingNum,func) end -- 跨服相关判断 JumpServerManager.GetWorldArenaInfoRequest(function() - if not JumpServerManager.GetHightLadderDataIsStart() then + if not JumpServerManager.GetQiJieIsStart() then PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek)) return elseif not JumpServerManager.GetHightLadderDataIsGroup() then