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/OpenServerActivity/OSGiftBehaviour.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/OSGiftBehaviour.cs b/System/OpenServerActivity/OSGiftBehaviour.cs
index bcf0c6b..2bc822c 100644
--- a/System/OpenServerActivity/OSGiftBehaviour.cs
+++ b/System/OpenServerActivity/OSGiftBehaviour.cs
@@ -69,7 +69,7 @@
public void Display(int _id)
{
- var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(_id);
+ var _storeConfig = Config.Instance.Get<StoreConfig>(_id);
if (_storeConfig == null)
{
return;
@@ -118,7 +118,7 @@
private void OnBuyBtn()
{
- var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(storeId);
+ var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);
if (_storeConfig == null)
{
return;
@@ -158,7 +158,7 @@
private void OnItemClick(int _index)
{
- var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(storeId);
+ var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);
if (_storeConfig == null)
{
return;
--
Gitblit v1.8.0