123

bin/client_msg/common.proto

@@ -184,5 +184,5 @@ message Hello {
 }
 
 message ReqRoomTipsMessage {
-  string message = 1;
+  string msg = 1;
 }

src/server/game/room/room.go

@@ -74,22 +74,6 @@ func (p *Player) GetUserId() string {
 	return p.Id
 }
 
-// 获取玩家的昵称
-func (p *Player) GetNickname() string {
-	if userData, ok := p.UserData.(struct{ Nickname string }); ok {
-		return userData.Nickname
-	}
-	return ""
-}
-
-// 获取玩家的头像
-func (p *Player) GetAvatar() string {
-	if userData, ok := p.UserData.(struct{ Head_Image string }); ok {
-		return userData.Head_Image
-	}
-	return ""
-}
-
 func (r *Room) AddPlayer(p *Player) {
 	r.Players = append(r.Players, p)
 }

src/server/game/teen/buildRoom.go

@@ -20,8 +20,10 @@ func buildRoom(teenPattiRoom *room.Room) *msg.ReqRoom {
 func convertToMsgPlayerList(players []*room.Player) []*msg.ReqPlayer {
 	msgPlayers := make([]*msg.ReqPlayer, len(players))
 	for i, player := range players {
-		nickname := player.GetNickname()
-		avatar := player.GetAvatar()
+		nickname := GetNickname(player)
+		avatar := GetAvatar(player)
+		log.Debug("nickname: %s", nickname)
+		log.Debug("avatar: %s", avatar)
 		msgPlayers[i] = &msg.ReqPlayer{
 			Id: player.Id,
 			// HandCards: convertToMsgCardList(player.HandCards),

src/server/game/teen/event.go

@@ -60,3 +60,15 @@ func handleEvents() {
 		}
 	}
 }
+
+// 获取玩家的昵称
+func GetNickname(p *room.Player) string {
+	userData := p.UserData.(*user.UserData)
+	return userData.Nickname
+}
+
+// 获取玩家的头像
+func GetAvatar(p *room.Player) string {
+	userData := p.UserData.(*user.UserData)
+	return userData.Head_Image
+}

src/server/game/teen/round.go

@@ -113,7 +113,7 @@ func addPlayerOptTimeout(room *room.Room, player *room.Player, timeout time.Dura
 func recvPlayerOptAction(room *room.Room, sitPos int32, opt *msg.PlayerOpt) {
 	player := room.GetPlayerBySitPos(sitPos)
 	optType := opt.OptType
-	sendRoomDynamicMsg(room, fmt.Sprintf("玩家%s选择了%s", player.GetNickname(), optType.String()))
+	sendRoomDynamicMsg(room, fmt.Sprintf("玩家%s选择了%s", GetNickname(player), optType.String()))
 	log.Debug("recvPlayerOptAction, optType:%v", optType)
 	player.LastOpt = &msg.PlayerOpt{OptType: optType}
 	if optType == msg.PlayerOptType_OPT_SEEN { // 看牌
@@ -178,7 +178,7 @@ func sendResult(r *room.Room, sitPos int32) {
 func sendRoomDynamicMsg(r *room.Room, room_msg string) {
 	for _, player := range r.Players {
 		if player.Agent != nil {
-			player.Agent.WriteMsg(&msg.ReqRoomTipsMessage{Message: room_msg})
+			player.Agent.WriteMsg(&msg.ReqRoomTipsMessage{Msg: room_msg})
 		}
 	}
 }

src/server/game/teen/teen.go

@@ -77,11 +77,12 @@ func createRoom(userId string, roomId string, agent gate.Agent) {
 	userData.Teen_Patti_Room.RemoveAllRobot()
 	sitPosList := randomSitPos(userData.Teen_Patti_Room, random)
 	for i := 0; i < random; i++ {
+		robotUserData := createRobotUserData()
 		userData.Teen_Patti_Room.Players = append(userData.Teen_Patti_Room.Players, &room.Player{
 			Id:        fmt.Sprintf("%d", i),
 			Agent:     nil,
 			IsRobot:   true,
-			UserData:  createRobotUserData(),
+			UserData:  robotUserData,
 			SitPos:    int32(sitPosList[i]),
 			HandCards: &[]msg.ReqCard{},
 			IsPacked:  false,

src/server/msg/common.pb.go

@@ -1720,7 +1720,7 @@ type ReqRoomTipsMessage struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
+	Msg string `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"`
 }
 
 func (x *ReqRoomTipsMessage) Reset() {
@@ -1755,9 +1755,9 @@ func (*ReqRoomTipsMessage) Descriptor() ([]byte, []int) {
 	return file_common_proto_rawDescGZIP(), []int{26}
 }
 
-func (x *ReqRoomTipsMessage) GetMessage() string {
+func (x *ReqRoomTipsMessage) GetMsg() string {
 	if x != nil {
-		return x.Message
+		return x.Msg
 	}
 	return ""
 }
@@ -1936,19 +1936,18 @@ var file_common_proto_rawDesc = []byte{
 	0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d,
 	0x73, 0x67, 0x22, 0x1b, 0x0a, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e,
 	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x2e, 0x0a, 0x12, 0x52, 0x65, 0x71, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x69, 0x70, 0x73, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a,
-	0x84, 0x01, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12,
-	0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x53, 0x45, 0x45, 0x4e, 0x10, 0x01, 0x12, 0x0e, 0x0a,
-	0x0a, 0x4f, 0x50, 0x54, 0x5f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0d, 0x0a,
-	0x09, 0x4f, 0x50, 0x54, 0x5f, 0x43, 0x48, 0x41, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08,
-	0x4f, 0x50, 0x54, 0x5f, 0x42, 0x49, 0x4e, 0x44, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
-	0x54, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50,
-	0x54, 0x5f, 0x53, 0x48, 0x4f, 0x57, 0x10, 0x06, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f,
-	0x41, 0x4e, 0x54, 0x45, 0x10, 0x07, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x2f, 0x6d, 0x73, 0x67, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x26, 0x0a, 0x12, 0x52, 0x65, 0x71, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x69, 0x70, 0x73, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x2a, 0x84, 0x01, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79,
+	0x65, 0x72, 0x4f, 0x70, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54,
+	0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x53,
+	0x45, 0x45, 0x4e, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x54, 0x5f, 0x50, 0x41, 0x43,
+	0x4b, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x4f, 0x50, 0x54, 0x5f, 0x43, 0x48, 0x41,
+	0x41, 0x4c, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x42, 0x49, 0x4e, 0x44,
+	0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x54, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54,
+	0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x53, 0x48, 0x4f, 0x57, 0x10, 0x06,
+	0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x5f, 0x41, 0x4e, 0x54, 0x45, 0x10, 0x07, 0x42, 0x07,
+	0x5a, 0x05, 0x2e, 0x2f, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (