Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
commit
6a3d4b99f7
|
@ -486,7 +486,7 @@ PanelType = {
|
||||||
XiangYaoDuoBao = {14,16,1220},--降妖夺宝
|
XiangYaoDuoBao = {14,16,1220},--降妖夺宝
|
||||||
NiuQiChongTian = {14,16,1300},--牛气冲天
|
NiuQiChongTian = {14,16,1300},--牛气冲天
|
||||||
XiuXing = {14,16,1226},--修行
|
XiuXing = {14,16,1226},--修行
|
||||||
WorldArena = { 14,16,106}, --玉虚论道
|
WorldArena = { 107,16,106}, --玉虚论道
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -552,6 +552,7 @@ UpViewRechargeType = {
|
||||||
LuoFuJingShi = 1207,--罗浮晶石
|
LuoFuJingShi = 1207,--罗浮晶石
|
||||||
SuiFanXingCheng = 1007, -- 碎繁星辰
|
SuiFanXingCheng = 1007, -- 碎繁星辰
|
||||||
yuxulundaoTicket=106, --玉虚论道邀请函
|
yuxulundaoTicket=106, --玉虚论道邀请函
|
||||||
|
LunDaoBi=107, --论道币
|
||||||
}
|
}
|
||||||
|
|
||||||
SHOP_PAGE = {
|
SHOP_PAGE = {
|
||||||
|
|
|
@ -287,9 +287,12 @@ end
|
||||||
|
|
||||||
|
|
||||||
-- 获取要显示得英雄列表
|
-- 获取要显示得英雄列表
|
||||||
function this.GetHeroList()
|
function this.GetHeroList(proId)
|
||||||
|
if not proId or proId==0 then
|
||||||
return HeroManager.GetAllHeroDatas()
|
return HeroManager.GetAllHeroDatas()
|
||||||
end
|
end
|
||||||
|
return HeroManager.GetHeroDataByProperty(proId)
|
||||||
|
end
|
||||||
|
|
||||||
-- 获取一键上阵所需要的英雄列表
|
-- 获取一键上阵所需要的英雄列表
|
||||||
function this.GetOneKeyUpHeroList()
|
function this.GetOneKeyUpHeroList()
|
||||||
|
|
|
@ -256,7 +256,6 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,costType,function(msg)
|
NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,costType,function(msg)
|
||||||
LogError("战斗结束")
|
|
||||||
resultList=msg.fightResult
|
resultList=msg.fightResult
|
||||||
fightDataList=msg.fightData
|
fightDataList=msg.fightData
|
||||||
isAnim = true
|
isAnim = true
|
||||||
|
@ -296,17 +295,17 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
for i = 1, #this.playBacks do
|
for i = 1, #this.playBacks do
|
||||||
Util.AddClick(this.playBacks[i],function()
|
Util.AddClick(this.playBacks[i],function()
|
||||||
|
|
||||||
if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
|
-- if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
|
||||||
PopupTipPanel.ShowTip("本场战斗无法回放!")
|
-- PopupTipPanel.ShowTip("本场战斗无法回放!")
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
|
|
||||||
local nameStr = myInfoData.name.."|"..enInfoData.name
|
local nameStr = myInfoData.name.."|"..enInfoData.name
|
||||||
local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
|
local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
|
||||||
this.RequestReplayRecord(realResult,fightDataList[i], nameStr,function()
|
this.RequestReplayRecord(realResult,fightDataList[i], nameStr,function()
|
||||||
--this:ClosePanel()
|
--this:ClosePanel()
|
||||||
--构建显示结果数据(我永远在蓝方)
|
--构建显示结果数据(我永远在蓝方)
|
||||||
local arg = {}
|
local arg = {}
|
||||||
|
arg.panelType=1
|
||||||
arg.result = realResult
|
arg.result = realResult
|
||||||
arg.blue = {}
|
arg.blue = {}
|
||||||
arg.blue.uid = myInfoData.uid
|
arg.blue.uid = myInfoData.uid
|
||||||
|
|
|
@ -399,7 +399,6 @@ end
|
||||||
-- 打开,重新打开时回调
|
-- 打开,重新打开时回调
|
||||||
function WorldArenaMainPanel:OnShow()
|
function WorldArenaMainPanel:OnShow()
|
||||||
SoundManager.PlayMusic(SoundConfig.BGM_Arena)
|
SoundManager.PlayMusic(SoundConfig.BGM_Arena)
|
||||||
LogError("**********")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function WorldArenaMainPanel:OnSortingOrderChange()
|
function WorldArenaMainPanel:OnSortingOrderChange()
|
||||||
|
|
|
@ -57,6 +57,7 @@ local _ShowPlusType = {
|
||||||
UpViewRechargeType.SuiFanXingCheng,
|
UpViewRechargeType.SuiFanXingCheng,
|
||||||
UpViewRechargeType.LuoFuJingShi,
|
UpViewRechargeType.LuoFuJingShi,
|
||||||
UpViewRechargeType.yuxulundaoTicket,
|
UpViewRechargeType.yuxulundaoTicket,
|
||||||
|
UpViewRechargeType.LunDaoBi,
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 判断是否显示加号
|
-- 判断是否显示加号
|
||||||
|
@ -383,7 +384,8 @@ function UpView:RechargeType(_type)
|
||||||
_type==UpViewRechargeType.XuanHuangZhiQi or
|
_type==UpViewRechargeType.XuanHuangZhiQi or
|
||||||
_type==UpViewRechargeType.LuoFuJingShi or
|
_type==UpViewRechargeType.LuoFuJingShi or
|
||||||
_type==UpViewRechargeType.XiuXian or
|
_type==UpViewRechargeType.XiuXian or
|
||||||
_type==UpViewRechargeType.SuiFanXingCheng then
|
_type==UpViewRechargeType.SuiFanXingCheng or
|
||||||
|
_type==UpViewRechargeType.LunDaoBi then
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue