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

client_Zxw

2018-11-08 20a5a083fa7a718e1360f32c4f9e0872436e8a0a

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

 Fight/GameActor/GA_Guard.cs

@@ -152,6 +152,13 @@
                Object.DestroyImmediate(guardPickupItem);
            }
        }

        if (m_Model)
        {
            m_Model.transform.SetParent(m_Root);
            m_Model.transform.localPosition = Vector3.zero;
            m_Model.transform.localRotation = Quaternion.identity;
        }
    }

    public void InitBase()

 Fight/GameActor/GA_NpcTouchKilled.cs

@@ -34,6 +34,13 @@
        }

        GAStaticDefine.NpcID2ServerInstID[NpcConfig.NPCID] = ServerInstID;

        if (m_Model)
        {
            m_Model.transform.SetParent(m_Root);
            m_Model.transform.localPosition = Vector3.zero;
            m_Model.transform.localRotation = Quaternion.identity;
        }
    }

    protected override void OnUnit()