【编队】修复报错
parent
8a275f0c8e
commit
5af9e9f0ed
|
@ -17,7 +17,7 @@ end
|
|||
--- 提交按钮点击事件
|
||||
function this.On_Btn1_Click()
|
||||
local isSkip = 0--ArenaManager.IsSkipFight() and 1 or 0
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -26,7 +26,7 @@ function this.On_Btn2_Click()
|
|||
PopupTipPanel.ShowTip(Language[10709])
|
||||
return
|
||||
end
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -27,7 +27,7 @@ function this.On_Btn2_Click()
|
|||
--保存编队
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -63,7 +63,7 @@ end
|
|||
-- 进入地图
|
||||
function this.On_Btn2_Click()
|
||||
--保存编队
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
table.sort(FormationManager.formationList[this.root.curFormationIndex].teamHeroInfos,function(a,b)
|
||||
|
@ -79,7 +79,7 @@ function this.On_Btn2_Click()
|
|||
|
||||
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
|
||||
if MapManager.Mapping then--在地图里
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
PopupTipPanel.ShowTip(Language[10713])
|
||||
|
|
|
@ -28,7 +28,7 @@ end
|
|||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -30,7 +30,7 @@ end
|
|||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -22,7 +22,7 @@ end
|
|||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -36,7 +36,7 @@ function this.On_Btn1_Click()
|
|||
end
|
||||
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -25,7 +25,7 @@ end
|
|||
function this.On_Btn2_Click()
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -25,7 +25,7 @@ function this.On_Btn2_Click()
|
|||
PopupTipPanel.ShowTip(Language[10711])
|
||||
return
|
||||
end
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -18,7 +18,7 @@ end
|
|||
|
||||
--- btn1点击回调事件 -- lEFT
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -22,7 +22,7 @@ function this.On_Btn1_Click()
|
|||
end
|
||||
---
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
|
@ -32,7 +32,7 @@ function this.On_Btn1_Click()
|
|||
this.root.SetOneKeyGo()
|
||||
end
|
||||
function this.On_Btn2_Click()
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
PopupTipPanel.ShowTip(Language[10713])
|
||||
|
|
|
@ -18,7 +18,7 @@ function this.GetFormationIndex()
|
|||
end
|
||||
--- btn1点击回调事件
|
||||
function this.On_Btn2_Click()
|
||||
LogRed("hadClick "..tostring(hadClick).." this.root.order "..this.root.order)
|
||||
LogRed("hadClick "..tostring(hadClick).." #this.root.choosedList "..#this.root.choosedList)
|
||||
if not hadClick then
|
||||
hadClick = true
|
||||
-- -- 编队为空
|
||||
|
@ -28,7 +28,7 @@ function this.On_Btn2_Click()
|
|||
-- return
|
||||
-- end
|
||||
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
@ -74,7 +74,7 @@ end
|
|||
|
||||
-- 开始战斗
|
||||
function this.StartFight()
|
||||
if this.root.order>=1 then
|
||||
if #this.root.choosedList>=1 then
|
||||
--保存编队
|
||||
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
|
|
Loading…
Reference in New Issue