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/MainInterfacePanel/PlayerBuffDatas.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerBuffDatas.cs b/System/MainInterfacePanel/PlayerBuffDatas.cs
index 4fff30b..44775d7 100644
--- a/System/MainInterfacePanel/PlayerBuffDatas.cs
+++ b/System/MainInterfacePanel/PlayerBuffDatas.cs
@@ -104,7 +104,7 @@
{
multipleF = (operation as OperationMultiExp).multiple / 10000;
}
- var skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(20048);
+ var skillconfig = Config.Instance.Get<SkillConfig>(20048);
if (_BuffDic.ContainsKey(20048))
{
_BuffDic[20048].LastTime = seconds;
@@ -191,7 +191,7 @@
{
if (vipModel.GetVipPrivilegeCnt(VipPrivilegeType.KillMonsterExpUp) == 3000)
{
- var skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(20044);
+ var skillconfig = Config.Instance.Get<SkillConfig>(20044);
//var _timeSpan = vipModel.vipOverdue - TimeUtility.ServerNow;
if (_BuffDic.ContainsKey(20044))
{
@@ -238,8 +238,8 @@
}
public void ObjAddBuff(H0605_tagObjAddBuff info)//buff澧炲姞
{
- int _Type = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).SkillType;
- if (TypeJudgment(_Type) && info.ObjID == PlayerDatas.Instance.baseData.PlayerID && ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).BuffDisplay == 0)
+ int _Type = Config.Instance.Get<SkillConfig>(info.SkillID).SkillType;
+ if (TypeJudgment(_Type) && info.ObjID == PlayerDatas.Instance.baseData.PlayerID && Config.Instance.Get<SkillConfig>(info.SkillID).BuffDisplay == 0)
{
if (_BuffDic.ContainsKey((int)info.SkillID))
@@ -251,10 +251,10 @@
ObjBuff.SkillID = (int)info.SkillID;
ObjBuff.LastTime = ((int)info.LastTime / 1000);
ObjBuff._dattTime = DateTime.Now;
- ObjBuff.ImagKey = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).IconName;
- ObjBuff.BuffName = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).SkillName;
- ObjBuff.BuffConent = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).BuffDescription;
- ObjBuff.SkillTypeID = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).SkillTypeID;
+ ObjBuff.ImagKey = Config.Instance.Get<SkillConfig>(info.SkillID).IconName;
+ ObjBuff.BuffName = Config.Instance.Get<SkillConfig>(info.SkillID).SkillName;
+ ObjBuff.BuffConent = Config.Instance.Get<SkillConfig>(info.SkillID).BuffDescription;
+ ObjBuff.SkillTypeID = Config.Instance.Get<SkillConfig>(info.SkillID).SkillTypeID;
ObjBuff.Layer = (int)info.Layer;
}
else
@@ -266,10 +266,10 @@
_ObjBuff.SkillID = (int)info.SkillID;
_ObjBuff.LastTime = ((int)info.LastTime / 1000);
_ObjBuff._dattTime = DateTime.Now;
- _ObjBuff.ImagKey = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).IconName;
- _ObjBuff.BuffName = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).SkillName;
- _ObjBuff.BuffConent = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).BuffDescription;
- _ObjBuff.SkillTypeID = ConfigManager.Instance.GetTemplate<SkillConfig>(info.SkillID).SkillTypeID;
+ _ObjBuff.ImagKey = Config.Instance.Get<SkillConfig>(info.SkillID).IconName;
+ _ObjBuff.BuffName = Config.Instance.Get<SkillConfig>(info.SkillID).SkillName;
+ _ObjBuff.BuffConent = Config.Instance.Get<SkillConfig>(info.SkillID).BuffDescription;
+ _ObjBuff.SkillTypeID = Config.Instance.Get<SkillConfig>(info.SkillID).SkillTypeID;
_ObjBuff.Layer = (int)info.Layer;
_BuffDic.Add((int)info.SkillID, _ObjBuff);
}
@@ -320,7 +320,7 @@
bool TypeJudgment(int _buffType)
{
- string[] _BuffList = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BuffType").Numerical1.Split('|');
+ string[] _BuffList = Config.Instance.Get<FuncConfigConfig>("BuffType").Numerical1.Split('|');
for (int i = 0; i < _BuffList.Length; i++)
{
if (_buffType == int.Parse(_BuffList[i]))
@@ -331,8 +331,8 @@
public bool BuffCover(int _itemId)
{
- var configItem = ConfigManager.Instance.GetTemplate<ItemConfig>(_itemId);
- var skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(configItem.AddSkill1);
+ var configItem = Config.Instance.Get<ItemConfig>(_itemId);
+ var skillconfig = Config.Instance.Get<SkillConfig>(configItem.AddSkill1);
if (skillconfig != null && skillconfig.SkillType == 9)
{
if (_BuffDic.ContainsKey(configItem.AddSkill1))
@@ -364,7 +364,7 @@
}
if (getWorldLV != 0 && worldExpRate>0)
{
- var skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(20047);
+ var skillconfig = Config.Instance.Get<SkillConfig>(20047);
if (_BuffDic.ContainsKey(20047))
{
_BuffDic[20047].LastTime = 0;
@@ -392,16 +392,16 @@
public bool BastBuff(int Item)//鍒ゆ柇韬笂鏄惁鏈夋洿濂界殑缁忛獙BUff
{
- var configItem = ConfigManager.Instance.GetTemplate<ItemConfig>(Item);
- var skillconfig = ConfigManager.Instance.GetTemplate<SkillConfig>(configItem.AddSkill1);
- int SkillTypeID = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("IntroductionItem").Numerical2);
+ var configItem = Config.Instance.Get<ItemConfig>(Item);
+ var skillconfig = Config.Instance.Get<SkillConfig>(configItem.AddSkill1);
+ int SkillTypeID = int.Parse(Config.Instance.Get<FuncConfigConfig>("IntroductionItem").Numerical2);
DebugEx.Log("璇峰痉榫欑潄寮�鐪肩潧璇磋瘽.........");
if (skillconfig.SkillTypeID == SkillTypeID)
{
int buffLv = 0;
foreach (var key in _BuffDic.Keys)
{
- var skillCon = ConfigManager.Instance.GetTemplate<SkillConfig>(key);
+ var skillCon = Config.Instance.Get<SkillConfig>(key);
if (skillCon.SkillTypeID == SkillTypeID && skillCon.SkillLV> buffLv)
{
buffLv = skillCon.SkillLV;
--
Gitblit v1.8.0