Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
commit
97cdd13df9
|
@ -78,12 +78,12 @@ function LingShouBaoGe:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.preview, function()
|
||||
local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1006)
|
||||
local fdata, fseed = BattleManager.GetFakeBattleData(1006)
|
||||
local testFightData = {
|
||||
fightData = loadstring("return "..fb.FightData)(),
|
||||
fightSeed = fb.TimeSeed,
|
||||
fightType = 0,
|
||||
maxRound = 20
|
||||
fightData = fdata,
|
||||
fightSeed = fseed,
|
||||
fightType = 0,
|
||||
maxRound = 20
|
||||
}
|
||||
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
|
||||
end)
|
||||
|
@ -181,6 +181,7 @@ function LingShouBaoGe:refreshBtnShow()
|
|||
redPot.gameObject:SetActive(isFree)
|
||||
icon.gameObject:SetActive(not isFree)
|
||||
num.gameObject:SetActive(not isFree)
|
||||
this.tip1.gameObject:SetActive(freeTime == 0)
|
||||
|
||||
local itemId=0
|
||||
local itemNum=0
|
||||
|
@ -271,7 +272,7 @@ function LingShouBaoGe:TimeCountDown()
|
|||
if timeDown < 1 then
|
||||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
parent:ClosePanel()
|
||||
this:Refresh()
|
||||
return
|
||||
end
|
||||
timeDown = timeDown - 1
|
||||
|
|
Loading…
Reference in New Issue