From 8d06932ebf186837e048da4822bd837dbf90e212 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ViewOtherPlayer
---
Core/ResModule/AnimatorControllerLoader.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Core/ResModule/AnimatorControllerLoader.cs b/Core/ResModule/AnimatorControllerLoader.cs
index 8151413..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;
@@ -54,7 +54,7 @@
public static RuntimeAnimatorController Load(string suffix, int id)
{
RuntimeAnimatorController _controller = null;
- ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
+ ModelResConfig _modelRes = ModelResConfig.Get(id);
string _name = _modelRes.ResourcesName;
if (_name.IndexOf('/') != -1)
{
--
Gitblit v1.8.0