From 5cbd8428a42e5d7a61148e19876f48004b1faa68 Mon Sep 17 00:00:00 2001
From: flswld <flswld@flswld.com>
Date: Sun, 2 Apr 2023 20:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E6=89=93?=
 =?UTF-8?q?=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gs/game/player_fight_sync.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gs/game/player_fight_sync.go b/gs/game/player_fight_sync.go
index 29b4bf27..63247b42 100644
--- a/gs/game/player_fight_sync.go
+++ b/gs/game/player_fight_sync.go
@@ -94,25 +94,24 @@ func (g *Game) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Messa
 	}
 	scene := world.GetSceneById(player.SceneId)
 	for _, entry := range req.InvokeList {
-		player.CombatInvokeHandler.AddEntry(entry.ForwardType, entry)
 		switch entry.ArgumentType {
 		case proto.CombatTypeArgument_COMBAT_EVT_BEING_HIT:
 			evtBeingHitInfo := new(proto.EvtBeingHitInfo)
 			err := pb.Unmarshal(entry.CombatData, evtBeingHitInfo)
 			if err != nil {
 				logger.Error("parse EvtBeingHitInfo error: %v", err)
-				continue
+				break
 			}
 			// logger.Debug("EvtBeingHitInfo: %v, ForwardType: %v", evtBeingHitInfo, entry.ForwardType)
 			attackResult := evtBeingHitInfo.AttackResult
 			if attackResult == nil {
 				logger.Error("attackResult is nil")
-				continue
+				break
 			}
 			target := scene.GetEntity(attackResult.DefenseId)
 			if target == nil {
 				logger.Error("could not found target, defense id: %v", attackResult.DefenseId)
-				continue
+				break
 			}
 			fightProp := target.GetFightProp()
 			currHp := fightProp[constant.FIGHT_PROP_CUR_HP]
@@ -133,7 +132,7 @@ func (g *Game) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Messa
 				gadgetDataConfig := gdconf.GetGadgetDataById(int32(gadgetEntity.GetGadgetId()))
 				if gadgetDataConfig == nil {
 					logger.Error("get gadget data config is nil, gadgetId: %v", gadgetEntity.GetGadgetId())
-					continue
+					break
 				}
 				logger.Debug("[EvtBeingHit] GadgetData: %+v, uid: %v", gadgetDataConfig, player.PlayerID)
 				// TODO 临时的解决方案
@@ -155,16 +154,16 @@ func (g *Game) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Messa
 			err := pb.Unmarshal(entry.CombatData, entityMoveInfo)
 			if err != nil {
 				logger.Error("parse EntityMoveInfo error: %v", err)
-				continue
+				break
 			}
 			// logger.Debug("EntityMoveInfo: %v, ForwardType: %v", entityMoveInfo, entry.ForwardType)
 			motionInfo := entityMoveInfo.MotionInfo
 			if motionInfo.Pos == nil || motionInfo.Rot == nil {
-				continue
+				break
 			}
 			sceneEntity := scene.GetEntity(entityMoveInfo.EntityId)
 			if sceneEntity == nil {
-				continue
+				break
 			}
 			if sceneEntity.GetEntityType() == constant.ENTITY_TYPE_AVATAR {
 				// 玩家实体在移动
@@ -240,7 +239,7 @@ func (g *Game) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Messa
 			err := pb.Unmarshal(entry.CombatData, evtAnimatorParameterInfo)
 			if err != nil {
 				logger.Error("parse EvtAnimatorParameterInfo error: %v", err)
-				continue
+				break
 			}
 			// logger.Debug("EvtAnimatorParameterInfo: %v, ForwardType: %v", evtAnimatorParameterInfo, entry.ForwardType)
 		case proto.CombatTypeArgument_COMBAT_ANIMATOR_STATE_CHANGED:
@@ -248,10 +247,11 @@ func (g *Game) CombatInvocationsNotify(player *model.Player, payloadMsg pb.Messa
 			err := pb.Unmarshal(entry.CombatData, evtAnimatorStateChangedInfo)
 			if err != nil {
 				logger.Error("parse EvtAnimatorStateChangedInfo error: %v", err)
-				continue
+				break
 			}
 			// logger.Debug("EvtAnimatorStateChangedInfo: %v, ForwardType: %v", evtAnimatorStateChangedInfo, entry.ForwardType)
 		}
+		player.CombatInvokeHandler.AddEntry(entry.ForwardType, entry)
 	}
 }