From efa5f8d07fc3321f6ac5f5d97fb422db28d0886f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 05 三月 2019 10:55:31 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
Core/ResModule/AnimatorControllerLoader.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Core/ResModule/AnimatorControllerLoader.cs b/Core/ResModule/AnimatorControllerLoader.cs
index 6f3ea41..c2602ea 100644
--- a/Core/ResModule/AnimatorControllerLoader.cs
+++ b/Core/ResModule/AnimatorControllerLoader.cs
@@ -1,5 +1,5 @@
锘縰sing 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)
{
@@ -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)
{
--
Gitblit v1.8.0