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

client_Wu Xijin

2019-06-27 cce0c7178937e6ad90325733eb2414e82c27bb2d

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

 Fight/Actor/AI/HeroAI_Base.cs

@@ -250,9 +250,10 @@
                            if (_singleModel != null)

                            {

                                // 如果有守护

                                var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);

                                if (_itemModel != null // 有守护

                                 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能

                                var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));

                                var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);

                                if (_guard != null // 有守护

                                 && GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能

                                {

                                    _needPickupSelf = false;

                                }

@@ -265,9 +266,10 @@
                        if (_singleModel != null)

                        {

                            // 如果有守护

                            var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);

                            if (_itemModel != null // 有守护

                             && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能

                            var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));

                            var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);

                            if (_guard != null // 有守护

                             && GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能

                            {

                                _needPickupSelf = false;

                            }


 Fight/Actor/AI/HeroAI_D7_ZMSL.cs

@@ -75,7 +75,7 @@


        float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, m_PointList[0]);



        if (_chkDistSqrt < 64)

        if (_chkDistSqrt < 64 && m_PointList.Count > 1)

        {

            m_PointList.RemoveAt(0);

        }