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

client_Wu Xijin

2019-04-13 c67274ce67055c6e0e6acf8bff9d9a59bb9a203e

 Core/ResModule/AnimatorControllerLoader.cs

@@ -1,5 +1,5 @@
using UnityEngine;
using TableConfig;


#if UNITY_EDITOR
using UnityEditor;
@@ -11,6 +11,7 @@
    public static readonly string controllerSuffix = "AnimatorController_";
    public static readonly string controllerUISuffix = "AnimatorController_UI_";
    public static readonly string controllerShowSuffix = "AnimatorController_Show_";
    public static readonly string controllerRealmSuffix = "AnimatorController_Realm_";

    public static AnimationClip LoadAnimationClip(string name, string clipName)
    {
@@ -44,7 +45,7 @@

        if (_animationClip == null)
        {
            DesignDebug.LogErrorFormat("LoadAnimationClip.Load() => 加载不到资源: {0} => {1}.", name, clipName);
            DebugEx.LogErrorFormat("LoadAnimationClip.Load() => 加载不到资源: {0} => {1}.", name, clipName);
        }

        return _animationClip;
@@ -53,7 +54,7 @@
    public static RuntimeAnimatorController Load(string suffix, int id)
    {
        RuntimeAnimatorController _controller = null;
        ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
        ModelResConfig _modelRes = ModelResConfig.Get(id);
        string _name = _modelRes.ResourcesName;
        if (_name.IndexOf('/') != -1)
        {
@@ -90,7 +91,7 @@

        if (_controller == null)
        {
            DesignDebug.LogErrorFormat("AnimatorControllerLoader.Load() => 加载不到资源: {0}_{1}.", suffix, _name);
            DebugEx.LogErrorFormat("AnimatorControllerLoader.Load() => 加载不到资源: {0}_{1}.", suffix, _name);
        }

        return _controller;
@@ -127,7 +128,7 @@

        if (_controller == null)
        {
            DesignDebug.LogErrorFormat("AnimatorControllerLoader.Load() => 加载不到资源: {0}.", _name);
            DebugEx.LogErrorFormat("AnimatorControllerLoader.Load() => 加载不到资源: {0}.", _name);
        }

        return _controller;