From e2d18f491bb4f3e4592d5eac466c82bbbc42e2f9 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Wed, 3 Jul 2024 15:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E5=AD=A3=E9=80=9A=E8=A1=8C=E8=AF=81?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbproxy/svc/l_rankplayerpermit.go | 4 ++--
 model/gameparam.go                | 2 +-
 model/rank.go                     | 1 +
 worldsrv/bagmgr.go                | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dbproxy/svc/l_rankplayerpermit.go b/dbproxy/svc/l_rankplayerpermit.go
index 8ee3f51..f963f29 100644
--- a/dbproxy/svc/l_rankplayerpermit.go
+++ b/dbproxy/svc/l_rankplayerpermit.go
@@ -22,7 +22,7 @@ func RankPlayerPermitCollection(plt string) *mongo.Collection {
 		c, first := s.DB().C(RankPlayerPermitCollName)
 		if first {
 			c.EnsureIndex(mgo.Index{Key: []string{"snid"}, Background: true, Sparse: true})
-			c.EnsureIndex(mgo.Index{Key: []string{"startts", "-exp"}, Background: true, Sparse: true})
+			c.EnsureIndex(mgo.Index{Key: []string{"startts", "-exp", "-ts"}, Background: true, Sparse: true})
 		}
 		return c
 	}
@@ -60,7 +60,7 @@ func (svc *RankPlayerPermitSvc) Find(args *model.FindPlayerPermitListArgs, ret *
 		return RankPlayerPermitColError
 	}
 
-	err := fc.Find(bson.M{"startts": args.StartTs}).Sort("-exp").Limit(int(model.GameParamData.RankPlayerPermitMaxNum)).All(&ret.List)
+	err := fc.Find(bson.M{"startts": args.StartTs}).Sort("-exp", "-ts").Limit(int(model.GameParamData.RankPlayerPermitMaxNum)).All(&ret.List)
 	if err != nil && !errors.Is(err, mgo.ErrNotFound) {
 		logger.Logger.Error("QueryPermit is err: ", err)
 		return err
diff --git a/model/gameparam.go b/model/gameparam.go
index 2bcf0bd..52a944b 100644
--- a/model/gameparam.go
+++ b/model/gameparam.go
@@ -207,6 +207,6 @@ func InitGameParam() {
 		GameParamData.BackendTimeLocal = 8
 	}
 	if GameParamData.RankPlayerPermitMaxNum == 0 {
-		GameParamData.RankPlayerPermitMaxNum = 100
+		GameParamData.RankPlayerPermitMaxNum = 20
 	}
 }
diff --git a/model/rank.go b/model/rank.go
index f568778..e4d910e 100644
--- a/model/rank.go
+++ b/model/rank.go
@@ -285,6 +285,7 @@ type PermitScore struct {
 	Exp      int64
 	ModId    int32 //头像
 	StartTs  int64 // 赛季开始时间戳
+	Ts       int64
 }
 
 type FindPlayerPermitListArgs struct {
diff --git a/worldsrv/bagmgr.go b/worldsrv/bagmgr.go
index 20c6fe0..10620a1 100644
--- a/worldsrv/bagmgr.go
+++ b/worldsrv/bagmgr.go
@@ -312,6 +312,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
 					Exp:      item.ItemNum,
 					ModId:    p.Roles.ModId,
 					StartTs:  startTs,
+					Ts:       time.Now().Unix(),
 				})
 				// 参与赛季通行证活动
 				if longItem == nil || longItem.ItemNum == 0 {