优化ability转发

gs/game/route_manager.go

@@ -47,6 +47,8 @@ func (r *RouteManager) doRoute(cmdId uint16, userId uint32, clientSeq uint32, pa
 }
 
 func (r *RouteManager) InitRoute() {
+	r.registerRouter(cmd.UnionCmdNotify, r.gameManager.UnionCmdNotify)
+	r.registerRouter(cmd.MassiveEntityElementOpBatchNotify, r.gameManager.MassiveEntityElementOpBatchNotify)
 	r.registerRouter(cmd.PlayerSetPauseReq, r.gameManager.PlayerSetPauseReq)
 	r.registerRouter(cmd.EnterSceneReadyReq, r.gameManager.EnterSceneReadyReq)
 	r.registerRouter(cmd.PathfindingEnterSceneReq, r.gameManager.PathfindingEnterSceneReq)

gs/game/tick_manager.go

@@ -235,12 +235,12 @@ func (t *TickManager) onTick200MilliSecond(now int64) {
 }
 
 func (t *TickManager) onTick100MilliSecond(now int64) {
-	// 伤害处理和转发
-	for _, world := range t.gameManager.worldManager.worldMap {
-		for _, scene := range world.sceneMap {
-			scene.AttackHandler(t.gameManager)
-		}
-	}
+	//// 伤害处理和转发
+	//for _, world := range t.gameManager.worldManager.worldMap {
+	//	for _, scene := range world.sceneMap {
+	//		scene.AttackHandler(t.gameManager)
+	//	}
+	//}
 
 	// 服务器控制的模拟AI移动
 

gs/game/user_ability.go

@@ -2,13 +2,12 @@ package game
 
 import (
 	"hk4e/gs/model"
-	"hk4e/pkg/logger"
 	"hk4e/protocol/proto"
 )
 
 // HandleAbilityInvoke 处理能力调用
 func (g *GameManager) HandleAbilityInvoke(player *model.Player, entry *proto.AbilityInvokeEntry) {
-	logger.LOG.Debug("ability invoke handle, entry: %v", entry.ArgumentType)
+	//logger.LOG.Debug("ability invoke handle, entry: %v", entry.ArgumentType)
 
 	switch entry.ArgumentType {
 	case proto.AbilityInvokeArgument_ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA:

gs/game/user_combat.go

@@ -9,6 +9,140 @@ import (
 	pb "google.golang.org/protobuf/proto"
 )
 
+func (g *GameManager) UnionCmdNotify(player *model.Player, payloadMsg pb.Message) {
+	//logger.LOG.Debug("user send union cmd, uid: %v", player.PlayerID)
+	req := payloadMsg.(*proto.UnionCmdNotify)
+	_ = req
+
+	world := g.worldManager.GetWorldByID(player.WorldId)
+	if world == nil {
+		return
+	}
+	scene := world.GetSceneById(player.SceneId)
+
+	// 只给附近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)
+		}
+	}
+
+	// CombatInvocationsNotify转发
+	// PacketCombatInvocationsNotify
+	if player.CombatInvokeHandler.AllLen() > 0 {
+		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
+		combatInvocationsNotify.InvokeList = player.CombatInvokeHandler.EntryListForwardAll
+		for _, v := range surrPlayerList {
+			g.SendMsg(cmd.CombatInvocationsNotify, v.PlayerID, player.ClientSeq, combatInvocationsNotify)
+		}
+	}
+	if player.CombatInvokeHandler.AllExceptCurLen() > 0 {
+		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
+		combatInvocationsNotify.InvokeList = player.CombatInvokeHandler.EntryListForwardAllExceptCur
+		for _, v := range surrPlayerList {
+			if player.PlayerID == v.PlayerID {
+				continue
+			}
+			g.SendMsg(cmd.CombatInvocationsNotify, v.PlayerID, player.ClientSeq, combatInvocationsNotify)
+		}
+	}
+	if player.CombatInvokeHandler.HostLen() > 0 {
+		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
+		combatInvocationsNotify.InvokeList = player.CombatInvokeHandler.EntryListForwardHost
+		g.SendMsg(cmd.CombatInvocationsNotify, world.owner.PlayerID, player.ClientSeq, combatInvocationsNotify)
+	}
+
+	// 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, player.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, player.ClientSeq, abilityInvocationsNotify)
+		}
+	}
+	if player.AbilityInvokeHandler.HostLen() > 0 {
+		abilityInvocationsNotify := new(proto.AbilityInvocationsNotify)
+		abilityInvocationsNotify.Invokes = player.AbilityInvokeHandler.EntryListForwardHost
+		g.SendMsg(cmd.AbilityInvocationsNotify, world.owner.PlayerID, player.ClientSeq, abilityInvocationsNotify)
+	}
+
+	// ClientAbilityInitFinishNotify转发
+	// PacketClientAbilityInitFinishNotify
+	if player.ClientAbilityInvokeHandler.AllLen() > 0 {
+		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
+		clientAbilityInitFinishNotify.Invokes = player.ClientAbilityInvokeHandler.EntryListForwardAll
+		for _, v := range surrPlayerList {
+			g.SendMsg(cmd.ClientAbilityInitFinishNotify, v.PlayerID, player.ClientSeq, clientAbilityInitFinishNotify)
+		}
+	}
+	if player.ClientAbilityInvokeHandler.AllExceptCurLen() > 0 {
+		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
+		clientAbilityInitFinishNotify.Invokes = player.ClientAbilityInvokeHandler.EntryListForwardAllExceptCur
+		for _, v := range surrPlayerList {
+			if player.PlayerID == v.PlayerID {
+				continue
+			}
+			g.SendMsg(cmd.ClientAbilityInitFinishNotify, v.PlayerID, player.ClientSeq, clientAbilityInitFinishNotify)
+		}
+	}
+	if player.ClientAbilityInvokeHandler.HostLen() > 0 {
+		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
+		clientAbilityInitFinishNotify.Invokes = player.ClientAbilityInvokeHandler.EntryListForwardHost
+		g.SendMsg(cmd.ClientAbilityInitFinishNotify, world.owner.PlayerID, player.ClientSeq, clientAbilityInitFinishNotify)
+	}
+
+	player.CombatInvokeHandler.Clear()
+	player.AbilityInvokeHandler.Clear()
+	player.ClientAbilityInvokeHandler.Clear()
+}
+
+func (g *GameManager) MassiveEntityElementOpBatchNotify(player *model.Player, payloadMsg pb.Message) {
+	//logger.LOG.Debug("user meeo sync, uid: %v", player.PlayerID)
+	req := payloadMsg.(*proto.MassiveEntityElementOpBatchNotify)
+	ntf := req
+	world := g.worldManager.GetWorldByID(player.WorldId)
+	if world == nil {
+		return
+	}
+	scene := world.GetSceneById(player.SceneId)
+	ntf.OpIdx = scene.meeoIndex
+	scene.meeoIndex++
+	// 只给附近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)
+		}
+	}
+	for _, v := range surrPlayerList {
+		g.SendMsg(cmd.MassiveEntityElementOpBatchNotify, v.PlayerID, player.ClientSeq, ntf)
+	}
+}
+
 func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Message) {
 	//logger.LOG.Debug("user combat invocations, uid: %v", player.PlayerID)
 	req := payloadMsg.(*proto.CombatInvocationsNotify)
@@ -17,15 +151,14 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 		return
 	}
 	scene := world.GetSceneById(player.SceneId)
