From 73ff3d4d816ee35c15ad951af13cb9dfd85f4ca2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 24 四月 2019 11:44:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/ClientCollectUtility.cs |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Fight/ClientCollectUtility.cs b/Fight/ClientCollectUtility.cs
index 53c6d9b..4acdc5f 100644
--- a/Fight/ClientCollectUtility.cs
+++ b/Fight/ClientCollectUtility.cs
@@ -110,11 +110,19 @@
                 if (_list != null)
                 {
                     _list.Sort((a1, a2) =>
-                                    {
-                                        var _d1 = MathUtility.DistanceSqrtXZ(a1.Pos, _hero.Pos);
-                                        var _d2 = MathUtility.DistanceSqrtXZ(a2.Pos, _hero.Pos);
-                                        return _d2 < _d1 ? 1 : -1;
-                                    });
+                    {
+                        var _d1 = MathUtility.DistanceSqrtXZ(a1.Pos, _hero.Pos);
+                        var _d2 = MathUtility.DistanceSqrtXZ(a2.Pos, _hero.Pos);
+                        if (_d1 > _d2)
+                        {
+                            return 1;
+                        }
+                        else if (_d1 < _d2)
+                        {
+                            return -1;
+                        }
+                        return 0;
+                    });
 
                     foreach (var _a in _list)
                     {
@@ -123,8 +131,10 @@
                             continue;
                         }
 
-                        _npc = _a as GA_NpcClientCollect;
-                        break;
+                        if (_npc == null)
+                        {
+                            _npc = _a as GA_NpcClientCollect;
+                        }
                     }
                 }
             }

--
Gitblit v1.8.0