update

client_Hale

2018-08-24 ce879195e733a44e97c5b92eae51c1e77e98cbd4

update

 Fight/Actor/State/SMB/SMB_Base.cs

@@ -128,24 +128,36 @@
            _pullPosition = _hit.position;

        }



        // 只认主角导致的推逻辑. 如果是其他人的退不认

        if (target is GActorNpcFight)

        {

            if (attacker is GA_Player)

            {

                return;

            }

        }



        if (GActor.TryGetValidPos(_pullPosition, ref _checkPos))

        {

            if (target.ActorType == GameObjType.gotPlayer)

            {

                GActorPlayerBase _player = target as GActorPlayerBase;

                //Debug.Log("--------------------------- 8");

                if (_player.MovingState != E_MovingState.Ride)

                if (target is GA_Hero)

                {

                    // Debug.LogFormat("{0} attack {1} ==================== 9", attacker.GetType().ToString(), target.GetType().ToString());

                    CB402_tagCMNPCBeatBack _beatBack = new CB402_tagCMNPCBeatBack();

                    _beatBack.ObjType = (byte)GameObjType.gotPlayer;

                    _beatBack.Count = 1;

                    _beatBack.NPCPosList = new CB402_tagCMNPCBeatBack.tagCMNPCPos[1];

                    _beatBack.NPCPosList[0] = new CB402_tagCMNPCBeatBack.tagCMNPCPos();

                    _beatBack.NPCPosList[0].ObjID = (uint)target.ServerInstID;

                    _beatBack.NPCPosList[0].PosX = (ushort)(_checkPos.x * 2f + GA_Hero.MapOffset.x);

                    _beatBack.NPCPosList[0].PosY = (ushort)(_checkPos.z * 2f + GA_Hero.MapOffset.x);

                    GameNetSystem.Instance.SendInfo(_beatBack);

                    GActorPlayerBase _player = target as GActorPlayerBase;

                    //Debug.Log("--------------------------- 8");

                    if (_player.MovingState != E_MovingState.Ride)

                    {

                        // Debug.LogFormat("{0} attack {1} ==================== 9", attacker.GetType().ToString(), target.GetType().ToString());

                        CB402_tagCMNPCBeatBack _beatBack = new CB402_tagCMNPCBeatBack();

                        _beatBack.ObjType = (byte)GameObjType.gotPlayer;

                        _beatBack.Count = 1;

                        _beatBack.NPCPosList = new CB402_tagCMNPCBeatBack.tagCMNPCPos[1];

                        _beatBack.NPCPosList[0] = new CB402_tagCMNPCBeatBack.tagCMNPCPos();

                        _beatBack.NPCPosList[0].ObjID = (uint)target.ServerInstID;

                        _beatBack.NPCPosList[0].PosX = (ushort)(_checkPos.x * 2f + GA_Hero.MapOffset.x);

                        _beatBack.NPCPosList[0].PosY = (ushort)(_checkPos.z * 2f + GA_Hero.MapOffset.z);

                        GameNetSystem.Instance.SendInfo(_beatBack);

                    }

                }

                //else

                //{

@@ -157,8 +169,8 @@
                NPCPos _npcPos = new NPCPos

                {

                    objId = (int)target.ServerInstID,

                    posX = (int)(_checkPos.x * 2f),

                    posY = (int)(_checkPos.z * 2f)

                    posX = (int)(_checkPos.x * 2f + GA_Hero.MapOffset.x),

                    posY = (int)(_checkPos.z * 2f + GA_Hero.MapOffset.z)

                };

                npcPosList.Add(_npcPos);

            }


 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -618,8 +618,7 @@
                                                  _target.ActorInfo.serverDie && m_IsLastHitFrame);



                if (!_target.ActorInfo.serverDie

                 && m_CacheSkill.hurtServerList[i].AttackType != (byte)HurtAttackType.Miss

                 && _target.ServerInstID != PlayerDatas.Instance.PlayerId)

                 && m_CacheSkill.hurtServerList[i].AttackType != (byte)HurtAttackType.Miss)

                {

                    AddToNpcPosList(_fight, _target, _sweepHit.bodyControlId, (_target.Pos - owner.Pos).normalized, m_NpcPosList);

                }

@@ -658,8 +657,7 @@




                if (!_target.ActorInfo.serverDie

                 && m_CacheSkill.hurtClientList[i].AttackType != (byte)HurtAttackType.Miss

                 && _target.ServerInstID != PlayerDatas.Instance.PlayerId)

                 && m_CacheSkill.hurtClientList[i].AttackType != (byte)HurtAttackType.Miss)

                {

                    AddToNpcPosList(_fight, _target, _sweepHit.bodyControlId, (_target.Pos - owner.Pos).normalized, m_NpcPosList);

                }