Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
87234641fa
|
|
@ -944,6 +944,7 @@ RedPointType = {
|
|||
chaozhijijin = 80,
|
||||
|
||||
linglongBaojing = 671,
|
||||
TaiChuMiJuan = 670,
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
|
|
|||
|
|
@ -1431,6 +1431,14 @@ function TimeStampToDateStr2(timestamp)
|
|||
local cdate = os.date("*t", GetTimeStamp())
|
||||
return string.format(Language[12056], date.year, date.month, date.day, date.hour, date.min)
|
||||
end
|
||||
|
||||
-- 将时间转换为年月日
|
||||
function TimeStampToDateStr2(timestamp)
|
||||
local date = os.date("*t", timestamp)
|
||||
local cdate = os.date("*t", GetTimeStamp())
|
||||
return date.year..date.month..date.day
|
||||
end
|
||||
|
||||
-- 将时间戳转换为用于显示的日期字符串(时分秒)
|
||||
function TimeStampToDateStr3(second)
|
||||
local minute = math.floor(second / 60) % 60
|
||||
|
|
|
|||
|
|
@ -87,6 +87,14 @@ function this.GetATaiChuMiJuanData(data)
|
|||
end
|
||||
end
|
||||
|
||||
function this.CheckRedPointTaiChu()
|
||||
if (not PlayerPrefs.HasKey("TaiChu"..PlayerManager.uid) or PlayerPrefs.GetString("TaiChu"..PlayerManager.uid) ~= TimeStampToDateStr2(GetTimeStamp())) and LengthOfTable(this.TaiChuMiJuanData) > 0 then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
function this.SetSelectIndex(dataType,goodsId,b)
|
||||
this.selectIndex.dataType = dataType
|
||||
this.selectIndex.goodsId = goodsId
|
||||
|
|
|
|||
|
|
@ -268,6 +268,7 @@ function this:InitComponent()
|
|||
this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj")
|
||||
|
||||
this.taiChuMiJuanBtn = Util.GetGameObject(self.gameObject, "taichumijuan")
|
||||
this.taichumijuanRed=Util.GetGameObject(this.taiChuMiJuanBtn, "redPoint")
|
||||
end
|
||||
|
||||
function this:SetPosFunc(v2)
|
||||
|
|
@ -296,6 +297,7 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function this:BindEvent()
|
||||
Util.AddOnceClick(this.taiChuMiJuanBtn,function()
|
||||
|
||||
NetManager.TaiChuSecretvolumeRequest(function(msg)
|
||||
local data = {}
|
||||
if not msg or not msg.secretvolume or #msg.secretvolume < 1 then
|
||||
|
|
@ -314,6 +316,8 @@ function this:BindEvent()
|
|||
table.sort(data,function(a,b)
|
||||
return a.id < b.id
|
||||
end)
|
||||
PlayerPrefs.SetString("TaiChu"..PlayerManager.uid,TimeStampToDateStr2(GetTimeStamp()))
|
||||
CheckRedPointStatus(RedPointType.TaiChuMiJuan)
|
||||
UIManager.OpenPanel(UIName.taiChuMiJuan,data)
|
||||
end)
|
||||
end)
|
||||
|
|
@ -711,6 +715,7 @@ function this.BindRedPoint()
|
|||
BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
||||
BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
||||
BindRedPointObject(RedPointType.JumpServer_MainCity, this.rpJumpServer)
|
||||
BindRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed)
|
||||
end
|
||||
-- 绑定红点
|
||||
function this.ClearRedPoint()
|
||||
|
|
@ -734,6 +739,7 @@ function this.ClearRedPoint()
|
|||
ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
|
||||
ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
|
||||
ClearRedPointObject(RedPointType.JumpServer_MainCity, this.rpJumpServer)
|
||||
ClearRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -313,6 +313,7 @@ function this.RefreshUpdateIndication(buffer)
|
|||
CheckRedPointStatus(RedPointType.Guild_AidBox)
|
||||
CheckRedPointStatus(RedPointType.Guild_AidGuild)
|
||||
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
||||
CheckRedPointStatus(RedPointType.TaiChuMiJuan)
|
||||
|
||||
LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
|
||||
CheckRedPointStatus(RedPointType.Arena_Free)
|
||||
|
|
|
|||
|
|
@ -540,6 +540,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.jijin328,ActivityGiftManager.CheckRedpointUpperMonthCard)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong)
|
||||
RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue