From e5c7e05cb56baaaa7461dfaa1f82d00fd466c979 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 10 Jul 2023 21:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E5=AD=A3=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/viking/module.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/viking/module.go b/modules/viking/module.go
index f6e0c5294..6cc725cd2 100644
--- a/modules/viking/module.go
+++ b/modules/viking/module.go
@@ -83,7 +83,7 @@ func (this *Viking) Start() (err error) {
 	}
 
 	this.battle = module.(comm.IBattle)
-
+	this.CheckCurSeasonData()
 	return
 }
 
@@ -234,11 +234,13 @@ func (this *Viking) CompleteAllLevel(session comm.IUserSession) (errdata *pb.Err
 
 // 检查当前赛季是在本服还是在跨服
 func (this *Viking) CheckCurSeasonData() (bLocal bool, endSeasonTime int64) {
+	var subTime int64
+	var oneSeason int64
 	openTime := this.service.GetOpentime().Unix()
 	this.Debugf("%d", openTime)
 	// 获取第一个赛季结束的时间
-	endSeasonTime = utils.GetTodayZeroTime(openTime) //+ int64((6-d)*3600*24)
-	this.Debugf("%d", endSeasonTime)
+	oneSeason = utils.GetTodayZeroTime(openTime) //+ int64((6-d)*3600*24)
+	this.Debugf("%d", oneSeason)
 
 	var c int32
 	if Continued%Cycle == 0 {
@@ -247,11 +249,18 @@ func (this *Viking) CheckCurSeasonData() (bLocal bool, endSeasonTime int64) {
 		c = Continued/Cycle + 1
 	}
 
+	if configure.Now().Unix() > oneSeason {
+		subTime = configure.Now().Unix() - oneSeason
+		subTime = subTime/(14*3600*24) + 1
+	}
 	// 只需判断当前时间是否大于第c个赛季即可
+	endSeasonTime = oneSeason
 	endSeasonTime += 14 * 3600 * 24 * int64(c)
 	if endSeasonTime <= configure.Now().Unix() {
+		endSeasonTime = oneSeason + subTime*14*3600*24
 		return false, endSeasonTime
 	}
+	endSeasonTime = oneSeason + subTime*14*3600*24
 	return true, endSeasonTime
 }