123

bin/client_msg/common.proto

@@ -291,19 +291,22 @@ message BuyShopItem{
   string id = 1;
 }
 
+//好友请求的结构
 message RequestAddFriendItem{
   int32 id = 1;
-  string RequestID = 2;
+  string RequestID = 2; //请求id
   string FromUserID = 3;
   string ToUserID = 4;
-  int32 Status = 5;
+  int32 Status = 5; //状态
   string Message = 6;
 }
 
+//请求好友列表
 message ReqFriendList{
   string user_id = 1;
 }
 
+//响应好友列表请求，暂时没做分页
 message ResFriendList{
   bool success = 1;
   MsgError err_msg = 2;
@@ -311,28 +314,35 @@ message ResFriendList{
 }
 
 
+//请求添加好友
 message ReqAddFriend{
   string ToUserID = 1;
   string msg = 2;
 }
 
+//客户端接收到请求消息
 message RecvAddFriendRequest{
   UserInfo info = 1;
 }
 
+//接收到的玩家对消息进行操作
 message OptAddFriendRequest{
   RequestAddFriendItem info = 1;
 }
 
+
+//通知请求的玩家，对方的操作结果
 message NotifyOptFriend{
   RequestAddFriendItem info = 1;
 }
 
 
+//根据玩家id搜索玩家
 message SearchUser{
   string user_id = 1;
 }
 
+//响应搜索结果
 message ResSearchUser{
   bool success = 1;
   MsgError err_msg = 2;

src/server/hall/friends/friends.go

@@ -57,22 +57,22 @@ func GetFriendsListByUserId(args []interface{}) {
 func AddFriendrRquest(args []interface{}) {
 	m := args[0].(*msg.ReqAddFriend)
 	a := args[1].(gate.Agent)
-	FromUserID := a.UserData().(*msg.UserInfo).UserId
+	FromUserInfo := a.UserData().(*msg.UserInfo)
+	FromUserID := FromUserInfo.UserId
 	ToUserID := m.ToUserID
 	requestaddfriend.CreateFriendRequest(FromUserID, ToUserID, m.Msg)
-	NotifyFriendAddFriend(ToUserID)
+	NotifyFriendAddFriend(ToUserID, FromUserInfo)
 }
 
 // 通知添加好友请求
-func NotifyFriendAddFriend(ToUserID string) {
+func NotifyFriendAddFriend(ToUserID string, FromUserID *msg.UserInfo) {
 	ag := agentmanager.GetAgentByUserID(ToUserID)
 	if ag != nil {
-		ToUserInfo := ag.UserData().(*msg.UserInfo)
 		ag.WriteMsg(&msg.RecvAddFriendRequest{
 			Info: &msg.UserInfo{
-				MHead:  ToUserInfo.MHead,
-				Name:   ToUserInfo.Name,
-				UserId: ToUserInfo.UserId,
+				MHead:  FromUserID.MHead,
+				Name:   FromUserID.Name,
+				UserId: FromUserID.UserId,
 			},
 		})
 	}