diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index e6cb11e809..34963d7811 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -663,10 +663,11 @@ function this.ShowBattleInfo() local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig,curSoliderStageConfig.Hero) local bossName=GetResourcePath(heroData.Live) local tipString + + LogError("GetOpenServerDayNum()================"..GetOpenServerDayNum()) for _, config in ConfigPairs(soldierStageConfig) do if config.OpenRule and #config.OpenRule>0 and config.OpenRule[1][2]==GetOpenServerDayNum() then tipString=config.OpenTips - break end end this.openTip.text=tipString diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua index e156144712..ad3919a970 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua @@ -20,6 +20,7 @@ function this.Init(root,_isDemonstrateTheir,_pData)--isDemonstrateTheir是否是 end --- 获取需要显示的编队id function this.GetFormationIndex() + LogError("JumpServerManager.arenaType=========="..JumpServerManager.arenaType) if JumpServerManager.arenaType==1 then return FormationTypeDef.LuoFuZhengFeng1 elseif JumpServerManager.arenaType==2 then @@ -118,11 +119,21 @@ end --- 提交按钮点击事件 function this.On_Btn2_Click() - local formation = FormationManager.GetFormationByID(FormationTypeDef.JUMPSERVER_HIGHTLADDER) - if #formation.teamHeroInfos == 0 then - PopupTipPanel.ShowTip(Language[10711]) - return + local team=0 + if JumpServerManager.arenaType==1 then + team=FormationTypeDef.LuoFuZhengFeng1 + 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 + --local formation = FormationManager.GetFormationByID(team) + -- if #formation.teamHeroInfos == 0 then + -- PopupTipPanel.ShowTip(Language[10711]) + -- return + -- end if #this.root.choosedList>=1 then local isSame=true @@ -150,7 +161,7 @@ function this.On_Btn2_Click() end 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() local arg = {}