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/GameObjectPoolManager.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Core/ResModule/GameObjectPoolManager.cs b/Core/ResModule/GameObjectPoolManager.cs
index 9328f08..6990b5d 100644
--- a/Core/ResModule/GameObjectPoolManager.cs
+++ b/Core/ResModule/GameObjectPoolManager.cs
@@ -101,7 +101,7 @@
string _assetName;
string _assetBundleName;
- NPCConfig _m = ConfigManager.Instance.GetTemplate<NPCConfig>(npcID);
+ NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID);
if (_m == null || _m.MODE.Equals("0"))
{
@@ -274,7 +274,7 @@
string _assetName;
string _assetBundleName;
- NPCConfig _m = ConfigManager.Instance.GetTemplate<NPCConfig>(npcID);
+ NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID);
if (_m == null || _m.MODE.Equals("0"))
{
--
Gitblit v1.8.0