Commit 44dad9cf4f011a340a801651c22d425339baa8a9
1 parent
f7c751ed
Exists in
master
and in
1 other branch
feat✨:机器人增加额外标识
Showing
3 changed files
with
17 additions
and
11 deletions
Show diff stats
models/roomrank.go
| @@ -13,12 +13,13 @@ type RspRoomRankGetConfig struct { | @@ -13,12 +13,13 @@ type RspRoomRankGetConfig struct { | ||
| 13 | 13 | ||
| 14 | // RoomRankTopNode 排行玩家 | 14 | // RoomRankTopNode 排行玩家 |
| 15 | type RoomRankTopNode struct { | 15 | type RoomRankTopNode struct { |
| 16 | - Rank int `form:"rank" json:"rank"` // 排名 | ||
| 17 | - Uid int64 `form:"uid" json:"uid"` // 玩家唯一ID | ||
| 18 | - Score int64 `form:"score" json:"score"` // 玩家排行分数 | ||
| 19 | - Name string `form:"name" json:"name"` // 名字 | ||
| 20 | - Icon string `form:"icon" json:"icon"` // 头像 | ||
| 21 | - Award string `form:"award" json:"award"` // 排名奖励内容 | 16 | + Rank int `form:"rank" json:"rank"` // 排名 |
| 17 | + Uid int64 `form:"uid" json:"uid"` // 玩家唯一ID | ||
| 18 | + Score int64 `form:"score" json:"score"` // 玩家排行分数 | ||
| 19 | + Name string `form:"name" json:"name"` // 名字 | ||
| 20 | + Icon string `form:"icon" json:"icon"` // 头像 | ||
| 21 | + Award string `form:"award" json:"award"` // 排名奖励内容 | ||
| 22 | + IsRobot bool `form:"is_robot" json:"is_robot"` // 是否机器人 | ||
| 22 | } | 23 | } |
| 23 | 24 | ||
| 24 | // RoomRankInfo 房间排行信息 | 25 | // RoomRankInfo 房间排行信息 |
service/roomrank/dto-room.go
| @@ -120,3 +120,7 @@ func (d *RoomDetails) Less(i, j int) bool { | @@ -120,3 +120,7 @@ func (d *RoomDetails) Less(i, j int) bool { | ||
| 120 | func (d *RoomDetails) Swap(i, j int) { | 120 | func (d *RoomDetails) Swap(i, j int) { |
| 121 | d.Players[i], d.Players[j] = d.Players[j], d.Players[i] | 121 | d.Players[i], d.Players[j] = d.Players[j], d.Players[i] |
| 122 | } | 122 | } |
| 123 | + | ||
| 124 | +func (d *RoomPlayer) IsRobot() bool { | ||
| 125 | + return d.RobotConfigId != 0 | ||
| 126 | +} |
service/roomrank/player.go
| @@ -95,11 +95,12 @@ func GetInfoFromRoom(gameId string, player *Player, room *Room, config *confroom | @@ -95,11 +95,12 @@ func GetInfoFromRoom(gameId string, player *Player, room *Room, config *confroom | ||
| 95 | p := room.Details.Players[i] | 95 | p := room.Details.Players[i] |
| 96 | rank := i + 1 | 96 | rank := i + 1 |
| 97 | node := models.RoomRankTopNode{ | 97 | node := models.RoomRankTopNode{ |
| 98 | - Rank: rank, | ||
| 99 | - Uid: p.Uid, | ||
| 100 | - Score: p.Score, | ||
| 101 | - Name: p.Name, | ||
| 102 | - Icon: p.Icon, | 98 | + Rank: rank, |
| 99 | + Uid: p.Uid, | ||
| 100 | + Score: p.Score, | ||
| 101 | + Name: p.Name, | ||
| 102 | + Icon: p.Icon, | ||
| 103 | + IsRobot: p.IsRobot(), | ||
| 103 | } | 104 | } |
| 104 | if confRoom, hasConfRoom := config.Room[room.ConfigId]; hasConfRoom { | 105 | if confRoom, hasConfRoom := config.Room[room.ConfigId]; hasConfRoom { |
| 105 | if confAward, hasConfAward := confRoom.Awards[utstring.IntToString(rank)]; hasConfAward { | 106 | if confAward, hasConfAward := confRoom.Awards[utstring.IntToString(rank)]; hasConfAward { |