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

结构字段优化

This commit is contained in:
kercylan98 2023-05-19 11:26:30 +08:00
parent 166e876700
commit 2d055df276
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
game/builtin/world.go
View File

@ -14,7 +14,7 @@ func NewWorld[PlayerID comparable, Player game.Player[PlayerID]](guid int64, opt
world := &World[PlayerID, Player]{ world := &World[PlayerID, Player]{
guid: guid, guid: guid,
players: synchronization.NewMap[PlayerID, Player](), players: synchronization.NewMap[PlayerID, Player](),
playerActors: synchronization.NewMap[PlayerID, *synchronization.Map[int64, game.Actor]](), playerActors: synchronization.NewMap[PlayerID, hash.Map[int64, game.Actor]](),
owners: synchronization.NewMap[int64, PlayerID](), owners: synchronization.NewMap[int64, PlayerID](),
actors: synchronization.NewMap[int64, game.Actor](), actors: synchronization.NewMap[int64, game.Actor](),
} }
@ -29,10 +29,10 @@ type World[PlayerID comparable, Player game.Player[PlayerID]] struct {
guid int64 guid int64
actorGuid atomic.Int64 actorGuid atomic.Int64
playerLimit int playerLimit int
players *synchronization.Map[PlayerID, Player] players hash.Map[PlayerID, Player]
playerActors *synchronization.Map[PlayerID, *synchronization.Map[int64, game.Actor]] playerActors hash.Map[PlayerID, hash.Map[int64, game.Actor]]
owners *synchronization.Map[int64, PlayerID] owners hash.Map[int64, PlayerID]
actors *synchronization.Map[int64, game.Actor] actors hash.Map[int64, game.Actor]
playerJoinWorldEventHandles []game.PlayerJoinWorldEventHandle[PlayerID, Player] playerJoinWorldEventHandles []game.PlayerJoinWorldEventHandle[PlayerID, Player]
playerLeaveWorldEventHandles []game.PlayerLeaveWorldEventHandle[PlayerID, Player] playerLeaveWorldEventHandles []game.PlayerLeaveWorldEventHandle[PlayerID, Player]
@ -58,7 +58,7 @@ func (slf *World[PlayerID, Player]) GetPlayer(id PlayerID) Player {
} }
func (slf *World[PlayerID, Player]) GetPlayers() hash.MapReadonly[PlayerID, Player] { func (slf *World[PlayerID, Player]) GetPlayers() hash.MapReadonly[PlayerID, Player] {
return slf.players return slf.players.(hash.MapReadonly[PlayerID, Player])
} }
func (slf *World[PlayerID, Player]) GetActor(guid int64) game.Actor { func (slf *World[PlayerID, Player]) GetActor(guid int64) game.Actor {
@ -66,7 +66,7 @@ func (slf *World[PlayerID, Player]) GetActor(guid int64) game.Actor {
} }
func (slf *World[PlayerID, Player]) GetActors() hash.MapReadonly[int64, game.Actor] { func (slf *World[PlayerID, Player]) GetActors() hash.MapReadonly[int64, game.Actor] {
return slf.actors return slf.actors.(hash.MapReadonly[int64, game.Actor])
} }
func (slf *World[PlayerID, Player]) GetPlayerActor(id PlayerID, guid int64) game.Actor { func (slf *World[PlayerID, Player]) GetPlayerActor(id PlayerID, guid int64) game.Actor {
@ -77,7 +77,7 @@ func (slf *World[PlayerID, Player]) GetPlayerActor(id PlayerID, guid int64) game
} }
func (slf *World[PlayerID, Player]) GetPlayerActors(id PlayerID) hash.MapReadonly[int64, game.Actor] { func (slf *World[PlayerID, Player]) GetPlayerActors(id PlayerID) hash.MapReadonly[int64, game.Actor] {
return slf.playerActors.Get(id) return slf.playerActors.Get(id).(hash.MapReadonly[int64, game.Actor])
} }
func (slf *World[PlayerID, Player]) IsExistPlayer(id PlayerID) bool { func (slf *World[PlayerID, Player]) IsExistPlayer(id PlayerID) bool {
@ -172,7 +172,7 @@ func (slf *World[PlayerID, Player]) RemoveActorOwner(guid int64) {
func (slf *World[PlayerID, Player]) Reset() { func (slf *World[PlayerID, Player]) Reset() {
log.Debug("World", zap.Int64("Reset", slf.guid)) log.Debug("World", zap.Int64("Reset", slf.guid))
slf.players.Clear() slf.players.Clear()
slf.playerActors.Range(func(id PlayerID, actors *synchronization.Map[int64, game.Actor]) { slf.playerActors.Range(func(id PlayerID, actors hash.Map[int64, game.Actor]) {
actors.Clear() actors.Clear()
}) })
slf.playerActors.Clear() slf.playerActors.Clear()