Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
a923acdcb1
|
@ -509,7 +509,6 @@ function this.GetCanUseHeroDatas()
|
||||||
end
|
end
|
||||||
isNew = PlayerPrefs.GetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId)
|
isNew = PlayerPrefs.GetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId)
|
||||||
this.canUseHeroDatas[v.dynamicId].isNew = isNew
|
this.canUseHeroDatas[v.dynamicId].isNew = isNew
|
||||||
LogGreen("this.canUseHeroDatas[v.dynamicId].isNew:"..this.canUseHeroDatas[v.dynamicId].isNew)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -917,7 +916,7 @@ function this.ChecRedPointEndLess()
|
||||||
PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid ,0)
|
PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid ,0)
|
||||||
end
|
end
|
||||||
local note = PlayerPrefs.GetInt("WuJin1"..PlayerManager.uid)
|
local note = PlayerPrefs.GetInt("WuJin1"..PlayerManager.uid)
|
||||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId()
|
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
|
||||||
if serData.endTime ~= note then
|
if serData.endTime ~= note then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
@ -934,7 +933,6 @@ end
|
||||||
function this.CheckCanUseHeroNew()
|
function this.CheckCanUseHeroNew()
|
||||||
this.GetCanUseHeroDatas()
|
this.GetCanUseHeroDatas()
|
||||||
for k,v in pairs(this.canUseHeroDatas) do
|
for k,v in pairs(this.canUseHeroDatas) do
|
||||||
LogGreen("v.isNew:"..v.isNew)
|
|
||||||
if v.isNew and v.isNew == 1 then
|
if v.isNew and v.isNew == 1 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,12 +12,23 @@ local heroId = 10026
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
function EveryDayGift:AddListener()
|
function EveryDayGift:AddListener()
|
||||||
|
Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState,self.RefreshData1,self)
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
function EveryDayGift:RemoveListener()
|
function EveryDayGift:RemoveListener()
|
||||||
|
Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState,self.RefreshData1,self)
|
||||||
|
end
|
||||||
|
|
||||||
|
function EveryDayGift:RefreshData1()
|
||||||
|
local freshTime = 0
|
||||||
|
self.shopData = DynamicActivityManager.GetGiftDataByType(self.actConfig.ShopData)
|
||||||
|
if self.shopData and #self.shopData > 0 then
|
||||||
|
freshTime = self.shopData[#self.shopData].data.endTime
|
||||||
|
end
|
||||||
|
if freshTime - GetTimeStamp() <= 0 then
|
||||||
|
self:RefreshData(true,true,false)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -286,23 +297,25 @@ function EveryDayGift:GetRemainTime()
|
||||||
if freshTime - GetTimeStamp() <= 0 then
|
if freshTime - GetTimeStamp() <= 0 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
freshTime = freshTime - GetTimeStamp()
|
||||||
local UpDate = function()
|
local UpDate = function()
|
||||||
local showfreshTime = freshTime - GetTimeStamp()
|
if freshTime > 0 then
|
||||||
if showfreshTime > 0 then
|
|
||||||
-- 剩余小时
|
-- 剩余小时
|
||||||
local formatTime, leftHour = TimeToHMS(showfreshTime)
|
local formatTime, leftHour = TimeToHMS(freshTime)
|
||||||
if leftHour > 24 then
|
if leftHour > 24 then
|
||||||
self.endTime.text = la..TimeToDHMS(showfreshTime)--天时分秒
|
self.endTime.text = la..TimeToDHMS(freshTime)--天时分秒
|
||||||
else
|
else
|
||||||
self.endTime.text = la..formatTime--时分秒
|
self.endTime.text = la..formatTime--时分秒
|
||||||
end
|
end
|
||||||
elseif showfreshTime < 0 then
|
elseif freshTime < 0 then
|
||||||
|
self.endTime.text = la..TimeToDHMS(0)
|
||||||
if self.localTimer then
|
if self.localTimer then
|
||||||
self.localTimer:Stop()
|
self.localTimer:Stop()
|
||||||
self.localTimer = nil
|
self.localTimer = nil
|
||||||
end
|
end
|
||||||
self:RefreshData(true)
|
self:RefreshData(true)
|
||||||
end
|
end
|
||||||
|
freshTime = freshTime - 1
|
||||||
end
|
end
|
||||||
UpDate()
|
UpDate()
|
||||||
if self.localTimer then
|
if self.localTimer then
|
||||||
|
|
Loading…
Reference in New Issue