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 11:14:01 +08:00
parent bca8f3ff22
commit cab256396e
3 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
worldsrv/action_nian.go
View File

@ -37,12 +37,8 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er
} }
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 := common.StrTimeToTs(startTime)
// 转换为时间戳（以秒为单位） endTimestamp := common.StrTimeToTs(endTime)
timestamp := start.Unix()
end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix()
if p.WelfData.NianData != nil && (p.WelfData.NianData.ActivityStartTime != timestamp || p.WelfData.NianData.ActivityEndTime != endTimestamp) { if p.WelfData.NianData != nil && (p.WelfData.NianData.ActivityStartTime != timestamp || p.WelfData.NianData.ActivityEndTime != endTimestamp) {
logger.Logger.Infof("CSNianData 年兽活动时间变更 清除之前数据 snid= %d", p.SnId) logger.Logger.Infof("CSNianData 年兽活动时间变更 清除之前数据 snid= %d", p.SnId)
WelfareMgrSington.ClearActivityNianData(p) WelfareMgrSington.ClearActivityNianData(p)
@ -228,11 +224,13 @@ 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) /* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位） // 转换为时间戳（以秒为单位）
timestamp := t.Unix() timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
if nowTime < timestamp || nowTime > endTimestamp { if nowTime < timestamp || nowTime > endTimestamp {
return nil return nil
@ -677,11 +675,13 @@ 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) /* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位） // 转换为时间戳（以秒为单位）
timestamp := t.Unix() timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
if nowTime < timestamp || nowTime > endTimestamp { if nowTime < timestamp || nowTime > endTimestamp {
return nil return nil
@ -792,11 +792,13 @@ 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) /* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位） // 转换为时间戳（以秒为单位）
timestamp := t.Unix() timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
if nowTime < timestamp || nowTime > endTimestamp { if nowTime < timestamp || nowTime > endTimestamp {
return nil return nil

6
worldsrv/rankmatch.go
View File

@ -952,11 +952,13 @@ 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) /* t, _ := time.Parse(time.DateTime, startTime)
// 转换为时间戳（以秒为单位） // 转换为时间戳（以秒为单位）
timestamp := t.Unix() timestamp := t.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
nowTime := time.Now().Unix() nowTime := time.Now().Unix()
if nowTime < timestamp || nowTime-86400 > endTimestamp { if nowTime < timestamp || nowTime-86400 > endTimestamp {
return return

12
worldsrv/taskmgr.go
View File

@ -209,10 +209,12 @@ func (t *TaskHandle) AllTask(id int, data any) {
} }
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) /* start, _ := time.Parse(time.DateTime, startTime)
timestamp := start.Unix() timestamp := start.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
if now.Unix() < timestamp || now.Unix() > endTimestamp { if now.Unix() < timestamp || now.Unix() > endTimestamp {
continue continue
} }
@ -349,10 +351,12 @@ 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) /* start, _ := time.Parse(time.DateTime, startTime)
timestamp := start.Unix() timestamp := start.Unix()
end, _ := time.Parse(time.DateTime, endTime) end, _ := time.Parse(time.DateTime, endTime)
endTimestamp := end.Unix() endTimestamp := end.Unix()*/
timestamp := common.StrTimeToTs(startTime)
endTimestamp := common.StrTimeToTs(endTime)
if timestamp > 0 { if timestamp > 0 {
return data.Ts >= timestamp && data.Ts < endTimestamp return data.Ts >= timestamp && data.Ts < endTimestamp
} }