From 44dad9cf4f011a340a801651c22d425339baa8a9 Mon Sep 17 00:00:00 2001 From: 王家文 Date: Tue, 30 Apr 2024 00:43:02 +0800 Subject: [PATCH] feat✨:机器人增加额外标识 --- models/roomrank.go | 13 +++++++------ service/roomrank/dto-room.go | 4 ++++ service/roomrank/player.go | 11 ++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/models/roomrank.go b/models/roomrank.go index 233d0b0..9619ede 100644 --- a/models/roomrank.go +++ b/models/roomrank.go @@ -13,12 +13,13 @@ type RspRoomRankGetConfig struct { // RoomRankTopNode 排行玩家 type RoomRankTopNode struct { - Rank int `form:"rank" json:"rank"` // 排名 - Uid int64 `form:"uid" json:"uid"` // 玩家唯一ID - Score int64 `form:"score" json:"score"` // 玩家排行分数 - Name string `form:"name" json:"name"` // 名字 - Icon string `form:"icon" json:"icon"` // 头像 - Award string `form:"award" json:"award"` // 排名奖励内容 + Rank int `form:"rank" json:"rank"` // 排名 + Uid int64 `form:"uid" json:"uid"` // 玩家唯一ID + Score int64 `form:"score" json:"score"` // 玩家排行分数 + Name string `form:"name" json:"name"` // 名字 + Icon string `form:"icon" json:"icon"` // 头像 + Award string `form:"award" json:"award"` // 排名奖励内容 + IsRobot bool `form:"is_robot" json:"is_robot"` // 是否机器人 } // RoomRankInfo 房间排行信息 diff --git a/service/roomrank/dto-room.go b/service/roomrank/dto-room.go index 13457ea..4803611 100644 --- a/service/roomrank/dto-room.go +++ b/service/roomrank/dto-room.go @@ -120,3 +120,7 @@ func (d *RoomDetails) Less(i, j int) bool { func (d *RoomDetails) Swap(i, j int) { d.Players[i], d.Players[j] = d.Players[j], d.Players[i] } + +func (d *RoomPlayer) IsRobot() bool { + return d.RobotConfigId != 0 +} diff --git a/service/roomrank/player.go b/service/roomrank/player.go index 597639e..a210342 100644 --- a/service/roomrank/player.go +++ b/service/roomrank/player.go @@ -95,11 +95,12 @@ func GetInfoFromRoom(gameId string, player *Player, room *Room, config *confroom p := room.Details.Players[i] rank := i + 1 node := models.RoomRankTopNode{ - Rank: rank, - Uid: p.Uid, - Score: p.Score, - Name: p.Name, - Icon: p.Icon, + Rank: rank, + Uid: p.Uid, + Score: p.Score, + Name: p.Name, + Icon: p.Icon, + IsRobot: p.IsRobot(), } if confRoom, hasConfRoom := config.Room[room.ConfigId]; hasConfRoom { if confAward, hasConfAward := confRoom.Awards[utstring.IntToString(rank)]; hasConfAward { -- libgit2 0.21.0