编队id修改

dev_chengFeng
jiaoyangna 2021-09-02 17:29:44 +08:00
parent 8ae3228319
commit 13909e60aa
6 changed files with 14 additions and 14 deletions

View File

@ -1815,10 +1815,10 @@ FormationTypeDef = {
FIGHT_LEVEL = 1701, --山河社稷图主关卡编队
FIGHT_ASSISTANTLEVEL = 1801, --山河社稷图副主关卡编队
FORMATION_TSLX = 1901, --踏碎凌霄编队 没有实际意义后端做特殊操作 其实就是主线编队
FourElement_PEOPLE = 2001,
FourElement_BUDDHIST = 2002,
FourElement_MAGIC = 2003,
FourElement_TAOIST = 2004,
FourElement_PEOPLE = 3001,
FourElement_BUDDHIST = 3002,
FourElement_MAGIC = 3003,
FourElement_TAOIST = 3004,
}
--编队需要拉取主线

View File

@ -31,7 +31,7 @@ end
--- 获取需要显示的编队id
function this.GetFormationIndex()
return (curType + 2000)
return (curType + 3000)
end
--- 设置阵营

View File

@ -105,7 +105,7 @@ function FourElementMonsterCampPanel:BindEvent()
PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战")
return
end
if FormationManager.CheckFormationValid(curType + 2000) then
if FormationManager.CheckFormationValid(curType + 3000) then
MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true)
else
PopupTipPanel.ShowTip("编队不能为空")

View File

@ -273,7 +273,7 @@ function this.ExecuteFightBattle(id,type,func,curType,isQuick)
end
function this.SaveFormation(curType)
local curFormation = FormationManager.GetFormationByID(2000 + curType)
local curFormation = FormationManager.GetFormationByID(3000 + curType)
local data = this.GetFriendHelpHero(curType)
--上阵列表赋值
local choosedList ={}
@ -288,9 +288,9 @@ function this.SaveFormation(curType)
end
end
FormationManager.RefreshFormation(
(2000 + curType),
(3000 + curType),
choosedList,
FormationManager.formationList[(2000 + curType)].teamPokemonInfos
FormationManager.formationList[(3000 + curType)].teamPokemonInfos
)
end
end
@ -500,7 +500,7 @@ function this.SetFriendHelpHero(helpFightList,trailType)
this.friendHelpHero[trailType] = {}
end
local team = FormationManager.GetFormationByID(trailType + 2000)
local team = FormationManager.GetFormationByID(trailType + 3000)
if this.friendHelpHero[trailType].hero then
local newteam = {}
for k,v in ipairs(team.teamHeroInfos) do
@ -511,9 +511,9 @@ function this.SetFriendHelpHero(helpFightList,trailType)
end
if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then
FormationManager.RefreshFormation(
trailType + 2000,
trailType + 3000,
newteam,
FormationManager.formationList[trailType + 2000].teamPokemonInfos)
FormationManager.formationList[trailType + 3000].teamPokemonInfos)
end
end
if helpFightList then

View File

@ -123,7 +123,7 @@ function FourElementSingleWave:OnOpen()
elseif self.data.wave == self.trailData.monsterWave + 1 then
if self.trailData.canFightTime > 0 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave)
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 2000)) > 0 then
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 3000)) > 0 then
-- MonsterCampManager.ExecuteFightBattle(self.data.wave,0,nil,self.trailData.fourElementType)
-- else
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave)

View File

@ -154,7 +154,7 @@ function MonsterCampSingleWave:OnOpen()
-- end
-- elseif self.data.Id == self.trailData.monsterWave + 1 then
-- if self.trailData.canFightTime > 0 then
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 2000)) > 0 then
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 3000)) > 0 then
-- MonsterCampManager.ExecuteFightBattle(self.data.Id,0,nil,self.trailData.fourElementType)
-- else
-- -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.Id)