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
---
System/MainWin/SkillContainer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/MainWin/SkillContainer.cs b/System/MainWin/SkillContainer.cs
index a207e47..55995c8 100644
--- a/System/MainWin/SkillContainer.cs
+++ b/System/MainWin/SkillContainer.cs
@@ -391,7 +391,7 @@
private void DoCastSkill(int skillID)
{
- SkillConfig _skillModel = ConfigManager.Instance.GetTemplate<SkillConfig>(skillID);
+ SkillConfig _skillModel = Config.Instance.Get<SkillConfig>(skillID);
if (_skillModel != null)
{
@@ -407,7 +407,7 @@
private void DoPrepareCast(int skillID)
{
- SkillConfig _skillModel = ConfigManager.Instance.GetTemplate<SkillConfig>(skillID);
+ SkillConfig _skillModel = Config.Instance.Get<SkillConfig>(skillID);
if (_skillModel != null)
{
@@ -429,7 +429,7 @@
{
if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
{
- var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
if (_skillId != 0)
{
--
Gitblit v1.8.0