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-04-27 15:27:17 +08:00
parent a361dd85b2
commit bf26b8add3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/builtin/world.go
View File

@ -1,7 +1,9 @@
package builtin package builtin
import ( import (
"go.uber.org/zap"
"minotaur/game" "minotaur/game"
"minotaur/utils/log"
"minotaur/utils/synchronization" "minotaur/utils/synchronization"
"sync/atomic" "sync/atomic"
) )
@ -104,6 +106,7 @@ func (slf *World[PlayerID, Player]) Join(player Player) error {
if slf.players.Size() >= slf.playerLimit && slf.playerLimit > 0 { if slf.players.Size() >= slf.playerLimit && slf.playerLimit > 0 {
return ErrWorldPlayerLimit return ErrWorldPlayerLimit
} }
log.Debug("World", zap.Any("Join", player.GetID()), zap.String("connId", player.GetConnID()))
slf.players.Set(player.GetID(), player) slf.players.Set(player.GetID(), player)
if actors := slf.playerActors.Get(player.GetID()); actors == nil { if actors := slf.playerActors.Get(player.GetID()); actors == nil {
actors = synchronization.NewMap[int64, game.Actor]() actors = synchronization.NewMap[int64, game.Actor]()
@ -119,6 +122,7 @@ func (slf *World[PlayerID, Player]) Leave(id PlayerID) {
if !exist { if !exist {
return return
} }
log.Debug("World", zap.Any("Leave", player.GetID()), zap.String("connId", player.GetConnID()))
slf.OnPlayerLeaveWorldEvent(player) slf.OnPlayerLeaveWorldEvent(player)
slf.playerActors.Get(player.GetID()).Range(func(guid int64, actor game.Actor) { slf.playerActors.Get(player.GetID()).Range(func(guid int64, actor game.Actor) {
slf.OnActorAnnihilationEvent(actor) slf.OnActorAnnihilationEvent(actor)
@ -171,6 +175,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))
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 *synchronization.Map[int64, game.Actor]) {
actors.Clear() actors.Clear()
@ -185,6 +190,7 @@ func (slf *World[PlayerID, Player]) Reset() {
func (slf *World[PlayerID, Player]) Release() { func (slf *World[PlayerID, Player]) Release() {
if !slf.released.Swap(true) { if !slf.released.Swap(true) {
log.Debug("World", zap.Int64("Release", slf.guid))
slf.OnWorldReleaseEvent() slf.OnWorldReleaseEvent()
slf.Reset() slf.Reset()
slf.players = nil slf.players = nil