Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-05-23 bcdcddadca0668dbec6a988b9f8044dcdd3a4adf

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Fight/Actor/HeroBehaviour.cs

@@ -898,6 +898,11 @@
            {

                _target = GAMgr.Instance.GetByCID(skill.hitClientBattleTargetList[i]) as GActorFight;



                if (PersonalEnemy.m_CBinSdDict.ContainsKey(_target.ServerInstID))

                {

                    continue;

                }



                AttackHandler.HurtObjs _hurtObject = new AttackHandler.HurtObjs

                {

                    ObjID = (uint)_target.ServerInstID,


 Fight/Actor/Skill/AttackHandler.cs

@@ -237,14 +237,14 @@


                    if (_doReduceHp)

                    {

                        if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)

                        {

                            target.ActorInfo.ReduceHp((uint)hurtValue);

                        }

                        else

                        {

                            target.ActorInfo.ReduceHp((uint)realHurtValue);

                        }

                        // if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)

                        // {

                        //     target.ActorInfo.ReduceHp((uint)hurtValue);

                        // }

                        // else

                        // {

                        target.ActorInfo.ReduceHp((uint)realHurtValue);

                        // }

                    }



                    if (target.ServerInstID == PlayerDatas.Instance.baseData.PlayerID)