Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
ff7e9e9e85
|
@ -93,7 +93,7 @@ function this.StartFight()
|
|||
this.root:ClosePanel()
|
||||
local fightData = BattleManager.GetBattleServerData(msg)
|
||||
QiJieShiLianManager.battleResult = msg
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.QIJIE_FIGHT)
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.QIJIE_FIGHT):SetResult(msg.result)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
|
@ -448,6 +448,7 @@ function TrialMapPanel:OnClose()
|
|||
this.timer = nil
|
||||
end
|
||||
Util.ClearChild(this.s_grid.transform)
|
||||
this.starGridList = {}
|
||||
heroList={}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue