feat✨:机器人的ID和名字不重复算法

王家文
1 parent 44dad9cf
Showing 5 changed files with 64 additions and 8 deletions Show diff stats
service-common/svcommon/simulate.go
service/roomrank/dto-room.go
service/roomrank/player.go
service/roomrank/room.go
util/utmisc/random.go
@@ -2,6 +2,7 @@ package svcommon
  
 import (
 	"apigame/configs/confglobal"
+	"apigame/util/utmisc"
 	"math/rand"
 )
  
@@ -17,6 +18,28 @@ func GetName(gameId string) string {
 	return "李四"
 }
  
+func GetIndexNames(gameId string, amount int) []int {
+	list := make([]int, 0)
+	config, err := confglobal.GetConfig(gameId)
+	if err == nil {
+		count := len(config.Names)
+		if count > 0 {
+			return utmisc.RandomMultiple(amount, 0, count)
+		}
+	}
+	return list
+}
+
+func GetIndexName(gameId string, index int) string {
+	config, err := confglobal.GetConfig(gameId)
+	if err == nil {
+		if len(config.Names) > index {
+			return config.Names[index]
+		}
+	}
+	return "李四"
+}
+
 // GetAvatar 随机模拟玩家头像
 func GetAvatar(gameId string) string {
 	config, err := confglobal.GetConfig(gameId)
@@ -48,7 +48,8 @@ type RoomPlayer struct {
  
 // RoomDetails 详情
 type RoomDetails struct {
-	Players []*RoomPlayer // 房间玩家列表
+	Players    []*RoomPlayer // 房间玩家列表
+	IndexNames []int         // 房间玩家名字列表
 }
  
 // Encode 打包数据
@@ -64,7 +65,8 @@ func (d *Room) Encode() {
 // Decode 分包数据
 func (d *Room) Decode() {
 	d.Details = &RoomDetails{
-		Players: make([]*RoomPlayer, 0),
+		Players:    make([]*RoomPlayer, 0),
+		IndexNames: make([]int, 0),
 	}
 	err := json.Unmarshal([]byte(d.DetailsText), d.Details)
 	if err != nil {
@@ -8,7 +8,6 @@ import (
 	"apigame/util/util-lx/lxalilog"
 	"apigame/util/util-lx/lxtime"
 	"apigame/util/utstring"
-	"apigame/util/utuuid"
 )
  
 func tryInitPlayer(gameId string, player *Player) {
@@ -46,17 +45,24 @@ func LoadPlayer(gameId string, playerUid int64, topType int) (player *Player) {
 }
  
 // NewRoomRobot 新建房间机器人
-func NewRoomRobot(gameId string, robotConfigId int, userType int) *RoomPlayer {
+func NewRoomRobot(gameId string, room *Room, robotConfigId int, userType int) *RoomPlayer {
 	d := &RoomPlayer{
 		//Uid:           rand.Int63(),
-		Uid:           int64(utuuid.GetUint32()),
-		Name:          svcommon.GetName(gameId),
+		//Uid: int64(utuuid.GetUint32()),
+		//Name:          svcommon.GetName(gameId),
 		Icon:          svcommon.GetAvatar(gameId),
 		Score:         0,
 		JoinTime:      lxtime.NowUninx(),
 		UserType:      userType,
 		RobotConfigId: robotConfigId,
 	}
+	if len(room.Details.IndexNames) > 0 {
+		d.Name = svcommon.GetIndexName(gameId, room.Details.IndexNames[0])
+		room.Details.IndexNames = room.Details.IndexNames[1:]
+	} else {
+		d.Name = svcommon.GetName(gameId)
+	}
+	d.Uid = 9900_0000 + int64(len(room.Details.Players))
 	return d
 }
  
@@ -2,6 +2,7 @@ package roomrank
  
 import (
 	"apigame/configs/confroomrank"
+	"apigame/service-common/svcommon"
 	"apigame/service-common/svmysql"
 	"apigame/util/util-lx/lxalilog"
 	"apigame/util/util-lx/lxtime"
@@ -58,6 +59,7 @@ func CreateRoom(gameId string, topType int, activityId int64, roomConfigId int) 
 	room.CreateTime = lxtime.NowUninx()
 	details := new(RoomDetails)
 	details.Players = make([]*RoomPlayer, 0)
+	details.IndexNames = make([]int, 0)
 	room.Details = details
  
 	err := svmysql.Save(room, gameId)
@@ -144,6 +146,8 @@ func TryGetRoom(gameId string, topType int, player *Player, config *confroomrank
 		if hasCreate {
 			room = roomCreate
  
+			room.Details.IndexNames = svcommon.GetIndexNames(gameId, roomConfig.TotalPlayer)
+
 			// 配置原生机器人
 			JoinInitRobot(gameId, room, roomConfig)
  
@@ -177,7 +181,7 @@ func TryCloseRoom(gameId string, room *Room, roomConfig confroomrank.RoomConfig)
 			canJoinCount := pair[1] - room.GetPlayerTypeCount(userType)
 			robotConfigId := roomConfig.AutoRobot[i]
 			for i := 0; i < canJoinCount; i++ {
-				roomPlayer := NewRoomRobot(gameId, robotConfigId, userType)
+				roomPlayer := NewRoomRobot(gameId, room, robotConfigId, userType)
 				room.Details.Players = append(room.Details.Players, roomPlayer)
 			}
 		}
@@ -205,7 +209,7 @@ func JoinInitRobot(gameId string, room *Room, roomConfig confroomrank.RoomConfig
 		robotConfigId := pair[0]
 		robotCount := pair[1]
 		for i := 0; i < robotCount; i++ {
-			roomPlayer := NewRoomRobot(gameId, robotConfigId, -1)
+			roomPlayer := NewRoomRobot(gameId, room, robotConfigId, -1)
 			room.Details.Players = append(room.Details.Players, roomPlayer)
 		}
 	}
@@ -0,0 +1,21 @@
+package utmisc
+
+import "math/rand"
+
+func RandomMultiple(count, minNum, maxNum int) []int {
+	list := make([]int, 0)
+	if maxNum > minNum {
+		if count > maxNum-minNum {
+			count = maxNum - minNum
+		}
+		m := make(map[int]struct{})
+		for len(m) < count {
+			v := minNum + rand.Intn(maxNum-minNum)
+			if _, ok := m[v]; !ok {
+				m[v] = struct{}{}
+				list = append(list, v)
+			}
+		}
+	}
+	return list
+}
...	...	@@ -2,6 +2,7 @@ package svcommon
2	2
3	3	import (
4	4	"apigame/configs/confglobal"
	5	+ "apigame/util/utmisc"
5	6	"math/rand"
6	7	)
7	8
...	...	@@ -17,6 +18,28 @@ func GetName(gameId string) string {
17	18	return "李四"
18	19	}
19	20
	21	+func GetIndexNames(gameId string, amount int) []int {
	22	+ list := make([]int, 0)
	23	+ config, err := confglobal.GetConfig(gameId)
	24	+ if err == nil {
	25	+ count := len(config.Names)
	26	+ if count > 0 {
	27	+ return utmisc.RandomMultiple(amount, 0, count)
	28	+ }
	29	+ }
	30	+ return list
	31	+}
	32	+
	33	+func GetIndexName(gameId string, index int) string {
	34	+ config, err := confglobal.GetConfig(gameId)
	35	+ if err == nil {
	36	+ if len(config.Names) > index {
	37	+ return config.Names[index]
	38	+ }
	39	+ }
	40	+ return "李四"
	41	+}
	42	+
20	43	// GetAvatar 随机模拟玩家头像
21	44	func GetAvatar(gameId string) string {
22	45	config, err := confglobal.GetConfig(gameId)
...	...
...	...	@@ -48,7 +48,8 @@ type RoomPlayer struct {
48	48
49	49	// RoomDetails 详情
50	50	type RoomDetails struct {
51		- Players []*RoomPlayer // 房间玩家列表
	51	+ Players []*RoomPlayer // 房间玩家列表
	52	+ IndexNames []int // 房间玩家名字列表
52	53	}
53	54
54	55	// Encode 打包数据
...	...	@@ -64,7 +65,8 @@ func (d *Room) Encode() {
64	65	// Decode 分包数据
65	66	func (d *Room) Decode() {
66	67	d.Details = &RoomDetails{
67		- Players: make([]*RoomPlayer, 0),
	68	+ Players: make([]*RoomPlayer, 0),
	69	+ IndexNames: make([]int, 0),
68	70	}
69	71	err := json.Unmarshal([]byte(d.DetailsText), d.Details)
70	72	if err != nil {
...	...
...	...	@@ -8,7 +8,6 @@ import (
8	8	"apigame/util/util-lx/lxalilog"
9	9	"apigame/util/util-lx/lxtime"
10	10	"apigame/util/utstring"
11		- "apigame/util/utuuid"
12	11	)
13	12
14	13	func tryInitPlayer(gameId string, player *Player) {
...	...	@@ -46,17 +45,24 @@ func LoadPlayer(gameId string, playerUid int64, topType int) (player *Player) {
46	45	}
47	46
48	47	// NewRoomRobot 新建房间机器人
49		-func NewRoomRobot(gameId string, robotConfigId int, userType int) *RoomPlayer {
	48	+func NewRoomRobot(gameId string, room Room, robotConfigId int, userType int) RoomPlayer {
50	49	d := &RoomPlayer{
51	50	//Uid: rand.Int63(),
52		- Uid: int64(utuuid.GetUint32()),
53		- Name: svcommon.GetName(gameId),
	51	+ //Uid: int64(utuuid.GetUint32()),
	52	+ //Name: svcommon.GetName(gameId),
54	53	Icon: svcommon.GetAvatar(gameId),
55	54	Score: 0,
56	55	JoinTime: lxtime.NowUninx(),
57	56	UserType: userType,
58	57	RobotConfigId: robotConfigId,
59	58	}
	59	+ if len(room.Details.IndexNames) > 0 {
	60	+ d.Name = svcommon.GetIndexName(gameId, room.Details.IndexNames[0])
	61	+ room.Details.IndexNames = room.Details.IndexNames[1:]
	62	+ } else {
	63	+ d.Name = svcommon.GetName(gameId)
	64	+ }
	65	+ d.Uid = 9900_0000 + int64(len(room.Details.Players))
60	66	return d
61	67	}
62	68
...	...
...	...	@@ -2,6 +2,7 @@ package roomrank
2	2
3	3	import (
4	4	"apigame/configs/confroomrank"
	5	+ "apigame/service-common/svcommon"
5	6	"apigame/service-common/svmysql"
6	7	"apigame/util/util-lx/lxalilog"
7	8	"apigame/util/util-lx/lxtime"
...	...	@@ -58,6 +59,7 @@ func CreateRoom(gameId string, topType int, activityId int64, roomConfigId int)
58	59	room.CreateTime = lxtime.NowUninx()
59	60	details := new(RoomDetails)
60	61	details.Players = make([]*RoomPlayer, 0)
	62	+ details.IndexNames = make([]int, 0)
61	63	room.Details = details
62	64
63	65	err := svmysql.Save(room, gameId)
...	...	@@ -144,6 +146,8 @@ func TryGetRoom(gameId string, topType int, player Player, config confroomrank
144	146	if hasCreate {
145	147	room = roomCreate
146	148
	149	+ room.Details.IndexNames = svcommon.GetIndexNames(gameId, roomConfig.TotalPlayer)
	150	+
147	151	// 配置原生机器人
148	152	JoinInitRobot(gameId, room, roomConfig)
149	153
...	...	@@ -177,7 +181,7 @@ func TryCloseRoom(gameId string, room *Room, roomConfig confroomrank.RoomConfig)
177	181	canJoinCount := pair[1] - room.GetPlayerTypeCount(userType)
178	182	robotConfigId := roomConfig.AutoRobot[i]
179	183	for i := 0; i < canJoinCount; i++ {
180		- roomPlayer := NewRoomRobot(gameId, robotConfigId, userType)
	184	+ roomPlayer := NewRoomRobot(gameId, room, robotConfigId, userType)
181	185	room.Details.Players = append(room.Details.Players, roomPlayer)
182	186	}
183	187	}
...	...	@@ -205,7 +209,7 @@ func JoinInitRobot(gameId string, room *Room, roomConfig confroomrank.RoomConfig
205	209	robotConfigId := pair[0]
206	210	robotCount := pair[1]
207	211	for i := 0; i < robotCount; i++ {
208		- roomPlayer := NewRoomRobot(gameId, robotConfigId, -1)
	212	+ roomPlayer := NewRoomRobot(gameId, room, robotConfigId, -1)
209	213	room.Details.Players = append(room.Details.Players, roomPlayer)
210	214	}
211	215	}
...	...
...	...	@@ -0,0 +1,21 @@
	1	+package utmisc
	2	+
	3	+import "math/rand"
	4	+
	5	+func RandomMultiple(count, minNum, maxNum int) []int {
	6	+ list := make([]int, 0)
	7	+ if maxNum > minNum {
	8	+ if count > maxNum-minNum {
	9	+ count = maxNum - minNum
	10	+ }
	11	+ m := make(map[int]struct{})
	12	+ for len(m) < count {
	13	+ v := minNum + rand.Intn(maxNum-minNum)
	14	+ if _, ok := m[v]; !ok {
	15	+ m[v] = struct{}{}
	16	+ list = append(list, v)
	17	+ }
	18	+ }
	19	+ }
	20	+ return list
	21	+}
...	...