feat:调整

protocol/userProxy.proto

@@ -369,8 +369,8 @@ message GlobalGameBanner {
 /* id == 147 羊羊匹配成功 */
 message SheepMatchSuccess {
     uint64 match_id = 1;
-    User userId1 = 2;
-    User userId2 = 3;
+    User user = 2;
+    User otherUser = 3;
 }
 
 message  SheepGamePlayer {

rpc/user_center_func.go

@@ -219,19 +219,19 @@ func SendGroupChatNotice(fromUserId uint64, userIds []uint64, senderExtId string
 }
 
 // 羊羊匹配成功
-func SendSheepMatchSuccess(matchId, userId1, userId2 uint64, nick1, nick2, avatar1, avatar2 string) error {
+func SendSheepMatchSuccess(matchId, myUserId, otherUserId uint64, nick1, nick2, avatar1, avatar2 string) error {
 	msg := &userProxy.SheepMatchSuccess{
 		MatchId:   matchId,
-		UserId1: &userProxy.User{Id: userId1, Nick: nick1, Avatar: avatar1},
-		UserId2: &userProxy.User{Id: userId2, Nick: nick2, Avatar: avatar2},
+		User:      &userProxy.User{Id: myUserId, Nick: nick1, Avatar: avatar1},
+		OtherUser: &userProxy.User{Id: otherUserId, Nick: nick2, Avatar: avatar2},
 	}
 	if buffer, err := proto.Marshal(msg); err == nil {
 		var userIds []uint64
-		if userId1 > 0 {
-			userIds = append(userIds, userId1)
+		if myUserId > 0 {
+			userIds = append(userIds, myUserId)
 		}
-		if userId2 > 0 {
-			userIds = append(userIds, userId2)
+		if otherUserId > 0 {
+			userIds = append(userIds, otherUserId)
 		}
 		rspUids, err := multicast(userIds, MsgTypeSheepGameMatchSuccess, buffer)