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/InstanceResourcesLoader.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Core/ResModule/InstanceResourcesLoader.cs b/Core/ResModule/InstanceResourcesLoader.cs
index 84239c8..4b04a5f 100644
--- a/Core/ResModule/InstanceResourcesLoader.cs
+++ b/Core/ResModule/InstanceResourcesLoader.cs
@@ -15,7 +15,7 @@
public static GameObject LoadNpc(int id)
{
- NPCConfig _m = ConfigManager.Instance.GetTemplate<NPCConfig>(id);
+ NPCConfig _m = Config.Instance.Get<NPCConfig>(id);
if (_m == null || string.IsNullOrEmpty(_m.MODE) || _m.MODE.Equals("0"))
{
@@ -51,7 +51,7 @@
public static GameObject LoadNpcPrefab(int npcID)
{
- NPCConfig _m = ConfigManager.Instance.GetTemplate<NPCConfig>(npcID);
+ NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID);
if (_m == null || _m.MODE.Equals("0"))
{
@@ -79,7 +79,7 @@
public static GameObject LoadModelRes(int id)
{
- ModelResConfig _m = ConfigManager.Instance.GetTemplate<ModelResConfig>(id);
+ ModelResConfig _m = Config.Instance.Get<ModelResConfig>(id);
if (_m == null)
{
@@ -228,7 +228,7 @@
{
GameObject _gameObject = null;
- EffectConfig _effectModel = ConfigManager.Instance.GetTemplate<EffectConfig>(id);
+ EffectConfig _effectModel = Config.Instance.Get<EffectConfig>(id);
if (_effectModel == null)
{
@@ -266,7 +266,7 @@
public static void LoadEffectAsync(int _id, Action<bool, UnityEngine.Object> _callBack)
{
GameObject gameObject = null;
- var config = ConfigManager.Instance.GetTemplate<EffectConfig>(_id);
+ var config = Config.Instance.Get<EffectConfig>(_id);
if (config == null)
{
return;
--
Gitblit v1.8.0