-	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 {
-		case proto.CombatTypeArgument_COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT:
-			scene.AddAttack(&Attack{
-				combatInvokeEntry: entry,
-				uid:               player.PlayerID,
-			})
+		//case proto.CombatTypeArgument_COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT:
+		//	scene.AddAttack(&Attack{
+		//		combatInvokeEntry: entry,
+		//		uid:               player.PlayerID,
+		//	})
 		case proto.CombatTypeArgument_COMBAT_TYPE_ARGUMENT_ENTITY_MOVE:
 			entityMoveInfo := new(proto.EntityMoveInfo)
 			err := pb.Unmarshal(entry.CombatData, entityMoveInfo)
@@ -205,60 +338,16 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 			// 处理耐力消耗
 			g.HandleStamina(player, motionInfo.State)
 
-			invokeHandler.AddEntry(entry.ForwardType, entry)
+			player.CombatInvokeHandler.AddEntry(entry.ForwardType, entry)
 		default:
-			invokeHandler.AddEntry(entry.ForwardType, entry)
+			player.CombatInvokeHandler.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)
-		}
-	}
-
-	// 处理转发
-	// PacketCombatInvocationsNotify
-	if invokeHandler.AllLen() > 0 {
-		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
-		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
-		for _, v := range surrPlayerList {
-			if player.PlayerID == v.PlayerID {
-				continue
-			}
-			g.SendMsg(cmd.CombatInvocationsNotify, v.PlayerID, v.ClientSeq, combatInvocationsNotify)
-		}
-	}
-	if invokeHandler.HostLen() > 0 {
-		combatInvocationsNotify := new(proto.CombatInvocationsNotify)
-		combatInvocationsNotify.InvokeList = invokeHandler.EntryListForwardHost
-		g.SendMsg(cmd.CombatInvocationsNotify, world.owner.PlayerID, world.owner.ClientSeq, combatInvocationsNotify)
-	}
 }
 
 func (g *GameManager) AbilityInvocationsNotify(player *model.Player, payloadMsg pb.Message) {
 	//logger.LOG.Debug("user ability invocations, uid: %v", player.PlayerID)
 	req := payloadMsg.(*proto.AbilityInvocationsNotify)
-
-	if player.AbilityInvokeHandler == nil {
-		player.AbilityInvokeHandler = model.NewInvokeHandler[proto.AbilityInvokeEntry]()
-	}
-
 	for _, entry := range req.Invokes {
 		//logger.LOG.Debug("AT: %v, FT: %v, UID: %v", entry.ArgumentType, entry.ForwardType, player.PlayerID)
 
@@ -272,86 +361,13 @@ func (g *GameManager) AbilityInvocationsNotify(player *model.Player, payloadMsg
 func (g *GameManager) ClientAbilityInitFinishNotify(player *model.Player, payloadMsg pb.Message) {
 	//logger.LOG.Debug("user client ability init finish, uid: %v", player.PlayerID)
 	req := payloadMsg.(*proto.ClientAbilityInitFinishNotify)
-	world := g.worldManager.GetWorldByID(player.WorldId)
-	if world == nil {
-		return
-	}
-	scene := world.GetSceneById(player.SceneId)
-	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)
-	}
-
-	// 只给附近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)
-		}
-	}
-
-	// AbilityInvocationsNotify转发
-	if player.AbilityInvokeHandler == nil {
-		player.AbilityInvokeHandler = model.NewInvokeHandler[proto.AbilityInvokeEntry]()
-	}
-	// 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
-		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
-		for _, v := range surrPlayerList {
-			if player.PlayerID == v.PlayerID {
-				continue
-			}
-			g.SendMsg(cmd.ClientAbilityInitFinishNotify, v.PlayerID, v.ClientSeq, clientAbilityInitFinishNotify)
-		}
-	}
-	if invokeHandler.HostLen() > 0 {
-		clientAbilityInitFinishNotify := new(proto.ClientAbilityInitFinishNotify)
-		clientAbilityInitFinishNotify.Invokes = invokeHandler.EntryListForwardHost
-		g.SendMsg(cmd.ClientAbilityInitFinishNotify, world.owner.PlayerID, world.owner.ClientSeq, clientAbilityInitFinishNotify)
+		player.ClientAbilityInvokeHandler.AddEntry(entry.ForwardType, entry)
 	}
 }
 

