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/ItemDrop/DropItem.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/ItemDrop/DropItem.cs b/System/ItemDrop/DropItem.cs
index ae11dad..211b966 100644
--- a/System/ItemDrop/DropItem.cs
+++ b/System/ItemDrop/DropItem.cs
@@ -40,7 +40,7 @@
public static DropItemType ItemToDropType(int _id)
{
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var itemConfig = Config.Instance.Get<ItemConfig>(_id);
if (itemConfig != null)
{
@@ -97,7 +97,7 @@
camera = _camera;
autoPickUp = false;
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var itemConfig = Config.Instance.Get<ItemConfig>(_id);
m_ItemName.text = itemConfig.ItemName;
m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor);
@@ -119,7 +119,7 @@
autoPickUp = true;
dispearTime = Time.time + _disapearDelay;
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_id);
+ var itemConfig = Config.Instance.Get<ItemConfig>(_id);
m_ItemName.text = itemConfig.ItemName;
m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor);
@@ -157,7 +157,7 @@
{
if (hasAppearCount < GeneralConfig.Instance.maxItemDropEffectCount)
{
- var _itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(id);
+ var _itemConfig = Config.Instance.Get<ItemConfig>(id);
if (_itemConfig == null)
{
--
Gitblit v1.8.0