Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
68a2995780
|
@ -123,7 +123,7 @@ function this.On_Btn2_Click()
|
|||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos
|
||||
)
|
||||
if this.opType == 1 then
|
||||
this.StraightBattle()
|
||||
this.StartFight()
|
||||
elseif this.opType == 2 then
|
||||
PopupTipPanel.ShowTip("保存编队成功")
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue