Merge branch 'master' into leonard

client_Wu Xijin

2018-11-05 1cee93d63f19fd4e961b47f23cfa7621833e7d7f

 Assets/Editor/Actor/ModelResourcesBuilder.cs

@@ -130,7 +130,12 @@
    }

    protected override void OnSetupRenderer(string path, string resName, ref Renderer renderer)
    {
    {//Assets/ART/Role/A_Zs_Sb/Materials/A_Zs05_Sb.mat
        if (path.EndsWith("_Sb"))
        {
            path = path.Replace("_Sb", "");
            resName = resName.Replace("_Sb", "");
        }
        string _materialPath = string.Format("Assets/ART/Role/{0}/Materials/{1}.mat", path, resName);

        Material _material = AssetDatabase.LoadAssetAtPath<Material>(_materialPath);