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

client_Zxw

2018-08-13 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9

 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();

        }