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

client_linchunjie

2018-12-22 b8e548aa31670758b034026839b4be1c37daa560

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

 Fight/GameActor/GA_NpcCollect.cs

@@ -78,6 +78,23 @@
        base.OnPrefabLoadFinished(result, prefab);

    }



    protected override void OnMainModelLoaded()

    {

        base.OnMainModelLoaded();



        if (m_Model)

        {

            if (NpcConfig.NPCID == 33409001)

            {

                m_Model.transform.localPosition = new Vector3(0,0.132f,0);

            }

            else if (NpcConfig.NPCID == 33409002)

            {

                m_Model.transform.localPosition = new Vector3(0,0.142f,0);

            }

        }

    }



    protected sealed override void HandleNpcConfig(int npcID)

    {

        if (npcID == 10404100)