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/Chat/ChatExtentWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Chat/ChatExtentWin.cs b/System/Chat/ChatExtentWin.cs
index 903b039..0f50bb4 100644
--- a/System/Chat/ChatExtentWin.cs
+++ b/System/Chat/ChatExtentWin.cs
@@ -85,7 +85,7 @@
{
_itemCell.items[i].gameObject.SetActive(true);
ItemModel _item = m_DisplayItems[index];
- ItemConfig itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>((int)_item.itemInfo.ItemID);
+ ItemConfig itemCfg = Config.Instance.Get<ItemConfig>((int)_item.itemInfo.ItemID);
_itemCell.items[i].Init(_item);
_itemCell.itemEquips[i].gameObject.SetActive(_item.packType == PackType.rptEquip);
_itemCell.items[i].cellBtn.onClick.RemoveAllListeners();
@@ -108,7 +108,7 @@
chatCenter.recentlyChat = null;
chatCenter.ChangeChatValue(string.Empty, false, false);
}
- ItemConfig _cfg = ConfigManager.Instance.GetTemplate<ItemConfig>((int)_item.itemInfo.ItemID);
+ ItemConfig _cfg = Config.Instance.Get<ItemConfig>((int)_item.itemInfo.ItemID);
string _showtext = StringUtility.Contact("[", _cfg.ItemName, "]");
ChatCtrl.Inst.itemPlaceList.Add(_item);
chatCenter.ChangeChatValue(_showtext, true, true);
--
Gitblit v1.8.0