gs/game/user_common_handler.go

@@ -45,10 +45,6 @@ func (g *GameManager) EntityAiSyncNotify(player *model.Player, payloadMsg pb.Mes
 	logger.LOG.Debug("user entity ai sync, uid: %v", player.PlayerID)
 	req := payloadMsg.(*proto.EntityAiSyncNotify)
 
-	if len(req.LocalAvatarAlertedMonsterList) == 0 {
-		return
-	}
-
 	// PacketEntityAiSyncNotify
 	entityAiSyncNotify := new(proto.EntityAiSyncNotify)
 	entityAiSyncNotify.InfoList = make([]*proto.AiSyncInfo, 0)

gs/game/user_login.go

@@ -38,6 +38,10 @@ func (g *GameManager) OnLoginOk(userId uint32, player *model.Player, clientSeq u
 	world.AddPlayer(player, player.SceneId)
 	player.WorldId = world.id
 
+	player.CombatInvokeHandler = model.NewInvokeHandler[proto.CombatInvokeEntry]()
+	player.AbilityInvokeHandler = model.NewInvokeHandler[proto.AbilityInvokeEntry]()
+	player.ClientAbilityInvokeHandler = model.NewInvokeHandler[proto.AbilityInvokeEntry]()
+
 	//// TODO 薄荷标记
 	//if world.IsBigWorld() {
 	//	bigWorld := world.GetSceneById(3)

gs/game/user_stamina.go

@@ -19,29 +19,29 @@ func (g *GameManager) SceneAvatarStaminaStepReq(player *model.Player, payloadMsg
 	switch player.StaminaInfo.State {
 	case proto.MotionState_MOTION_STATE_CLIMB:
 		// 缓慢攀爬
-
-		// 缓慢攀爬的耐力将根据角度不同而改变
-		// rotX ∈ [0,180) x = rotX
-		// rotX ∈ [180,360) x = rotX - 360.0
-		// x >= 0 y = -x + 10
-		// x < 0 y = -2x + 10
-		// rotX req.Rot.X
-		// y 消耗的耐力修正值
-		// base(-100) + y 消耗的耐力
-		var x int32
-		var costRevise int32 // 攀爬耐力修正值
-		if req.Rot.X >= 0 && req.Rot.X < 180 {
-			x = int32(req.Rot.X)
-		} else if req.Rot.X >= 180 && req.Rot.X < 360 {
-			x = int32(req.Rot.X - 360.0)
-		}
-		if x >= 0 {
-			costRevise = -x + 10
+		var angleRevise int32 // 角度修正值 归一化为-90到+90范围内的角
+		// rotX ∈ [0,90) angle = rotX
+		// rotX ∈ (270,360) angle = rotX - 360.0
+		if req.Rot.X >= 0 && req.Rot.X < 90 {
+			angleRevise = int32(req.Rot.X)
+		} else if req.Rot.X > 270 && req.Rot.X < 360 {
+			angleRevise = int32(req.Rot.X - 360.0)
 		} else {
-			costRevise = -(x * 2) + 10
+			logger.LOG.Error("invalid rot x angle: %v", req.Rot.X)
 		}
-		//logger.LOG.Debug("stamina climbing, rotX: %v, costRevise: %v, cost: %v", req.Rot.X, costRevise, constant.StaminaCostConst.CLIMBING_BASE+costRevise)
-		g.UpdateStamina(player, constant.StaminaCostConst.CLIMBING_BASE+costRevise)
+		// 攀爬耐力修正曲线
+		// angle >= 0 cost = -x + 10
+		// angle < 0 cost = -2x + 10
+		var costRevise int32 // 攀爬耐力修正值 在基础消耗值的水平上增加或减少
+		if angleRevise >= 0 {
+			// 普通或垂直斜坡
+			costRevise = -angleRevise + 10
+		} else {
+			// 倒三角 非常消耗体力
+			costRevise = -(angleRevise * 2) + 10
+		}
+		logger.LOG.Debug("stamina climbing, rotX: %v, costRevise: %v, cost: %v", req.Rot.X, costRevise, constant.StaminaCostConst.CLIMBING_BASE-costRevise)
+		g.UpdateStamina(player, constant.StaminaCostConst.CLIMBING_BASE-costRevise)
 	case proto.MotionState_MOTION_STATE_SWIM_MOVE:
 		// 缓慢游泳
 		g.UpdateStamina(player, constant.StaminaCostConst.SWIMMING)

gs/game/world_manager.go

@@ -135,6 +135,7 @@ func (w *World) CreateScene(sceneId uint32) *Scene {
 		gameTime:            18 * 60,
 		attackQueue:         alg.NewRAQueue[*Attack](1000),
 		createTime:          time.Now().UnixMilli(),
+		meeoIndex:           0,
 	}
 	w.sceneMap[sceneId] = scene
 	return scene
@@ -169,6 +170,7 @@ type Scene struct {
 	gameTime            uint32
 	attackQueue         *alg.RAQueue[*Attack]
 	createTime          int64
+	meeoIndex           uint32
 }
 
 type AvatarEntity struct {