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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Core/ResModule/AnimatorControllerLoader.cs b/Core/ResModule/AnimatorControllerLoader.cs
index 63e84b8..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)
{
@@ -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;
--
Gitblit v1.8.0