From 3307e57b132279e5e2f64b08eb6faeae4417db5b Mon Sep 17 00:00:00 2001 From: hujiebin Date: Fri, 11 Aug 2023 17:42:05 +0800 Subject: [PATCH] uint32(otherId) --- protocol/userProxy.proto | 1 + rpc/user_center_func.go | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/protocol/userProxy.proto b/protocol/userProxy.proto index 0caaf9d..f2ec9ea 100644 --- a/protocol/userProxy.proto +++ b/protocol/userProxy.proto @@ -381,6 +381,7 @@ message SheepMatchSuccess { string token = 6; uint32 agoraId = 7; uint32 provider = 8; + uint32 otherAgoraId = 9; } message SheepGamePlayer { diff --git a/rpc/user_center_func.go b/rpc/user_center_func.go index 26eb81e..419c6e7 100644 --- a/rpc/user_center_func.go +++ b/rpc/user_center_func.go @@ -290,16 +290,17 @@ func SendSheepMatchSuccess(matchId, myUserId, otherUserId uint64, nick1, nick2, } // 羊羊匹配成功 -func SendSheepMatchSuccessV2(matchId, myUserId, otherUserId uint64, nick1, nick2, avatar1, avatar2 string, gameId uint64, channelId, token string, agoraId uint32, provider int) error { +func SendSheepMatchSuccessV2(matchId, myUserId, otherUserId uint64, nick1, nick2, avatar1, avatar2 string, gameId uint64, channelId, token string, agoraId, otherAgoraId uint32, provider int) error { msg := &userProxy.SheepMatchSuccess{ - MatchId: matchId, - User: &userProxy.User{Id: myUserId, Nick: nick1, Avatar: avatar1}, - OtherUser: &userProxy.User{Id: otherUserId, Nick: nick2, Avatar: avatar2}, - GameId: gameId, - ChannelId: channelId, - Token: token, - AgoraId: agoraId, - Provider: uint32(provider), + MatchId: matchId, + User: &userProxy.User{Id: myUserId, Nick: nick1, Avatar: avatar1}, + OtherUser: &userProxy.User{Id: otherUserId, Nick: nick2, Avatar: avatar2}, + GameId: gameId, + ChannelId: channelId, + Token: token, + AgoraId: agoraId, + OtherAgoraId: otherAgoraId, + Provider: uint32(provider), } if buffer, err := proto.Marshal(msg); err == nil { userIds := []uint64{myUserId} -- 2.22.0