From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
Core/ResModule/AnimatorControllerLoader.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Core/ResModule/AnimatorControllerLoader.cs b/Core/ResModule/AnimatorControllerLoader.cs
index 53d1f9f..8151413 100644
--- a/Core/ResModule/AnimatorControllerLoader.cs
+++ b/Core/ResModule/AnimatorControllerLoader.cs
@@ -54,7 +54,7 @@
public static RuntimeAnimatorController Load(string suffix, int id)
{
RuntimeAnimatorController _controller = null;
- ModelResConfig _modelRes = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _modelRes = Config.Instance.Get<ModelResConfig>(id);
string _name = _modelRes.ResourcesName;
if (_name.IndexOf('/') != -1)
{
--
Gitblit v1.8.0