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/Message/RichTableEvent.cs | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/System/Message/RichTableEvent.cs b/System/Message/RichTableEvent.cs
index 6dfc59b..f2431a6 100644
--- a/System/Message/RichTableEvent.cs
+++ b/System/Message/RichTableEvent.cs
@@ -42,7 +42,7 @@
{
case RichTextEventEnum.SHOWITEM:
{
- ItemConfig cfg = ConfigManager.Instance.GetTemplate<ItemConfig>(href.mSplits["showitem"]);
+ ItemConfig cfg = Config.Instance.Get<ItemConfig>(href.mSplits["showitem"]);
if (cfg != null)
{
OnSingleClickItemCell(cfg.ID, href);
@@ -78,7 +78,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- ItemConfig cfg = ConfigManager.Instance.GetTemplate<ItemConfig>(id);
+ ItemConfig cfg = Config.Instance.Get<ItemConfig>(id);
if (cfg != null)
{
var _itemColor = cfg.ItemColor;
@@ -120,7 +120,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- NPCConfig cfg = ConfigManager.Instance.GetTemplate<NPCConfig>(id);
+ NPCConfig cfg = Config.Instance.Get<NPCConfig>(id);
if (cfg != null)
{
return cfg.charName;
@@ -133,7 +133,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- MapConfig cfg = ConfigManager.Instance.GetTemplate<MapConfig>(id);
+ MapConfig cfg = Config.Instance.Get<MapConfig>(id);
if (cfg != null)
{
return cfg.Name;
@@ -146,7 +146,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- SkillConfig cfg = ConfigManager.Instance.GetTemplate<SkillConfig>(id);
+ SkillConfig cfg = Config.Instance.Get<SkillConfig>(id);
if (cfg != null)
{
return cfg.SkillName;
@@ -159,7 +159,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- QuestionBankConfig cfg = ConfigManager.Instance.GetTemplate<QuestionBankConfig>(id);
+ QuestionBankConfig cfg = Config.Instance.Get<QuestionBankConfig>(id);
if (cfg != null)
{
return cfg.question;
@@ -172,7 +172,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- RuneTowerConfig cfg = ConfigManager.Instance.GetTemplate<RuneTowerConfig>(id);
+ RuneTowerConfig cfg = Config.Instance.Get<RuneTowerConfig>(id);
if (cfg != null)
{
return cfg.TowerName;
@@ -185,7 +185,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- RealmConfig _cfg = ConfigManager.Instance.GetTemplate<RealmConfig>(id);
+ RealmConfig _cfg = Config.Instance.Get<RealmConfig>(id);
if (_cfg != null)
{
var text = RichTextMgr.Inst.presentRichText;
@@ -204,7 +204,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- PetInfoConfig _cfg = ConfigManager.Instance.GetTemplate<PetInfoConfig>(id);
+ PetInfoConfig _cfg = Config.Instance.Get<PetInfoConfig>(id);
if (_cfg != null)
{
return GetTextColorByItemColor(_cfg.Name, _cfg.Quality, _dict);
@@ -217,7 +217,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- AlchemyConfig _cfg = ConfigManager.Instance.GetTemplate<AlchemyConfig>(id);
+ AlchemyConfig _cfg = Config.Instance.Get<AlchemyConfig>(id);
if (_cfg != null)
{
return _cfg.AlchemName;
@@ -230,7 +230,7 @@
int id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
{
- TreasureConfig _cfg = ConfigManager.Instance.GetTemplate<TreasureConfig>(id);
+ TreasureConfig _cfg = Config.Instance.Get<TreasureConfig>(id);
if (_cfg != null)
{
return _cfg.Name;
@@ -256,7 +256,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<SkillConfig>(_id);
+ var _cfg = Config.Instance.Get<SkillConfig>(_id);
if (_cfg != null)
{
return _cfg.BuffDescription;
@@ -269,7 +269,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_id);
+ var _cfg = Config.Instance.Get<PlayerPropertyConfig>(_id);
if (_cfg != null)
{
return _cfg.Name;
@@ -282,7 +282,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<HorseConfig>(_id);
+ var _cfg = Config.Instance.Get<HorseConfig>(_id);
if (_cfg != null)
{
return _cfg.Name;
@@ -295,7 +295,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(_id);
+ var _cfg = Config.Instance.Get<SuccessConfig>(_id);
if (_cfg != null)
{
return _cfg.Describe;
@@ -308,7 +308,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<OSRedAchieveConfig>(_id);
+ var _cfg = Config.Instance.Get<OSRedAchieveConfig>(_id);
if (_cfg != null)
{
return _cfg.typeName;
@@ -321,7 +321,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var _cfg = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(_id);
+ var _cfg = Config.Instance.Get<TreasurePrivilegeConfig>(_id);
if (_cfg != null)
{
return _cfg.Name;
@@ -334,16 +334,16 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var config = ConfigManager.Instance.GetTemplate<RuneTowerConfig>(_id + 1);
+ var config = Config.Instance.Get<RuneTowerConfig>(_id + 1);
if (config != null)
{
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.ProductRune);
+ var itemConfig = Config.Instance.Get<ItemConfig>(config.ProductRune);
return itemConfig.ItemName;
}
- var towerFloor = ConfigManager.Instance.GetTemplate<RuneTowerFloorConfig>(_id * 100 + 8);
+ var towerFloor = Config.Instance.Get<RuneTowerFloorConfig>(_id * 100 + 8);
if (config != null)
{
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(towerFloor.UnLockCompose);
+ var itemConfig = Config.Instance.Get<ItemConfig>(towerFloor.UnLockCompose);
return itemConfig.ItemName;
}
}
@@ -354,10 +354,10 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var config = ConfigManager.Instance.GetTemplate<RuneTowerFloorConfig>(_id);
+ var config = Config.Instance.Get<RuneTowerFloorConfig>(_id);
if (config != null)
{
- var towerConfig = ConfigManager.Instance.GetTemplate<RuneTowerConfig>(config.TowerId);
+ var towerConfig = Config.Instance.Get<RuneTowerConfig>(config.TowerId);
return StringUtility.Contact(towerConfig.TowerName, config.FloorName);
}
}
@@ -368,7 +368,7 @@
var _id = 0;
if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
{
- var config = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var config = Config.Instance.Get<ItemConfig>(_id);
if (config != null)
{
return StringUtility.Contact(GetItemColorChs(config.ItemColor), GetTextColorByItemColor(config.ItemName, config.ItemColor, _dict));
@@ -617,7 +617,7 @@
{
var _suitLv = _suit.suitDict[(int)_type];
int _item = GetItem(_suit.Index);
- var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_item);
+ var _itemCfg = Config.Instance.Get<ItemConfig>(_item);
if (_itemCfg == null)
{
continue;
@@ -645,7 +645,7 @@
public static int GetStrengthenType(int _id)
{
- var _itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var _itemCfg = Config.Instance.Get<ItemConfig>(_id);
var _type = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>().GameDefineIndex(_itemCfg.EquipPlace);
return _type;
}
--
Gitblit v1.8.0