mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-03-01 00:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
flswld
2023-04-11 13:45:46 +08:00
parent e50747e441
commit 0440a6b1ed
7 changed files with 155 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gs/game/game_world_manager.go
+16 -14
View File
@@ -252,15 +252,12 @@ func (w *World) AddEnterSceneContext(ctx *EnterSceneContext) uint32 {
return w.enterSceneToken
}
func (w *World) GetLastEnterSceneContextBySceneIdAndUid(sceneId uint32, uid uint32) *EnterSceneContext {
func (w *World) GetLastEnterSceneContextByUid(uid uint32) *EnterSceneContext {
for token := w.enterSceneToken; token >= 5000; token -= 100 {
ctx, exist := w.enterSceneContextMap[token]
if !exist {
continue
}
if ctx.OldSceneId != sceneId {
continue
}
if ctx.Uid != uid {
continue
}
@@ -269,6 +266,19 @@ func (w *World) GetLastEnterSceneContextBySceneIdAndUid(sceneId uint32, uid uint
return nil
}
func (w *World) RemoveAllEnterSceneContextByUid(uid uint32) {
for token := w.enterSceneToken; token >= 5000; token -= 100 {
ctx, exist := w.enterSceneContextMap[token]
if !exist {
continue
}
if ctx.Uid != uid {
continue
}
delete(w.enterSceneContextMap, token)
}
}
func (w *World) GetWorldLevel() uint8 {
return w.worldLevel
}
@@ -309,7 +319,6 @@ func (w *World) GetPlayerPeerId(player *model.Player) uint32 {
peerId = uint32(peerIdIndex) + 1
}
}
// logger.Debug("get player peer id is: %v, uid: %v", peerId, player.PlayerID)
return peerId
}
@@ -362,12 +371,6 @@ func (w *World) AddPlayer(player *model.Player, sceneId uint32) {
scene := w.GetSceneById(sceneId)
scene.AddPlayer(player)
w.InitPlayerTeamEntityId(player)
if WORLD_MANAGER.IsBigWorld(w) {
activeAvatarId := w.GetPlayerActiveAvatarId(player)
worldAvatar := w.GetPlayerWorldAvatar(player, activeAvatarId)
w.bigWorldAoi.AddObjectToGridByPos(int64(player.PlayerID), worldAvatar,
float32(player.Pos.X), float32(player.Pos.Y), float32(player.Pos.Z))
}
}
func (w *World) RemovePlayer(player *model.Player) {
@@ -375,6 +378,7 @@ func (w *World) RemovePlayer(player *model.Player) {
w.peerList = append(w.peerList[:peerId-1], w.peerList[peerId:]...)
scene := w.sceneMap[player.SceneId]
scene.RemovePlayer(player)
w.RemoveAllEnterSceneContextByUid(player.PlayerID)
delete(w.playerMap, player.PlayerID)
delete(w.playerFirstEnterMap, player.PlayerID)
delete(w.multiplayerTeam.localTeamMap, player.PlayerID)
@@ -382,8 +386,6 @@ func (w *World) RemovePlayer(player *model.Player) {
delete(w.multiplayerTeam.localTeamEntityMap, player.PlayerID)
if WORLD_MANAGER.IsBigWorld(w) {
w.RemoveMultiplayerTeam(player)
w.bigWorldAoi.RemoveObjectFromGridByPos(int64(player.PlayerID),
float32(player.Pos.X), float32(player.Pos.Y), float32(player.Pos.Z))
} else {
if player.PlayerID != w.owner.PlayerID {
w.UpdateMultiplayerTeam()
@@ -658,7 +660,7 @@ func (w *World) copyLocalTeamToWorld(start int, end int, peerId uint32) {
}
}
// TODO 为了实现大世界无限人数写的
// 为了实现大世界无限人数写的
// 现在看来把世界里所有人放进队伍里发给客户端超过8个客户端会崩溃
// 看来还是不能简单的走通用逻辑 需要对大世界场景队伍做特殊处理 欺骗客户端其他玩家仅仅以场景角色实体的形式出现