Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
bfd2ff46a7
|
@ -1432,6 +1432,7 @@ ActivityTypeDef = {
|
|||
chaozhifanli = 90,
|
||||
chaozhifanli30 = 92,
|
||||
|
||||
MeiRiTeHui = 89,--每日特惠领取
|
||||
XinRenShop = 91, -- 新人商城
|
||||
yunmenghaoli = 93, --云梦好礼
|
||||
|
||||
|
|
|
@ -1607,6 +1607,13 @@ function GetTimeStampCorrespondingWeekNum(second)
|
|||
WeekNum = (day % 7)-- + 4
|
||||
return WeekNumList[WeekNum]
|
||||
end
|
||||
|
||||
--获取到本周结束的剩余时间
|
||||
function TimeToCurWeekEnd()
|
||||
local leftTime = 604800- (GetTimeStamp() - 316800)%604800
|
||||
return leftTime
|
||||
end
|
||||
|
||||
function TimeToFelaxible(second)--大于一天用多少天多少小时,小于一天用00:00:00
|
||||
if second <= 86400 then
|
||||
if not second or second < 0 then
|
||||
|
|
|
@ -66,7 +66,7 @@ function LingShouBaoGe:BindEvent()
|
|||
end)
|
||||
end)
|
||||
Util.AddOnceClick(self.lsth, function()
|
||||
JumpManager.GoJump(40010)
|
||||
JumpManager.GoJump(40011)
|
||||
end)
|
||||
Util.AddOnceClick(self.preview, function()
|
||||
local battleId = tonumber(self.showData.battleId)
|
||||
|
|
|
@ -728,13 +728,7 @@ local jumpDic = {
|
|||
end
|
||||
end,
|
||||
[JumpType.zhenqibaoge] = function(data)
|
||||
local id= ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ContinuePackage)
|
||||
local id2= ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YiJingBaoKu)
|
||||
if id then
|
||||
JumpManager.GoJump(40050,nil,id2)
|
||||
else
|
||||
this.JumpActivity(JumpType.zhenqibaoge,data[1])
|
||||
end
|
||||
this.JumpActivity(JumpType.zhenqibaoge,data[1])
|
||||
end,
|
||||
[JumpType.LingShouTehui] = function(data)--零售特惠
|
||||
this.JumpActivity(JumpType.LingShouTehui,data[1])
|
||||
|
|
|
@ -408,14 +408,19 @@ function EveryDayGiftNew:GetRemainTime()
|
|||
la = "结束时间:"
|
||||
end
|
||||
local freshTime = 0
|
||||
local packFreshTime = 0
|
||||
--此时间是七日礼包刷新时间
|
||||
-- local packFreshTime = 0
|
||||
|
||||
if self.shopData and #self.shopData > 0 then
|
||||
freshTime = self.shopData[#self.shopData].data.endTime - GetTimeStamp()
|
||||
end
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
||||
if actData then
|
||||
packFreshTime = actData.endTime - GetTimeStamp()
|
||||
-- local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.MeiRiTeHui)
|
||||
-- if actData then
|
||||
-- packFreshTime = actData.endTime - GetTimeStamp()
|
||||
-- end
|
||||
--灵兽宝阁的珍奇宝阁礼包刷新时间显示
|
||||
if self.actId == 5501 then
|
||||
freshTime = TimeToCurWeekEnd()
|
||||
end
|
||||
self.endTime.text = la..TimeToFelaxible(freshTime)
|
||||
self.localTimer = Timer.New(function ()
|
||||
|
@ -437,7 +442,7 @@ function EveryDayGiftNew:GetRemainTime()
|
|||
-- self.btn2Text.text = string.format("60元七天特惠")
|
||||
-- end
|
||||
freshTime = freshTime - 1
|
||||
packFreshTime = packFreshTime - 1
|
||||
-- packFreshTime = packFreshTime - 1
|
||||
end, 1, -1, true)
|
||||
self.localTimer:Start()
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue