feat:机器人昵称和头像

王家文
1 parent 13d06609
Showing 4 changed files with 38 additions and 6 deletions Show diff stats
service-common/svcommon/simulate.go
service/roomrank/dto-room.go
service/roomrank/player.go
service/roomrank/room.go
@@ -52,6 +52,28 @@ func GetAvatar(gameId string) string {
 	return "lisi_icon"
 }
+func GetIndexAvatars(gameId string, amount int) []int {
+	list := make([]int, 0)
+	config, err := confglobal.GetConfig(gameId)
+	if err == nil {
+		count := len(config.Avatars)
+		if count > 0 {
+			return zmisc.RandomMultiple(amount, 0, count)
+		}
+	}
+	return list
+}
+
+func GetIndexAvatar(gameId string, index int) string {
+	config, err := confglobal.GetConfig(gameId)
+	if err == nil {
+		if len(config.Avatars) > index {
+			return config.Avatars[index]
+		}
+	}
+	return "lisi_icon"
+}
+
 // GetAvatarPath 随机模拟玩家头像路径
 func GetAvatarPath(gameId string) string {
 	config, err := confglobal.GetConfig(gameId)
@@ -50,8 +50,9 @@ type RoomPlayer struct {
 // RoomDetails 详情
 type RoomDetails struct {
-	Players    []*RoomPlayer // 房间玩家列表
-	IndexNames []int         // 房间玩家名字列表
+	Players      []*RoomPlayer // 房间玩家列表
+	IndexNames   []int         // 房间玩家名字列表
+	IndexAvatars []int         // 房间玩家头像列表
 }
 // Encode 打包数据
@@ -67,8 +68,9 @@ func (d *Room) Encode() {
 // Decode 分包数据
 func (d *Room) Decode() {
 	d.Details = &RoomDetails{
-		Players:    make([]*RoomPlayer, 0),
-		IndexNames: make([]int, 0),
+		Players:      make([]*RoomPlayer, 0),
+		IndexNames:   make([]int, 0),
+		IndexAvatars: make([]int, 0),
 	}
 	err := json.Unmarshal([]byte(d.DetailsText), d.Details)
 	if err != nil {
@@ -50,7 +50,7 @@ func NewRoomRobot(gameId string, room *Room, robotConfigId int, userType int) *R
 		//Uid:           rand.Int63(),
 		//Uid: int64(utuuid.GetUint32()),
 		//Name:          svcommon.GetName(gameId),
-		Icon:          svcommon.GetAvatar(gameId),
+		//Icon:          svcommon.GetAvatar(gameId),
 		Score:         0,
 		JoinTime:      lxtime.NowUninx(),
 		UserType:      userType,
@@ -62,7 +62,13 @@ func NewRoomRobot(gameId string, room *Room, robotConfigId int, userType int) *R
 	} else {
 		d.Name = svcommon.GetName(gameId)
 	}
-	d.Uid = 9900_0000 + int64(len(room.Details.Players))
+	if len(room.Details.IndexAvatars) > 0 {
+		d.Icon = svcommon.GetIndexAvatar(gameId, room.Details.IndexAvatars[0])
+		room.Details.IndexAvatars = room.Details.IndexAvatars[1:]
+	} else {
+		d.Icon = svcommon.GetAvatar(gameId)
+	}
+	d.Uid = int64(len(room.Details.Players))
 	return d
 }
@@ -61,6 +61,7 @@ func CreateRoom(gameId string, topType int, config *confroomrank.ActivityConfig,
 	details := new(RoomDetails)
 	details.Players = make([]*RoomPlayer, 0)
 	details.IndexNames = make([]int, 0)
+	details.IndexAvatars = make([]int, 0)
 	room.Details = details
 	err := svmysql.Save(room, gameId)
@@ -148,6 +149,7 @@ func TryFindRoom(gameId string, topType int, player *Player, config *confroomran
 			room = roomCreate
 			room.Details.IndexNames = svcommon.GetIndexNames(gameId, roomConfig.TotalPlayer)
+			room.Details.IndexAvatars = svcommon.GetIndexAvatars(gameId, roomConfig.TotalPlayer)
 			// 配置原生机器人
 			JoinInitRobot(gameId, room, roomConfig)
	@@ -52,6 +52,28 @@ func GetAvatar(gameId string) string {		@@ -52,6 +52,28 @@ func GetAvatar(gameId string) string {
52	return "lisi_icon"	52	return "lisi_icon"
53	}	53	}
54		54
		55	+func GetIndexAvatars(gameId string, amount int) []int {
		56	+ list := make([]int, 0)
		57	+ config, err := confglobal.GetConfig(gameId)
		58	+ if err == nil {
		59	+ count := len(config.Avatars)
		60	+ if count > 0 {
		61	+ return zmisc.RandomMultiple(amount, 0, count)
		62	+ }
		63	+ }
		64	+ return list
		65	+}
		66	+
		67	+func GetIndexAvatar(gameId string, index int) string {
		68	+ config, err := confglobal.GetConfig(gameId)
		69	+ if err == nil {
		70	+ if len(config.Avatars) > index {
		71	+ return config.Avatars[index]
		72	+ }
		73	+ }
		74	+ return "lisi_icon"
		75	+}
		76	+
55	// GetAvatarPath 随机模拟玩家头像路径	77	// GetAvatarPath 随机模拟玩家头像路径
56	func GetAvatarPath(gameId string) string {	78	func GetAvatarPath(gameId string) string {
57	config, err := confglobal.GetConfig(gameId)	79	config, err := confglobal.GetConfig(gameId)