From 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 13 八月 2018 15:27:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Fight/GameActor/GA_NpcCollect.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Fight/GameActor/GA_NpcCollect.cs b/Fight/GameActor/GA_NpcCollect.cs
index 9e0409d..33a1f92 100644
--- a/Fight/GameActor/GA_NpcCollect.cs
+++ b/Fight/GameActor/GA_NpcCollect.cs
@@ -125,13 +125,22 @@
         }
     }
 
+    public sealed override void RequestName()
+    {
+        base.RequestName();
+
+        if (m_ReplaceNpcID != -1)
+        {
+            m_HeadUpName.SetNPCName(m_ReplaceNpcID);
+        }
+    }
+
     protected override void OnInit(GameNetPackBasic package)
     {
         base.OnInit(package);
+
         if (m_ReplaceNpcID != -1)
         {
-            NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(m_ReplaceNpcID);
-            ActorInfo.PlayerName = _npcConfig.charName;
             RequestName();
         }
 

--
Gitblit v1.8.0