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

client_linchunjie

2018-12-24 213d75495c44bee0174d738c3568a9ba149c87b6

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

 Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB403_tagMCAttackFail.cs

@@ -24,7 +24,7 @@
        {

            case AttackFailType.SkillFail_AtkInterval:

            case AttackFailType.SkillFail_CD:

                UnityEditor.EditorUtility.DisplayDialog("警告", "技能释放失败, 可以的话截图封包, 过滤填写 B405 0614 B403 . 发给黑二 .", "好的");

                //UnityEditor.EditorUtility.DisplayDialog("警告", "技能释放失败, 可以的话截图封包, 过滤填写 B405 0614 B403 . 发给黑二 .", "好的");

                break;

        }




 Fight/Actor/AI/HeroAI_Base.cs

@@ -173,13 +173,25 @@
    protected GActorFight DecideAttackTarget(Vector3 searchCenter, float range, int lockNpcID = -1)

    {

        GA_Hero _hero = PlayerDatas.Instance.hero;

        GActorFight _target = _hero.LockTarget as GActorFight;

        GActorFight _target = _hero.SelectTarget as GActorFight;



        if (_target == null || !_target.CanAtked() || _target.ActorInfo.serverDie)

        {

            _target = GAMgr.Instance.FindAtkTarget(searchCenter, range, 360, lockNpcID);

        }



        if (_target != null && lockNpcID != -1)

        {

            var _npcFight = _target as GActorNpcFight;

            if(_npcFight != null)

            {

                if(_npcFight.NpcConfig.NPCID != lockNpcID)

                {

                    _target = GAMgr.Instance.FindAtkTarget(searchCenter, range, 360, lockNpcID);

                }

            }

        }



        return _target;

    }




 Fight/Actor/AI/HeroAI_D2_LockMissionTarget.cs

@@ -29,7 +29,7 @@
        var _dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();

        _dungeonModel.updateMissionEvent += UpdateMissionEvent;



        m_HandupRange = 10;

        m_HandupRange = 50;

    }



    private void UpdateMissionEvent()

@@ -86,7 +86,12 @@


        if (randomNpcID.Count > 0)

        {

            m_LockTargetNpcID = randomNpcID[Random.Range(0, randomNpcID.Count - 1)];

            var _result = randomNpcID[Random.Range(0, randomNpcID.Count - 1)];

            if (m_LockTargetNpcID != _result)

            {

                m_LockTargetNpcID = _result;

                Debug.LogFormat("替换锁定的任务NPC: {0}", m_LockTargetNpcID);

            }

        }

    }




 Fight/GameActor/Bhv_FindEnemy.cs

@@ -96,6 +96,11 @@


            var _chkDis = reFindSelectTargetDist;



            if (PlayerDatas.Instance.baseData.MapID == 31340 && _hero.SelectTarget is GA_NpcCollect)

            {

                _chkDis += 1;

            }



            if (_distSqrt > Mathf.Pow(reFindSelectTargetDist, _chkDis))

            {

                _hero.SelectTarget = GAMgr.Instance.FindAtkTarget(_hero.Pos, reSetLockTargetDist);

@@ -270,6 +275,10 @@
            _hero.LockTarget = GAMgr.Instance.GetBySID(_bestTargetID);

            _hero.SelectTarget = _hero.LockTarget;

            m_SelectedTarget.Add(_bestTargetID);

            if (_hero.LockTarget != null)

            {

                GA_Hero.CallLockTargetChanged(_hero.LockTarget.ServerInstID);

            }

        }

    }




 Fight/GameActor/GA_Hero.cs

@@ -25,6 +25,14 @@
    /// 当切换锁定目标的时候, 为空的时候id=0

    /// </summary>

    public static event UnityAction<uint> OnLockTargetChanged;

    public static void CallLockTargetChanged(uint sid)

    {

        if (OnLockTargetChanged != null)

        {

            OnLockTargetChanged(sid);

        }

    }



    public static event UnityAction<uint, string> OnKillPlayer;



    private GameObject m_Light;

@@ -44,18 +52,6 @@
                return;

            }

            m_LockTarget = value;



            if (OnLockTargetChanged != null)

            {

                if (m_LockTarget != null)

                {

                    OnLockTargetChanged(m_LockTarget.ServerInstID);

                }

                else

                {

                    OnLockTargetChanged(0);

                }

            }

        }

    }



@@ -111,6 +107,7 @@
            {

                return;

            }



            IOtherSelectable _selectable = base.SelectTarget as IOtherSelectable;

            if (_selectable != null)

            {

@@ -446,7 +443,7 @@
                    {

                        var _dist = MathUtility.DistanceSqrtXZ(_collect.Pos, Pos);



                        if (_dist < 4)

                        if (_dist < 6)

                        {

                            if ((SelectTarget == null || SelectTarget is GA_NpcCollect) && SelectTarget != _collect)

                            {


 Fight/GameActor/GA_NpcFightNorm.cs

@@ -109,6 +109,7 @@
            // 设置锁定目标为此对象

            _hero.LockTarget = this;

            _hero.SelectTarget = this;

            GA_Hero.CallLockTargetChanged(ServerInstID);

        }

    }