Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 Core/ResModule/AnimatorControllerLoader.cs

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


#if UNITY_EDITOR
using UnityEditor;
@@ -54,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)
        {