From fd4ab739bf65c15baade6c1afb6d8d2c61cf604b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 2 Mar 2026 17:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/gm_handler.go  |  6 +++---
 src/server/game/player_back.go |  6 +++---
 src/server/test/friend_test.go | 10 ++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index 28118ae7..e862356d 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -409,13 +409,13 @@ func ReqGmCommand_(player *Player, Command string) error {
 	case "resetFriend":
 		FriendMod := player.PlayMod.getFriendMod()
 		FriendMod.FriendList = make(map[int]struct{})
-		FriendMod.ApplyList = make(map[int]int64)
+		FriendMod.NewApplyList = make(map[int]*friend.ApplyInfo)
 		FriendMod.Card = make(map[string]*card.CardInfo)
 		FriendMod.SendApply = make(map[int]int64)
 		FriendMod.NewFriendList = make(map[int]*friend.FriendInfo)
-		FriendMod.Npc = []int{}
+		FriendMod.Npc = nil
 		FriendMod.Id = 0
-		FriendMod.Log = make([]*friend.LogInfo, 0)
+		FriendMod.Log = nil
 		FriendMod.InitData()
 		player.FriendListBackData()
 		player.FriendLogBackData()
diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go
index 8698f8da..52bc4d53 100644
--- a/src/server/game/player_back.go
+++ b/src/server/game/player_back.go
@@ -346,13 +346,13 @@ func (p *Player) FriendListBackData() {
 
 func (p *Player) FriendApplyBackData() {
 	FriendMod := p.PlayMod.getFriendMod()
-	al := make([]*proto.ResFriendApplyInfo, 0, len(FriendMod.ApplyList))
-	for k, v := range FriendMod.ApplyList {
+	al := make([]*proto.ResFriendApplyInfo, 0, len(FriendMod.NewApplyList))
+	for k, v := range FriendMod.NewApplyList {
 		ps := G_GameLogicPtr.GetResSimplePlayerByUid(k)
 		if ps != nil {
 			al = append(al, &proto.ResFriendApplyInfo{
 				Player: ps,
-				Time:   int32(v),
+				Time:   int32(v.Time),
 			})
 		}
 	}
diff --git a/src/server/test/friend_test.go b/src/server/test/friend_test.go
index 0fd36df3..68d44ac2 100644
--- a/src/server/test/friend_test.go
+++ b/src/server/test/friend_test.go
@@ -13,3 +13,13 @@ func TestFriendInit(t *testing.T) {
 		t.Error("FriendMod init failed")
 	}
 }
+
+func TestFriendApply(t *testing.T) {
+	p1 := new(game.Player)
+	p1.InitPlayer("3625212")
+	FriendMod := p1.GetFriendMod()
+	FriendMod.AddFriendApply(100002, 0)
+	if !FriendMod.CheckApply(100002) {
+		t.Error("FriendMod AddFriendApply failed")
+	}
+}