Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua
commit
7ea442ff5d
|
|
@ -84,12 +84,10 @@ local _TimeCheckFunc = {
|
|||
return
|
||||
end
|
||||
if curCount < maxCount then
|
||||
local nextFreshTime = itemData.nextFlushTime
|
||||
Log("云游值刷新时间:"..nextFreshTime)
|
||||
local remationTime = nextFreshTime - PlayerManager.serverTime -- 下一次刷新的时间
|
||||
if remationTime<0 then
|
||||
local timeInterval= GameSetting.ItemAdd[7][3]
|
||||
BagManager.bagDatas[UpViewRechargeType.YunYouVle].num = BagManager.bagDatas[UpViewRechargeType.YunYouVle].num+1
|
||||
local nextFreshTime = BagManager.bagDatas[UpViewRechargeType.YunYouVle].nextFlushTime
|
||||
local remationTime = nextFreshTime - PlayerManager.serverTime -- 下一次刷新的时间
|
||||
if remationTime<=-1 then
|
||||
local timeInterval= GameSetting.ItemAdd[7][3]
|
||||
remationTime=timeInterval-(math.abs(remationTime)%timeInterval)
|
||||
end
|
||||
return remationTime
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ function this.EventTrigger(_data)
|
|||
elseif _data.pathType==2 then --双倍节点
|
||||
PopupTipPanel.ShowTip("奖励翻倍!")
|
||||
elseif _data.pathType==3 then --额外骰子节点
|
||||
PopupTipPanel.ShowTip("骰子x2")
|
||||
PopupTipPanel.ShowTip("本轮获得疾如闪电效果")
|
||||
saiNum=2
|
||||
elseif _data.pathType==4 then --东海寻仙节点
|
||||
targetBtn=this.shopBtn
|
||||
|
|
@ -549,6 +549,7 @@ function this.ShowCountTime()
|
|||
this.timer = Timer.New(function ()
|
||||
local leftTime = AutoRecoverManager.GetRecoverTime(UpViewRechargeType.YunYouVle)
|
||||
if leftTime<=0 then
|
||||
BagManager.bagDatas[UpViewRechargeType.YunYouVle].num=BagManager.bagDatas[UpViewRechargeType.YunYouVle].num+1
|
||||
this.UpdateYunYouVleShow()
|
||||
end
|
||||
if curValue>=maxValue then
|
||||
|
|
|
|||
Loading…
Reference in New Issue