From cab256396e50e19a1bc4bdb52df5374b83217f03 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Thu, 6 Feb 2025 11:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=85=BD=E6=B4=BB=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/action_nian.go | 44 +++++++++++++++++++++-------------------- worldsrv/rankmatch.go | 12 ++++++----- worldsrv/taskmgr.go | 20 +++++++++++-------- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/worldsrv/action_nian.go b/worldsrv/action_nian.go index cb1c7b6..73b9b78 100644 --- a/worldsrv/action_nian.go +++ b/worldsrv/action_nian.go @@ -37,12 +37,8 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er } startTime := pool.List[0].ActivityStart 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) + endTimestamp := common.StrTimeToTs(endTime) if p.WelfData.NianData != nil && (p.WelfData.NianData.ActivityStartTime != timestamp || p.WelfData.NianData.ActivityEndTime != endTimestamp) { logger.Logger.Infof("CSNianData 年兽活动时间变更 清除之前数据 snid= %d", p.SnId) WelfareMgrSington.ClearActivityNianData(p) @@ -228,11 +224,13 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) //判断活动时间 startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - t, _ := time.Parse(time.DateTime, startTime) - // 转换为时间戳（以秒为单位） - timestamp := t.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* t, _ := time.Parse(time.DateTime, startTime) + // 转换为时间戳（以秒为单位） + timestamp := t.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) nowTime := time.Now().Unix() if nowTime < timestamp || nowTime > endTimestamp { return nil @@ -677,11 +675,13 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6 //判断活动时间 startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - t, _ := time.Parse(time.DateTime, startTime) - // 转换为时间戳（以秒为单位） - timestamp := t.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* t, _ := time.Parse(time.DateTime, startTime) + // 转换为时间戳（以秒为单位） + timestamp := t.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) nowTime := time.Now().Unix() if nowTime < timestamp || nowTime > endTimestamp { return nil @@ -792,11 +792,13 @@ func CSNianChange(s *netlib.Session, packetid int, data interface{}, sid int64) //判断活动时间 startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - t, _ := time.Parse(time.DateTime, startTime) - // 转换为时间戳（以秒为单位） - timestamp := t.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* t, _ := time.Parse(time.DateTime, startTime) + // 转换为时间戳（以秒为单位） + timestamp := t.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) nowTime := time.Now().Unix() if nowTime < timestamp || nowTime > endTimestamp { return nil diff --git a/worldsrv/rankmatch.go b/worldsrv/rankmatch.go index 351d577..274874b 100644 --- a/worldsrv/rankmatch.go +++ b/worldsrv/rankmatch.go @@ -952,11 +952,13 @@ func (r *RankMatchMgr) NianRankAward() { } startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - t, _ := time.Parse(time.DateTime, startTime) - // 转换为时间戳（以秒为单位） - timestamp := t.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* t, _ := time.Parse(time.DateTime, startTime) + // 转换为时间戳（以秒为单位） + timestamp := t.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) nowTime := time.Now().Unix() if nowTime < timestamp || nowTime-86400 > endTimestamp { return diff --git a/worldsrv/taskmgr.go b/worldsrv/taskmgr.go index ec6089c..9f95ed0 100644 --- a/worldsrv/taskmgr.go +++ b/worldsrv/taskmgr.go @@ -209,10 +209,12 @@ func (t *TaskHandle) AllTask(id int, data any) { } startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - start, _ := time.Parse(time.DateTime, startTime) - timestamp := start.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* start, _ := time.Parse(time.DateTime, startTime) + timestamp := start.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) if now.Unix() < timestamp || now.Unix() > endTimestamp { continue } @@ -349,10 +351,12 @@ func IsTaskReward(p *Player, id int32) bool { } startTime := pool.List[0].ActivityStart endTime := pool.List[0].ActivityEnd - start, _ := time.Parse(time.DateTime, startTime) - timestamp := start.Unix() - end, _ := time.Parse(time.DateTime, endTime) - endTimestamp := end.Unix() + /* start, _ := time.Parse(time.DateTime, startTime) + timestamp := start.Unix() + end, _ := time.Parse(time.DateTime, endTime) + endTimestamp := end.Unix()*/ + timestamp := common.StrTimeToTs(startTime) + endTimestamp := common.StrTimeToTs(endTime) if timestamp > 0 { return data.Ts >= timestamp && data.Ts < endTimestamp }