Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-10-21 18:12:41 +08:00
commit 4e89351ef8
1 changed files with 3 additions and 16 deletions

View File

@ -92,23 +92,11 @@ function XiaoYaoLuckyTurnTablePopup:test(itemId)
this.turnEffect2:Stop() this.turnEffect2:Stop()
this.turnEffect2 = nil this.turnEffect2 = nil
end end
this.turnEffect2 = Timer.New(function() for i = 1 , 10 do
this:tableTurnEffect(1/t) this:tableTurnEffect(1/t)
t=t+5 t=t+5
end,0.1,10,true) coroutine.wait(0.1)
this.turnEffect2:Start() end
coroutine.wait(1)
-- --减速阶段
-- if this.turnEffect2 then
-- this.turnEffect2:Stop()
-- this.turnEffect2 = nil
-- end
-- this.turnEffect2 = Timer.New(function()
-- this:tableTurnEffect(1/t)
-- t=t-3.3
-- end,0.1,10,true)
-- this.turnEffect2:Start()
-- coroutine.wait(1)
this:tableTurnEffect(0.1,itemId) this:tableTurnEffect(0.1,itemId)
end) end)
end end
@ -132,7 +120,6 @@ function XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId)
SoundManager.PlaySound(SoundConfig.Sound_zp) SoundManager.PlaySound(SoundConfig.Sound_zp)
SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan) SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan)
index = index + 1 index = index + 1
--LogGreen("index == "..index)
--检测最后的奖励 --检测最后的奖励
if itemId and index == itemId then if itemId and index == itemId then
this.turnEffect:Stop() this.turnEffect:Stop()