挂机关卡显示修改,罗浮备战修改
parent
6bd2a47796
commit
2c0dc054cd
|
@ -663,10 +663,11 @@ function this.ShowBattleInfo()
|
||||||
local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig,curSoliderStageConfig.Hero)
|
local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig,curSoliderStageConfig.Hero)
|
||||||
local bossName=GetResourcePath(heroData.Live)
|
local bossName=GetResourcePath(heroData.Live)
|
||||||
local tipString
|
local tipString
|
||||||
|
|
||||||
|
LogError("GetOpenServerDayNum()================"..GetOpenServerDayNum())
|
||||||
for _, config in ConfigPairs(soldierStageConfig) do
|
for _, config in ConfigPairs(soldierStageConfig) do
|
||||||
if config.OpenRule and #config.OpenRule>0 and config.OpenRule[1][2]==GetOpenServerDayNum() then
|
if config.OpenRule and #config.OpenRule>0 and config.OpenRule[1][2]==GetOpenServerDayNum() then
|
||||||
tipString=config.OpenTips
|
tipString=config.OpenTips
|
||||||
break
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.openTip.text=tipString
|
this.openTip.text=tipString
|
||||||
|
|
|
@ -20,6 +20,7 @@ function this.Init(root,_isDemonstrateTheir,_pData)--isDemonstrateTheir是否是
|
||||||
end
|
end
|
||||||
--- 获取需要显示的编队id
|
--- 获取需要显示的编队id
|
||||||
function this.GetFormationIndex()
|
function this.GetFormationIndex()
|
||||||
|
LogError("JumpServerManager.arenaType=========="..JumpServerManager.arenaType)
|
||||||
if JumpServerManager.arenaType==1 then
|
if JumpServerManager.arenaType==1 then
|
||||||
return FormationTypeDef.LuoFuZhengFeng1
|
return FormationTypeDef.LuoFuZhengFeng1
|
||||||
elseif JumpServerManager.arenaType==2 then
|
elseif JumpServerManager.arenaType==2 then
|
||||||
|
@ -118,11 +119,21 @@ end
|
||||||
|
|
||||||
--- 提交按钮点击事件
|
--- 提交按钮点击事件
|
||||||
function this.On_Btn2_Click()
|
function this.On_Btn2_Click()
|
||||||
local formation = FormationManager.GetFormationByID(FormationTypeDef.JUMPSERVER_HIGHTLADDER)
|
local team=0
|
||||||
if #formation.teamHeroInfos == 0 then
|
if JumpServerManager.arenaType==1 then
|
||||||
PopupTipPanel.ShowTip(Language[10711])
|
team=FormationTypeDef.LuoFuZhengFeng1
|
||||||
return
|
elseif JumpServerManager.arenaType==2 then
|
||||||
|
team=FormationTypeDef.LuoFuZhengFeng2
|
||||||
|
elseif JumpServerManager.arenaType==3 then
|
||||||
|
team=FormationTypeDef.LuoFuZhengFeng3
|
||||||
|
elseif JumpServerManager.arenaType==4 then
|
||||||
|
team=FormationTypeDef.LuoFuZhengFeng4
|
||||||
end
|
end
|
||||||
|
--local formation = FormationManager.GetFormationByID(team)
|
||||||
|
-- if #formation.teamHeroInfos == 0 then
|
||||||
|
-- PopupTipPanel.ShowTip(Language[10711])
|
||||||
|
-- return
|
||||||
|
-- end
|
||||||
|
|
||||||
if #this.root.choosedList>=1 then
|
if #this.root.choosedList>=1 then
|
||||||
local isSame=true
|
local isSame=true
|
||||||
|
@ -150,7 +161,7 @@ function this.On_Btn2_Click()
|
||||||
end
|
end
|
||||||
if this.isDemonstrateTheir then
|
if this.isDemonstrateTheir then
|
||||||
-- 请求开始挑战
|
-- 请求开始挑战
|
||||||
PlayerManager.RequestPlayWithSomeOne(this.pData.uid, FormationTypeDef.JUMPSERVER_HIGHTLADDER, this.pData.name, function(result)
|
PlayerManager.RequestPlayWithSomeOne(this.pData.uid, team, this.pData.name, function(result)
|
||||||
this.root:ClosePanel()
|
this.root:ClosePanel()
|
||||||
|
|
||||||
local arg = {}
|
local arg = {}
|
||||||
|
|
Loading…
Reference in New Issue