Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 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"))

        {