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/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs b/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
index bf89a44..2435818 100644
--- a/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
+++ b/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
@@ -31,7 +31,7 @@
public void OnRoleSkillChange(H0310_tagRoleSkillChange vNetData)
{
- SkillConfig skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(vNetData.NewSkillID);
+ SkillConfig skillCfg = Config.Instance.Get<SkillConfig>(vNetData.NewSkillID);
if (skillCfg == null || (skillCfg.UseType != 0 && skillCfg.UseType != Math.Pow(2, PlayerDatas.Instance.baseData.Job)))
{
return;
@@ -135,7 +135,7 @@
{
return;
}
- FuncConfigConfig func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(string.Format("QuickJobSkill{0}", PlayerDatas.Instance.baseData.Job));
+ FuncConfigConfig func = Config.Instance.Get<FuncConfigConfig>(string.Format("QuickJobSkill{0}", PlayerDatas.Instance.baseData.Job));
if (func != null)
{
int[] intarray = ConfigParse.GetMultipleStr<int>(func.Numerical1);
@@ -275,7 +275,7 @@
List<int> list = null;
if (filterPlayerSkillDic.Count == 0)
{
- FuncConfigConfig funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("JobFitterSkill");
+ FuncConfigConfig funcCfg = Config.Instance.Get<FuncConfigConfig>("JobFitterSkill");
if (funcCfg != null)
{
int[] intarray = null;
@@ -356,7 +356,7 @@
{
_id = id;
- skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(id);
+ skillCfg = Config.Instance.Get<SkillConfig>(id);
_typeID = skillCfg.SkillTypeID;
}
--
Gitblit v1.8.0