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
---
Fight/Actor/Skill/SkillHelper.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Fight/Actor/Skill/SkillHelper.cs b/Fight/Actor/Skill/SkillHelper.cs
index 4bba720..361febe 100644
--- a/Fight/Actor/Skill/SkillHelper.cs
+++ b/Fight/Actor/Skill/SkillHelper.cs
@@ -31,7 +31,7 @@
{
//Debug.LogFormat("# sp鎶�鑳絒{0}]鍙戠敓浜嗘敼鍙�: {1} #", skillTypeID, level);
int _skillID = skillTypeID + level - 1;
- SkillConfig _skill = ConfigManager.Instance.GetTemplate<SkillConfig>(_skillID);
+ SkillConfig _skill = Config.Instance.Get<SkillConfig>(_skillID);
//Debug.LogFormat("# -- 鍏宠仈鐨勬妧鑳絠d: {0}", _skill.ExAttr1);
// 鍏宠仈鐨勬妧鑳�
@@ -159,7 +159,7 @@
}
}
- config = ConfigManager.Instance.GetTemplate<SkillConfig>(skillID);
+ config = Config.Instance.Get<SkillConfig>(skillID);
if (config != null)
{
if (config.Effect1 > 0)
--
Gitblit v1.8.0