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/Store/UnionStoreWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Store/UnionStoreWin.cs b/System/Store/UnionStoreWin.cs
index 8c0dae9..e806278 100644
--- a/System/Store/UnionStoreWin.cs
+++ b/System/Store/UnionStoreWin.cs
@@ -109,7 +109,7 @@
{
if (AchievementGoto.guideAchievementId != 0)
{
- SuccessConfig successConfig = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
if (successConfig.Type == 97)
{
p_shopItemlist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType);
@@ -186,7 +186,7 @@
{
shopItemCell.stateImage.gameObject.SetActive(false);
}
- ItemConfig chinModel = ConfigManager.Instance.GetTemplate<ItemConfig>(m_storeModel.ReplaceItemIdByJob(shopInfo.ID, shopInfo.ItemID));
+ ItemConfig chinModel = Config.Instance.Get<ItemConfig>(m_storeModel.ReplaceItemIdByJob(shopInfo.ID, shopInfo.ItemID));
if (chinModel != null)
{
ItemCellModel cellModel = new ItemCellModel(chinModel.ID,false, 0, shopInfo.IsBind);
--
Gitblit v1.8.0