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

client_Wu Xijin

2018-08-29 187beabf127b94f601a73365c84546e689b2dcbe

 Assets/Editor/Actor/ResourcesBuilder.cs

@@ -108,13 +108,18 @@


    protected static List<MountPointInfo> m_MountPointInfoList = new List<MountPointInfo>();



    public void BuildPrefab(string path, string resName, string suffix)

    public void BuildPrefab(string path, string resName, string suffix, string outName = null)

    {

        if (string.IsNullOrEmpty(outName))

        {

            outName = resName;

        }



        string _absOriginalePath = string.Format("{0}/ART/Role/{1}/{2}.FBX", Application.dataPath, path, resName);

        string _originalAssetPath = string.Format("Assets/ART/Role/{0}/{1}.FBX", path, resName);



        string _absAssetPath = string.Format("{0}Mob/{1}{2}.prefab", ResourcesPath.ResourcesOutPath, suffix, resName);

        string _assetPath = string.Format("{0}Mob/{1}{2}.prefab", ResourcesPath.ResourcesOutAssetPath, suffix, resName);

        string _absAssetPath = string.Format("{0}Mob/{1}{2}.prefab", ResourcesPath.ResourcesOutPath, suffix, outName);

        string _assetPath = string.Format("{0}Mob/{1}{2}.prefab", ResourcesPath.ResourcesOutAssetPath, suffix, outName);



        string _acAbsAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutPath, path, AnimatorControllerLoader.controllerSuffix, path);

        string _acAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutAssetPath, path, AnimatorControllerLoader.controllerSuffix, path);

@@ -243,10 +248,12 @@
        }



        // 加载特效

        if (InstanceResourcesLoader.horseSuffix.Equals(suffix)

         || resName.Contains("B_Cw"))

        if (outName.StartsWith("M")

         || outName.StartsWith("N")

         || outName.StartsWith("B_")

         || outName.StartsWith("Zq"))

        {

            HandlerModelEffect("horseEffectConfig", null, resName, ref _prefab);

            HandlerModelEffect("horseEffectConfig", null, outName, ref _prefab);

        }

        else if (InstanceResourcesLoader.raceSuffix.Equals(suffix))

        {

@@ -491,8 +498,13 @@
        AssetDatabase.Refresh();

    }



    public static void BuildAnimatorController(string resName, string templeName, string configName)

    public static void BuildAnimatorController(string resName, string templeName, string configName, string outName = null)

    {

        if (string.IsNullOrEmpty(outName))

        {

            outName = resName;

        }



        string _absAssetPath = string.Format("{0}Mob/{1}", ResourcesPath.ResourcesOutPath, resName);



        if (!Directory.Exists(_absAssetPath))

@@ -500,9 +512,9 @@
            Directory.CreateDirectory(_absAssetPath);

        }



        _absAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutPath, resName, AnimatorControllerLoader.controllerSuffix, resName);

        _absAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutPath, resName, AnimatorControllerLoader.controllerSuffix, outName);



        string _assetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutAssetPath, resName, AnimatorControllerLoader.controllerSuffix, resName);

        string _assetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutAssetPath, resName, AnimatorControllerLoader.controllerSuffix, outName);

        if (templeName.Equals("Temple_AnimatorController_BossShow"))

        {

            _absAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutPath, resName, AnimatorControllerLoader.controllerShowSuffix, resName);