tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

年兽活动时区修改

This commit is contained in:
by 2025-02-06 12:26:12 +07:00
parent 768dd92e2d
commit f6da9d8aa8
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
worldsrv/action_nian.go
View File

@ -224,11 +224,6 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
//判断活动时间 //判断活动时间
startTime := pool.List[0].ActivityStart startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd endTime := pool.List[0].ActivityEnd
/* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位）
timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime) timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime) endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
@ -610,6 +605,7 @@ func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) er
if p.WelfData.NianData == nil { if p.WelfData.NianData == nil {
p.WelfData.NianData = &model.NianData{} p.WelfData.NianData = &model.NianData{}
} }
if p.WelfData.NianData.BuffStatus { if p.WelfData.NianData.BuffStatus {
pack := &activity.SCNianBuff{ pack := &activity.SCNianBuff{
OpRetCode: activity.OpResultCode_Nian_OPRC_Error_Nian, OpRetCode: activity.OpResultCode_Nian_OPRC_Error_Nian,
@ -625,6 +621,16 @@ func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) er
logger.Logger.Trace("CSNianSignAward 活动关闭！") logger.Logger.Trace("CSNianSignAward 活动关闭！")
return nil return nil
} }
//判断活动时间
startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix()
if nowTime < timestamp || nowTime > endTimestamp {
return nil
}
StartTs := common.IntToTime(int(pool.List[0].BuffStartTime)).Unix() StartTs := common.IntToTime(int(pool.List[0].BuffStartTime)).Unix()
EndTs := common.IntToTime(int(pool.List[0].BuffEndTime)).Unix() EndTs := common.IntToTime(int(pool.List[0].BuffEndTime)).Unix()
//判断领取时间 //判断领取时间
@ -675,11 +681,6 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
//判断活动时间 //判断活动时间
startTime := pool.List[0].ActivityStart startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd endTime := pool.List[0].ActivityEnd
/* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位）
timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime) timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime) endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
@ -701,6 +702,7 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
pack.SignAwardTime = p.WelfData.NianData.SignAwardTime pack.SignAwardTime = p.WelfData.NianData.SignAwardTime
var items []*model.Item var items []*model.Item
for _, info := range pool.List[0].SignReward { for _, info := range pool.List[0].SignReward {
items = append(items, &model.Item{ items = append(items, &model.Item{
ItemId: info.ItemId, ItemId: info.ItemId,
ItemNum: info.ItemNum, ItemNum: info.ItemNum,
@ -792,11 +794,6 @@ func CSNianChange(s *netlib.Session, packetid int, data interface{}, sid int64)
//判断活动时间 //判断活动时间
startTime := pool.List[0].ActivityStart startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd endTime := pool.List[0].ActivityEnd
/* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位）
timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime) timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime) endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()

5
worldsrv/rankmatch.go
View File

@ -952,11 +952,6 @@ func (r *RankMatchMgr) NianRankAward() {
} }
startTime := pool.List[0].ActivityStart startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd endTime := pool.List[0].ActivityEnd
/* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位）
timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime) timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime) endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()

4
worldsrv/taskmgr.go
View File

@ -351,10 +351,6 @@ func IsTaskReward(p *Player, id int32) bool {
} }
startTime := pool.List[0].ActivityStart startTime := pool.List[0].ActivityStart
endTime := pool.List[0].ActivityEnd endTime := pool.List[0].ActivityEnd
/* start, _ := time.Parse(time.DateTime, startTime)
timestamp := start.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime) timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime) endTimestamp := common.StrTimeToTs(endTime)
if timestamp > 0 { if timestamp > 0 {