【七界试炼】提交
parent
1505647241
commit
1a866b1068
|
@ -91,16 +91,36 @@ end
|
||||||
function this.GetAllRewardData()
|
function this.GetAllRewardData()
|
||||||
local directData = {}
|
local directData = {}
|
||||||
local indirectData = {}
|
local indirectData = {}
|
||||||
local value = this.TreasureList[this.curType].value
|
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
|
for k,v in ConfigPairs(ConfigManager.GetConfig(this.TreasureList[this.curType].configName)) do
|
||||||
local curDataList = v.Integral[1][2] <= value and directData or indirectData
|
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
|
for i = 1, #v.TreasureReward do
|
||||||
if not curDataList[v.TreasureReward[i][1]] then
|
if not directData[v.TreasureReward[i][1]] then
|
||||||
curDataList[v.TreasureReward[i][1]] = 0
|
directData[v.TreasureReward[i][1]] = 0
|
||||||
end
|
end
|
||||||
curDataList[v.TreasureReward[i][1]] = curDataList[v.TreasureReward[i][1]] + v.TreasureReward[i][2]
|
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
|
||||||
|
|
||||||
end
|
end
|
||||||
return directData,indirectData
|
return directData,indirectData
|
||||||
end
|
end
|
||||||
|
|
|
@ -77,10 +77,10 @@ function this.IndicationHightLadderData(_msg)
|
||||||
stage = _msg.stage
|
stage = _msg.stage
|
||||||
endTime = _msg.endTime
|
endTime = _msg.endTime
|
||||||
myRank = _msg.arenaInfo.score
|
myRank = _msg.arenaInfo.score
|
||||||
LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
-- LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||||
LogPink("_msg.stage ".._msg.stage)
|
-- LogPink("_msg.stage ".._msg.stage)
|
||||||
LogPink("_msg.endTime ".._msg.endTime)
|
-- LogPink("_msg.endTime ".._msg.endTime)
|
||||||
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
-- LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel)
|
Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel)
|
||||||
end
|
end
|
||||||
--战斗更新
|
--战斗更新
|
||||||
|
@ -92,8 +92,8 @@ function this.BattleHightLadderData(_msg)
|
||||||
arenaInfo = _msg.arenaInfo
|
arenaInfo = _msg.arenaInfo
|
||||||
myRank =_msg.arenaInfo.score
|
myRank =_msg.arenaInfo.score
|
||||||
end
|
end
|
||||||
LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
-- LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||||
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
-- LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
||||||
end
|
end
|
||||||
--获得天梯阶段
|
--获得天梯阶段
|
||||||
function this.GetHightLadderDataArenaInfo()
|
function this.GetHightLadderDataArenaInfo()
|
||||||
|
@ -118,7 +118,10 @@ function this.GetHightLadderDataIsGroup()
|
||||||
return isGroup ~= 0
|
return isGroup ~= 0
|
||||||
end
|
end
|
||||||
function this.GetHightLadderDataIsStart()
|
function this.GetHightLadderDataIsStart()
|
||||||
return isStart == 1
|
return isStart >= mServerArenaSetting[1].OpenWeek
|
||||||
|
end
|
||||||
|
function this.GetQiJieIsStart()
|
||||||
|
return isStart >= mServerArenaSetting[3].OpenWeek
|
||||||
end
|
end
|
||||||
-- 获取剩余挑战次数 特权
|
-- 获取剩余挑战次数 特权
|
||||||
function this.GetCanBattleCount()
|
function this.GetCanBattleCount()
|
||||||
|
|
|
@ -268,7 +268,7 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
end
|
end
|
||||||
-- 跨服相关判断
|
-- 跨服相关判断
|
||||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
if not JumpServerManager.GetQiJieIsStart() then
|
||||||
type[id].state = -4
|
type[id].state = -4
|
||||||
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek)
|
type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek)
|
||||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||||
|
|
|
@ -1022,6 +1022,12 @@ function this.SevenWorldInfoIndication(buffer)
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
QiJieShiLianManager.GetServerData(msg,function ()
|
QiJieShiLianManager.GetServerData(msg,function ()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.RefreshPanel)
|
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)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -777,6 +777,9 @@ local jumpDic = {
|
||||||
this.JumpActivity(JumpType.linglongShangShi,data[1])
|
this.JumpActivity(JumpType.linglongShangShi,data[1])
|
||||||
end,
|
end,
|
||||||
[JumpType.QiJieShiLian] = function(data)
|
[JumpType.QiJieShiLian] = function(data)
|
||||||
|
if UIManager.IsOpen(UIName.GeneralRankRewardPanel) then
|
||||||
|
UIManager.ClosePanel(UIName.GeneralRankRewardPanel)
|
||||||
|
end
|
||||||
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.QIJIESHILIAN,3,function ()
|
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.QIJIESHILIAN,3,function ()
|
||||||
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
|
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -84,7 +84,7 @@ function this:OnShow(_parent,...)
|
||||||
elseif curType == 4 then --七界秘宝
|
elseif curType == 4 then --七界秘宝
|
||||||
rewardData,rewardData1 = GeneralTreasureMangaer.GetAllRewardData()
|
rewardData,rewardData1 = GeneralTreasureMangaer.GetAllRewardData()
|
||||||
this:SetItem(rewardData,rewardData1)
|
this:SetItem(rewardData,rewardData1)
|
||||||
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+1500积分,<color=#CC4325>可获取1280妖晶</color></color>"
|
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+1500积分,<color=#CC4325>可获取1980妖晶</color></color>"
|
||||||
this.dealBtnIma.gameObject:SetActive(false)
|
this.dealBtnIma.gameObject:SetActive(false)
|
||||||
this.dealBtnText.gameObject:SetActive(true)
|
this.dealBtnText.gameObject:SetActive(true)
|
||||||
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
|
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
|
||||||
|
|
|
@ -29,9 +29,17 @@ end
|
||||||
function QiJieSingleTreasure:BindEvent()
|
function QiJieSingleTreasure:BindEvent()
|
||||||
Util.AddClick(self.activeBtn,function()
|
Util.AddClick(self.activeBtn,function()
|
||||||
if BagManager.GetTotalItemNum(self.data.Cost[1])>=self.data.Cost[2] then
|
if BagManager.GetTotalItemNum(self.data.Cost[1])>=self.data.Cost[2] then
|
||||||
|
local state = self.data.state
|
||||||
NetManager.SevenWorldRelicRequest(self.data.Id,function ()
|
NetManager.SevenWorldRelicRequest(self.data.Id,function ()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.BuySingleTreasure)
|
Game.GlobalEvent:DispatchEvent(GameEvent.QiJieShiLian.BuySingleTreasure)
|
||||||
self.parent:ClosePanel()
|
self.parent:ClosePanel()
|
||||||
|
if state == 0 then
|
||||||
|
PopupTipPanel.ShowTip("<color=red>已取消遗物激活状态!</color>")
|
||||||
|
elseif state == 1 then
|
||||||
|
PopupTipPanel.ShowTip("<color=red>成功解锁遗物并将其激活!</color>")
|
||||||
|
elseif state == 2 then
|
||||||
|
PopupTipPanel.ShowTip("<color=red>已激活遗物!</color>")
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -354,7 +354,7 @@ function this.CheckQiJieRedPoint()
|
||||||
end
|
end
|
||||||
-- 跨服相关判断
|
-- 跨服相关判断
|
||||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
if not JumpServerManager.GetQiJieIsStart() then
|
||||||
return false
|
return false
|
||||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||||
return false
|
return false
|
||||||
|
@ -380,7 +380,7 @@ function this.CheckQiJieJump(funcType,SettingNum,func)
|
||||||
end
|
end
|
||||||
-- 跨服相关判断
|
-- 跨服相关判断
|
||||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
if not JumpServerManager.GetQiJieIsStart() then
|
||||||
PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek))
|
PopupTipPanel.ShowTip(string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek))
|
||||||
return
|
return
|
||||||
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
|
||||||
|
|
Loading…
Reference in New Issue