From 4972439ad6b1768df743a85da6087c01b7eb2011 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 3 Jul 2025 18:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/server.json            |  2 +-
 src/server/game/FriendMgr.go           |  3 +++
 src/server/game/PlayerFunc.go          |  1 +
 src/server/game/RegisterNetworkFunc.go | 27 +++++++++++++++++---------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/server/conf/server.json b/src/server/conf/server.json
index 4e2d8c8e..fdb1d766 100644
--- a/src/server/conf/server.json
+++ b/src/server/conf/server.json
@@ -2,7 +2,7 @@
 	"AppID": 1,
 	"LogLevel": "debug", 
 	"LogPath": "./log",
-	"TCPAddr": ":3605",
+	"TCPAddr": ":3601",
 	"WSAddr": ":3566",
 	"MySqlAddr": "127.0.0.1",
 	"MySqlPort": "3306",
diff --git a/src/server/game/FriendMgr.go b/src/server/game/FriendMgr.go
index 81205d3a..25276251 100644
--- a/src/server/game/FriendMgr.go
+++ b/src/server/game/FriendMgr.go
@@ -178,6 +178,9 @@ func sendToPlayerOnline(m *msg.Msg) error {
 }
 
 func FriendMgrSend(m1 *msg.Msg) error {
+	if m1.SendT == 0 {
+		m1.SendT = GoUtil.Now()
+	}
 	m := m1.Clone()
 	ToServer := GoUtil.GetServerIdByUid(m.To)
 	if ToServer != conf.Server.ServerID {
diff --git a/src/server/game/PlayerFunc.go b/src/server/game/PlayerFunc.go
index 0caf4a78..f588187b 100644
--- a/src/server/game/PlayerFunc.go
+++ b/src/server/game/PlayerFunc.go
@@ -863,6 +863,7 @@ func NotifyChampshipResult(Uid, Rank int) {
 			Type:  msg.HANDLE_TYPE_CHAMPSHIP_RESULT,
 			From:  Uid,
 			To:    v,
+			SendT: GoUtil.Now(),
 			Extra: []int{Rank, GoUtil.GetServerOpenDay()},
 		}
 		FriendMgrSend(Msg)
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index d57fb7db..6cec85d0 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -1912,6 +1912,7 @@ func ReqSelectCardExchange(player *Player, buf []byte) error {
 		Type:  MsqMod.HANDLE_TYPE_SELECT_EX_CARD,
 		From:  int(player.M_DwUin),
 		To:    CardInfo.AUid,
+		SendT: GoUtil.Now(),
 		Extra: *CardInfo,
 	}
 	FriendMgrSend(m)
@@ -1965,6 +1966,7 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error {
 		From:  int(player.M_DwUin),
 		To:    CardInfo.BUid,
 		Extra: *CardInfo,
+		SendT: GoUtil.Now(),
 	}
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
@@ -2004,6 +2006,7 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error {
 		From:  int(player.M_DwUin),
 		To:    CardInfo.AUid,
 		Extra: *CardInfo,
+		SendT: GoUtil.Now(),
 	}
 	FriendMgrSend(m)
 	player.PushClientRes(&msg.ResRefuseCardSelect{
@@ -2049,6 +2052,7 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error {
 		From:  int(player.M_DwUin),
 		To:    CardInfo.BUid,
 		Extra: *CardInfo,
+		SendT: GoUtil.Now(),
 	}
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
@@ -2091,6 +2095,7 @@ func ReqRank(player *Player, buf []byte) error {
 		From:  int(player.M_DwUin),
 		Type:  MsqMod.HANDLE_TYPE_RANK_INFO,
 		Extra: RankMsg{RankType: int(req.Type)},
+		SendT: GoUtil.Now(),
 	}
 	RankInfo := G_GameLogicPtr.RankMgrCall(m).(*RankInfo)
 	res := make(map[int32]*msg.ResPlayerSimple)
@@ -2720,9 +2725,10 @@ func ReqSelfInvited(player *Player, buf []byte) error {
 	req := &msg.ReqSelfInvited{}
 	proto.Unmarshal(buf, req)
 	G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{
-		Type: MsqMod.HANDLE_TYPE_INVITE_FRIEND,
-		From: int(player.M_DwUin),
-		To:   int(req.InviterId),
+		Type:  MsqMod.HANDLE_TYPE_INVITE_FRIEND,
+		From:  int(player.M_DwUin),
+		To:    int(req.InviterId),
+		SendT: GoUtil.Now(),
 	})
 	player.PushClientRes(&msg.ResSelfInvited{
 		ResultCode: 1,
@@ -2780,9 +2786,10 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error {
 		ResultCode: 1,
 	})
 	G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{
-		From: int(player.M_DwUin),
-		To:   Uid,
-		Type: MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND,
+		From:  int(player.M_DwUin),
+		To:    Uid,
+		Type:  MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND,
+		SendT: GoUtil.Now(),
 	})
 	PlayroomMod := player.PlayMod.getPlayroomMod()
 	PlayroomMod.AddRoomPointAdd()
@@ -2819,9 +2826,10 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error {
 		ResultCode: 1,
 	})
 	G_GameLogicPtr.FriendMgrSend(&MsqMod.Msg{
-		From: int(player.M_DwUin),
-		To:   Uid,
-		Type: MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND,
+		From:  int(player.M_DwUin),
+		To:    Uid,
+		Type:  MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND,
+		SendT: GoUtil.Now(),
 	})
 	PlayroomMod := player.PlayMod.getPlayroomMod()
 	PlayroomMod.AddRoomPointAdd()
@@ -3831,6 +3839,7 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error {
 			To:    int(Uid),
 			Type:  MsqMod.HANDLE_TYPE_TREASURE_RESULT,
 			Extra: Items[0].Num,
+			SendT: GoUtil.Now(),
 		})
 	}