refactor: 重构 PVP 匹配逻辑使用模型结构体

common/rpc/user.go

@@ -2,7 +2,10 @@ package rpc
 
 import (
 	"blazing/logic/service/common"
+	"blazing/logic/service/fight/info"
+	"blazing/modules/player/model"
 	"blazing/modules/player/service"
+	"encoding/json"
 	"errors"
 	"strings"
 	"time"
@@ -14,7 +17,7 @@ import (
 
 type RPCfight struct {
 	fightmap *csmap.CsMap[int, common.FightI]
-	zs       *zset.ZSet[uint32, User]
+	zs       *zset.ZSet[uint32, *model.PVP]
 }
 
 // ExtractBetweenBrackets 提取字符串中第一个 [] 中间的文本
@@ -47,44 +50,37 @@ func ExtractBetweenBrackets(s string) (string, bool, error) {
 }
 
 func (r *RPCfight) ADD(s string) {
-	println("收到sun:join:2458", s)
+	println("收到sun:join", s)
+	var pvp info.RPCFightinfo
+	json.Unmarshal([]byte(s), &pvp)
 	t, _, _ := ExtractBetweenBrackets(s)
 	ret := service.NewPVPService(gconv.Uint32(t)).Get(gconv.Uint32(t))
 	score := 1000
-	if ret == nil {
+	if ret != nil {
 		score = int(ret.RankInfo.Score)
 	}
-	r.zs.Add(gconv.Uint32(t), User{ID: gconv.Uint32(t), JoinTime: time.Now().Unix(), Score: score})
+	r.zs.Add(gconv.Uint32(t),
+		ret)
 	if r.zs.Length() > 2 {
-		r.zs.FindPrev(func(i User) bool { return i.Score > score })
-		//找到上一个,如果区间分数少于一定,
-		//直接进行匹配
+		u, s := r.zs.FindPrev(func(i *model.PVP) bool { return i.RankInfo.Score > score })
+
+		diff := s - score
+		// 等待越久，允许区间越大
+		wait := time.Now().Sub(u.RankInfo.LastMatchTime.Time).Seconds()
+		maxAllow := 100 + int(wait)*10
+		if diff < maxAllow {
+			//找到上一个,如果区间分数少于一定,
+			//直接进行匹配
+		}
+
 	}
 }
 
-type User struct {
-	JoinTime int64
-	ID       uint32
-	Score    int
-}
-
-func (u User) Key() uint32 {
-	return uint32(u.ID)
-}
-
-// 如果分数不对的话,就按时间排序
-func (u User) Less(than User) bool {
-	if u.Score == than.Score {
-		return u.JoinTime < than.JoinTime
-	}
-	return u.Score < than.Score
-}
-
 ///定义map,存储用户对战斗容器的映射,便于外部传入时候进行直接操作
 
 var fightmap = RPCfight{
 	fightmap: csmap.New[int, common.FightI](),
-	zs: zset.New[uint32, User](func(a, b User) bool {
+	zs: zset.New[uint32, *model.PVP](func(a, b *model.PVP) bool {
 		return a.Less(b)
 	}),
 }