chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

玩家ID接口修复，房间优化

This commit is contained in:
kercylan98 2023-05-30 15:08:11 +08:00
parent 65cadf7bae
commit 360f07d9ae
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
game/builtin/room.go
View File

@ -83,15 +83,16 @@ func (slf *Room[PlayerID, Player]) ChangeOwner(id PlayerID) {
// Join 控制玩家加入到该房间 // Join 控制玩家加入到该房间
func (slf *Room[PlayerID, Player]) Join(player Player) error { func (slf *Room[PlayerID, Player]) Join(player Player) error {
exist := slf.players.Exist(player.GetID()) playerId := player.GetID()
exist := slf.players.Exist(playerId)
if !exist && slf.players.Size() >= slf.playerLimit && slf.playerLimit > 0 { if !exist && slf.players.Size() >= slf.playerLimit && slf.playerLimit > 0 {
return ErrRoomPlayerLimit return ErrRoomPlayerLimit
} }
slf.players.Set(player.GetID(), player) slf.players.Set(playerId, player)
if !exist { if !exist {
log.Debug("Room.Join", zap.Any("guid", slf.GetGuid()), zap.Any("player", player.GetID())) log.Debug("Room.Join", zap.Any("guid", slf.GetGuid()), zap.Any("player", playerId))
if slf.players.Size() == 1 && !slf.noMaster { if slf.players.Size() == 1 && !slf.noMaster {
slf.owner = player.GetID() slf.owner = playerId
} }
slf.OnPlayerJoinRoomEvent(player) slf.OnPlayerJoinRoomEvent(player)
} }
@ -104,9 +105,9 @@ func (slf *Room[PlayerID, Player]) Leave(id PlayerID) {
if !exist { if !exist {
return return
} }
log.Debug("Room.Leave", zap.Any("guid", slf.GetGuid()), zap.Any("player", player.GetID())) log.Debug("Room.Leave", zap.Any("guid", slf.GetGuid()), zap.Any("player", id))
slf.OnPlayerLeaveRoomEvent(player) slf.OnPlayerLeaveRoomEvent(player)
slf.players.Delete(player.GetID()) slf.players.Delete(id)
} }
// KickOut 以某种原因踢出特定玩家 // KickOut 以某种原因踢出特定玩家

2
game/player.go
View File

@ -4,6 +4,8 @@ import "github.com/kercylan98/minotaur/server"
// Player 玩家 // Player 玩家
type Player[ID comparable] interface { type Player[ID comparable] interface {
// GetID 获取玩家ID
GetID() ID
// UseConn 指定连接 // UseConn 指定连接
UseConn(conn *server.Conn) UseConn(conn *server.Conn)
// Close 关闭玩家并且释放其资源 // Close 关闭玩家并且释放其资源