Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Editor/Actor/NpcResourcesBuilder.cs

@@ -5,7 +5,7 @@

public class NpcResourcesBuilder : ResourcesBuilder
{
    public void BuildNpc(string modelName)
    public void BuildNpc(string modelName, string outName = null, int type = -1, bool isHighMesh = false)

    {
        if (modelName.Contains("A_Zs"))
        {
@@ -13,15 +13,19 @@
        }

        BuildAnimationClip1(modelName);
        BuildAnimatorController(modelName);
        BuildAnimatorController(modelName, outName, type);


        var showConfigs = ConfigManager.Instance.GetAllValues<ActorShowConfig>();
        var showConfigs = Config.Instance.GetAllValues<ActorShowConfig>();

        NPCConfig _npcModel = null;
        foreach (var _item in showConfigs)
        {
            for (int i = 0; i < _item.showNpcs.Length; i++)
            {
                _npcModel = ConfigManager.Instance.GetTemplate<NPCConfig>(_item.showNpcs[i]);
                if(_item.showNpcs[i] == 0)

                {

                    continue;

                }

                _npcModel = Config.Instance.Get<NPCConfig>(_item.showNpcs[i]);

                if (_npcModel == null)
                {
                    continue;
@@ -35,17 +39,33 @@
            }
        }

        BuildPrefab(modelName);
        var realmConfigs = Config.Instance.GetAllValues<RealmConfig>();

        foreach (var _realmConfig in realmConfigs)

        {

            _npcModel = Config.Instance.Get<NPCConfig>(_realmConfig.BossID);

            if (_npcModel == null)

            {

                continue;

    }

    public void BuildPrefab(string modelName)
            if (_npcModel.MODE.Equals(modelName))

            {

                BuildRealmAnimatorController(modelName);

                break;

            }

        }



        BuildPrefab(modelName, outName, isHighMesh);

    }



    public void BuildPrefab(string modelName, string outName, bool isHighMesh = false)

    {
        if (!IsBuildPrefab)
        {
            return;
        }

        BuildPrefab(modelName, modelName, InstanceResourcesLoader.raceSuffix);
        BuildPrefab(modelName, modelName, InstanceResourcesLoader.raceSuffix, outName, isHighMesh);

    }

    public void BuildAnimationClip1(string modelName)
@@ -58,20 +78,29 @@
        BuildAnimationClip(modelName);
    }

    public void BuildAnimatorController(string modelName)
    public void BuildAnimatorController(string modelName, string outName = null, int type = -1)

    {
        if (!IsBuildAnimatorController)
        if (!IsBuildAnimatorController && !IsBuildAnimatorUIController)

        {
            return;
        }

        if (modelName.Contains("B_Cw"))
        if (type <= 0)

        {
            BuildAnimatorController(modelName, "Temple_AnimatorController_Pet", "animatorBuildConfig");
            BuildAnimatorController(modelName, "Temple_AnimatorController_Mob", "animatorBuildConfig", outName);

        }
        else
        else if (type == 1)

        {
            BuildAnimatorController(modelName, "Temple_AnimatorController_Mob", "animatorBuildConfig");
            BuildAnimatorController(modelName, "Temple_AnimatorController_Pet", "animatorBuildConfig", outName);

        }

        else if (type == 2)

        {

            BuildAnimatorController(modelName, "Temple_AnimatorController_Horse", "animatorBuildConfig", outName);

        }



        if(ResourcesBuilder.IsBuildAnimatorUIController)

        {

            BuildAnimatorController(modelName, "Temple_AnimatorController_UI", "animatorBuildConfig", outName);

        }
    }

@@ -85,6 +114,16 @@
        BuildAnimatorController(modelName, "Temple_AnimatorController_BossShow", "animatorBuildConfig_BossShow");
    }

    public void BuildRealmAnimatorController(string modelName)

    {

        if (!IsBuildAnimatorController)

        {

            return;

        }



        BuildAnimatorController(modelName, "Temple_AnimatorController_Realm", "animatorBuildConfig_Realm");

    }



    protected override void OnSetupRenderer(string resPath, string resName, ref Renderer _renderer)
    {
        string _texturePath = string.Format("Assets/ART/Role/{0}/Materials/{1}.png", resPath, resName);