From 7cc84329c52b6e39cd979eb33a126e059b9bf36c Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期五, 03 八月 2018 21:07:11 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Fight/GameActor/GAMgr.cs | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index 389e2fa..99c355e 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -676,13 +676,32 @@
return null;
}
+ public GActor GetCloserFightNpc(Vector3 center)
+ {
+ List<GActor> _list = GetTypeList(E_ActorClassType.NpcFightNorm);
+
+ if (_list == null)
+ {
+ return null;
+ }
+
+ _list.Sort((GActor a1, GActor a2) =>
+ {
+ float _d1 = MathUtility.DistanceSqrtXZ(center, a1.Pos);
+ float _d2 = MathUtility.DistanceSqrtXZ(center, a2.Pos);
+ return _d1 < _d2 ? -1 : 1;
+ });
+
+ return _list[0];
+ }
+
/// <summary>
/// 鑾峰彇绂荤粰瀹氬潗鏍囨渶杩戠殑NPC瀵硅薄
/// </summary>
/// <param name="pos"></param>
/// <param name="npcID"></param>
/// <returns></returns>
- public GActor GetCloserNPC(Vector3 pos, int npcID)
+ public GActor GetCloserNPC(Vector3 pos, int npcID = 0)
{
m_AllList.Sort((GActor a1, GActor a2) =>
{
@@ -712,9 +731,13 @@
if (_npcConfig.NPCType == (int)E_NpcType.Fight)
{
GActorNpcFight _fight = m_AllList[i] as GActorNpcFight;
- if (_fight != null)
+ if (_fight != null && !_fight.ActorInfo.serverDie)
{
- if (_fight.NpcConfig.NPCID == npcID)
+ if (npcID == 0)
+ {
+ return _fight;
+ }
+ else if (_fight.NpcConfig.NPCID == npcID)
{
return _fight;
}
--
Gitblit v1.8.0