多人世界ability转发优化

2026-02-04 16:22:27 +08:00 · 2022-12-04 16:57:16 +08:00
parent 65a2e3e6e8
commit 64b2f3ceb0
5 changed files with 106 additions and 113 deletions
--- a/gdconf/avatar_data.go
+++ b/gdconf/avatar_data.go
@@ -58,7 +58,7 @@ func (g *GameDataConfig) loadAvatarData() {
 			panic(info)
 		}
 		if len(configAvatar.Abilities) == 0 {
-			logger.LOG.Error("configAvatar Abilities len is 0, AvatarId: %v", avatarData.AvatarId)
+			logger.LOG.Info("can not find any ability of avatar, AvatarId: %v", avatarData.AvatarId)
 		}
 		for _, configAvatarAbility := range configAvatar.Abilities {
 			abilityHashCode := endec.Hk4eAbilityHashCode(configAvatarAbility.AbilityName)
--- a/gs/game/game_manager.go
+++ b/gs/game/game_manager.go
@@ -11,6 +11,8 @@ import (
 	"hk4e/protocol/proto"
 )

+var GAME *GameManager = nil
+
 type GameManager struct {
 	dao          *dao.Dao
 	netMsgInput  chan *cmd.NetMsg
@@ -42,7 +44,7 @@ func NewGameManager(dao *dao.Dao, netMsgInput chan *cmd.NetMsg, netMsgOutput cha
 	r.worldManager = NewWorldManager(r.snowflake)
 	r.tickManager = NewTickManager(r)
 	r.commandManager = NewCommandManager(r)
-
+	GAME = r
 	return r
 }

--- a/gs/game/user_combat.go
+++ b/gs/game/user_combat.go
@@ -17,7 +17,7 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 		return
 	}
 	scene := world.GetSceneById(player.SceneId)
-	invokeHandler := NewInvokeHandler[proto.CombatInvokeEntry]()
+	invokeHandler := model.NewInvokeHandler[proto.CombatInvokeEntry]()
 	for _, entry := range req.InvokeList {
 		//logger.LOG.Debug("AT: %v, FT: %v, UID: %v", entry.ArgumentType, entry.ForwardType, player.PlayerID)
 		switch entry.ArgumentType {
@@ -205,9 +205,9 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 			// 处理耐力消耗
 			g.HandleStamina(player, motionInfo.State)

-			invokeHandler.addEntry(entry.ForwardType, entry)
+			invokeHandler.AddEntry(entry.ForwardType, entry)
 		default:
-			invokeHandler.addEntry(entry.ForwardType, entry)
+			invokeHandler.AddEntry(entry.ForwardType, entry)
 		}
 	}

@@ -229,14 +229,14 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 	// PacketCombatInvocationsNotify
 	if invokeHandler.AllLen() > 0 {
 		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
-		combatInvocationsNotify.InvokeList = invokeHandler.entryListForwardAll
+		combatInvocationsNotify.InvokeList = invokeHandler.EntryListForwardAll
 		for _, v := range surrPlayerList {
 			g.SendMsg(cmd.CombatInvocationsNotify, v.PlayerID, v.ClientSeq, combatInvocationsNotify)
 		}
 	}
 	if invokeHandler.AllExceptCurLen() > 0 {
 		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
-		combatInvocationsNotify.InvokeList = invokeHandler.entryListForwardAllExceptCur
+		combatInvocationsNotify.InvokeList = invokeHandler.EntryListForwardAllExceptCur
 		for _, v := range surrPlayerList {
 			if player.PlayerID == v.PlayerID {
 				continue
@@ -246,7 +246,7 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 	}
 	if invokeHandler.HostLen() > 0 {
 		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
-		combatInvocationsNotify.InvokeList = invokeHandler.entryListForwardHost
+		combatInvocationsNotify.InvokeList = invokeHandler.EntryListForwardHost
 		g.SendMsg(cmd.CombatInvocationsNotify, world.owner.PlayerID, world.owner.ClientSeq, combatInvocationsNotify)
 	}
 }
@@ -254,58 +254,16 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 func (g *GameManager) AbilityInvocationsNotify(player *model.Player, payloadMsg pb.Message) {
 	//logger.LOG.Debug("user ability invocations, uid: %v", player.PlayerID)
 	req := payloadMsg.(*proto.AbilityInvocationsNotify)
-	world := g.worldManager.GetWorldByID(player.WorldId)
-	if world == nil {
-		return
+	if player.AbilityInvokeHandler == nil {
+		player.AbilityInvokeHandler = model.NewInvokeHandler[proto.AbilityInvokeEntry]()
 	}
-	scene := world.GetSceneById(player.SceneId)
-	invokeHandler := NewInvokeHandler[proto.AbilityInvokeEntry]()
 	for _, entry := range req.Invokes {
 		//logger.LOG.Debug("AT: %v, FT: %v, UID: %v", entry.ArgumentType, entry.ForwardType, player.PlayerID)

 		// 处理能力调用
 		g.HandleAbilityInvoke(player, entry)

-		invokeHandler.addEntry(entry.ForwardType, entry)
-	}
-
-	// 只给附近aoi区域的玩家广播消息
-	surrPlayerList := make([]*model.Player, 0)
-	entityIdList := world.aoiManager.GetEntityIdListByPos(float32(player.Pos.X), float32(player.Pos.Y), float32(player.Pos.Z))
-	for _, entityId := range entityIdList {
-		entity := scene.GetEntity(entityId)
-		if entity == nil {
-			continue
-		}
-		if entity.avatarEntity != nil {
-			otherPlayer := g.userManager.GetOnlineUser(entity.avatarEntity.uid)
-			surrPlayerList = append(surrPlayerList, otherPlayer)
-		}
-	}
-
-	// 处理转发
-	// PacketAbilityInvocationsNotify
-	if invokeHandler.AllLen() > 0 {
-		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
-		abilityInvocationsNotify.Invokes = invokeHandler.entryListForwardAll
-		for _, v := range surrPlayerList {
-			g.SendMsg(cmd.AbilityInvocationsNotify, v.PlayerID, v.ClientSeq, abilityInvocationsNotify)
-		}
-	}
-	if invokeHandler.AllExceptCurLen() > 0 {
-		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
-		abilityInvocationsNotify.Invokes = invokeHandler.entryListForwardAllExceptCur
-		for _, v := range surrPlayerList {
-			if player.PlayerID == v.PlayerID {
-				continue
-			}
-			g.SendMsg(cmd.AbilityInvocationsNotify, v.PlayerID, v.ClientSeq, abilityInvocationsNotify)
-		}
-	}
-	if invokeHandler.HostLen() > 0 {
-		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
-		abilityInvocationsNotify.Invokes = invokeHandler.entryListForwardHost
-		g.SendMsg(cmd.AbilityInvocationsNotify, world.owner.PlayerID, world.owner.ClientSeq, abilityInvocationsNotify)
+		player.AbilityInvokeHandler.AddEntry(entry.ForwardType, entry)
 	}
 }

@@ -317,14 +275,14 @@ func (g *GameManager) ClientAbilityInitFinishNotify(player *model.Player, payloa
 		return
 	}
 	scene := world.GetSceneById(player.SceneId)
-	invokeHandler := NewInvokeHandler[proto.AbilityInvokeEntry]()
+	invokeHandler := model.NewInvokeHandler[proto.AbilityInvokeEntry]()
 	for _, entry := range req.Invokes {
 		//logger.LOG.Debug("AT: %v, FT: %v, UID: %v", entry.ArgumentType, entry.ForwardType, player.PlayerID)

 		// 处理能力调用
 		g.HandleAbilityInvoke(player, entry)

-		invokeHandler.addEntry(entry.ForwardType, entry)
+		invokeHandler.AddEntry(entry.ForwardType, entry)
 	}

 	// 只给附近aoi区域的玩家广播消息
@@ -341,18 +299,43 @@ func (g *GameManager) ClientAbilityInitFinishNotify(player *model.Player, payloa
 		}
 	}

-	// 处理转发
+	// AbilityInvocationsNotify转发
+	// PacketAbilityInvocationsNotify
+	if player.AbilityInvokeHandler.AllLen() > 0 {
+		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
+		abilityInvocationsNotify.Invokes = player.AbilityInvokeHandler.EntryListForwardAll
+		for _, v := range surrPlayerList {
+			g.SendMsg(cmd.AbilityInvocationsNotify, v.PlayerID, v.ClientSeq, abilityInvocationsNotify)
+		}
+	}
+	if player.AbilityInvokeHandler.AllExceptCurLen() > 0 {
+		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
+		abilityInvocationsNotify.Invokes = player.AbilityInvokeHandler.EntryListForwardAllExceptCur
+		for _, v := range surrPlayerList {
+			if player.PlayerID == v.PlayerID {
+				continue
+			}
+			g.SendMsg(cmd.AbilityInvocationsNotify, v.PlayerID, v.ClientSeq, abilityInvocationsNotify)
+		}
+	}
+	if player.AbilityInvokeHandler.HostLen() > 0 {
+		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
+		abilityInvocationsNotify.Invokes = player.AbilityInvokeHandler.EntryListForwardHost
+		g.SendMsg(cmd.AbilityInvocationsNotify, world.owner.PlayerID, world.owner.ClientSeq, abilityInvocationsNotify)
+	}
+
+	// ClientAbilityInitFinishNotify转发
 	// PacketClientAbilityInitFinishNotify
 	if invokeHandler.AllLen() > 0 {
 		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
-		clientAbilityInitFinishNotify.Invokes = invokeHandler.entryListForwardAll
+		clientAbilityInitFinishNotify.Invokes = invokeHandler.EntryListForwardAll
 		for _, v := range surrPlayerList {
 			g.SendMsg(cmd.ClientAbilityInitFinishNotify, v.PlayerID, v.ClientSeq, clientAbilityInitFinishNotify)
 		}
 	}
 	if invokeHandler.AllExceptCurLen() > 0 {
 		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
-		clientAbilityInitFinishNotify.Invokes = invokeHandler.entryListForwardAllExceptCur
+		clientAbilityInitFinishNotify.Invokes = invokeHandler.EntryListForwardAllExceptCur
 		for _, v := range surrPlayerList {
 			if player.PlayerID == v.PlayerID {
 				continue
@@ -362,7 +345,7 @@ func (g *GameManager) ClientAbilityInitFinishNotify(player *model.Player, payloa
 	}
 	if invokeHandler.HostLen() > 0 {
 		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
-		clientAbilityInitFinishNotify.Invokes = invokeHandler.entryListForwardHost
+		clientAbilityInitFinishNotify.Invokes = invokeHandler.EntryListForwardHost
 		g.SendMsg(cmd.ClientAbilityInitFinishNotify, world.owner.PlayerID, world.owner.ClientSeq, clientAbilityInitFinishNotify)
 	}
 }
@@ -381,56 +364,3 @@ func (g *GameManager) ClientAbilityChangeNotify(player *model.Player, payloadMsg
 	req := payloadMsg.(*proto.ClientAbilityChangeNotify)
 	logger.LOG.Debug("ClientAbilityChangeNotify: %v", req)
 }
-
-// 泛型通用转发器
-
-type InvokeType interface {
-	proto.AbilityInvokeEntry | proto.CombatInvokeEntry
-}
-
-type InvokeHandler[T InvokeType] struct {
-	entryListForwardAll          []*T
-	entryListForwardAllExceptCur []*T
-	entryListForwardHost         []*T
-}
-
-func NewInvokeHandler[T InvokeType]() (r *InvokeHandler[T]) {
-	r = new(InvokeHandler[T])
-	r.InitInvokeHandler()
-	return r
-}
-
-func (i *InvokeHandler[T]) InitInvokeHandler() {
-	i.entryListForwardAll = make([]*T, 0)
-	i.entryListForwardAllExceptCur = make([]*T, 0)
-	i.entryListForwardHost = make([]*T, 0)
-}
-
-func (i *InvokeHandler[T]) addEntry(forward proto.ForwardType, entry *T) {
-	switch forward {
-	case proto.ForwardType_FORWARD_TYPE_TO_ALL:
-		i.entryListForwardAll = append(i.entryListForwardAll, entry)
-	case proto.ForwardType_FORWARD_TYPE_TO_ALL_EXCEPT_CUR:
-		fallthrough
-	case proto.ForwardType_FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR:
-		i.entryListForwardAllExceptCur = append(i.entryListForwardAllExceptCur, entry)
-	case proto.ForwardType_FORWARD_TYPE_TO_HOST:
-		i.entryListForwardHost = append(i.entryListForwardHost, entry)
-	default:
-		if forward != proto.ForwardType_FORWARD_TYPE_ONLY_SERVER {
-			logger.LOG.Error("forward: %v, entry: %v", forward, entry)
-		}
-	}
-}
-
-func (i *InvokeHandler[T]) AllLen() int {
-	return len(i.entryListForwardAll)
-}
-
-func (i *InvokeHandler[T]) AllExceptCurLen() int {
-	return len(i.entryListForwardAllExceptCur)
-}
-
-func (i *InvokeHandler[T]) HostLen() int {
-	return len(i.entryListForwardHost)
-}
--- a/gs/model/invoke_handler.go
+++ b/gs/model/invoke_handler.go
@@ -0,0 +1,59 @@
+package model
+
+import (
+	"hk4e/pkg/logger"
+	"hk4e/protocol/proto"
+)
+
+// 泛型通用转发器
+
+type InvokeType interface {
+	proto.AbilityInvokeEntry | proto.CombatInvokeEntry
+}
+
+type InvokeHandler[T InvokeType] struct {
+	EntryListForwardAll          []*T
+	EntryListForwardAllExceptCur []*T
+	EntryListForwardHost         []*T
+}
+
+func NewInvokeHandler[T InvokeType]() (r *InvokeHandler[T]) {
+	r = new(InvokeHandler[T])
+	r.InitInvokeHandler()
+	return r
+}
+
+func (i *InvokeHandler[T]) InitInvokeHandler() {
+	i.EntryListForwardAll = make([]*T, 0)
+	i.EntryListForwardAllExceptCur = make([]*T, 0)
+	i.EntryListForwardHost = make([]*T, 0)
+}
+
+func (i *InvokeHandler[T]) AddEntry(forward proto.ForwardType, entry *T) {
+	switch forward {
+	case proto.ForwardType_FORWARD_TYPE_TO_ALL:
+		i.EntryListForwardAll = append(i.EntryListForwardAll, entry)
+	case proto.ForwardType_FORWARD_TYPE_TO_ALL_EXCEPT_CUR:
+		fallthrough
+	case proto.ForwardType_FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR:
+		i.EntryListForwardAllExceptCur = append(i.EntryListForwardAllExceptCur, entry)
+	case proto.ForwardType_FORWARD_TYPE_TO_HOST:
+		i.EntryListForwardHost = append(i.EntryListForwardHost, entry)
+	default:
+		if forward != proto.ForwardType_FORWARD_TYPE_ONLY_SERVER {
+			logger.LOG.Error("forward: %v, entry: %v", forward, entry)
+		}
+	}
+}
+
+func (i *InvokeHandler[T]) AllLen() int {
+	return len(i.EntryListForwardAll)
+}
+
+func (i *InvokeHandler[T]) AllExceptCurLen() int {
+	return len(i.EntryListForwardAllExceptCur)
+}
+
+func (i *InvokeHandler[T]) HostLen() int {
+	return len(i.EntryListForwardHost)
+}
--- a/gs/model/player.go
+++ b/gs/model/player.go
@@ -2,6 +2,7 @@ package model

 import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	"hk4e/protocol/proto"
 )

 const (
@@ -65,7 +66,8 @@ type Player struct {
 	SceneLoadState        int                   `bson:"-"` // 场景加载状态
 	CoopApplyMap          map[uint32]int64      `bson:"-"` // 敲门申请的玩家uid及时间
 	StaminaInfo           *StaminaInfo          `bson:"-"` // 耐力临时数据
-	ClientSeq             uint32                `bson:"-"`
+	ClientSeq             uint32                `bson:"-"` // 客户端发包请求的序号
+	AbilityInvokeHandler  *InvokeHandler[proto.AbilityInvokeEntry]
 }

 func (p *Player) GetNextGameObjectGuid() uint64 {