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/OSAchieveCell.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OSAchieveCell.cs b/System/OpenServerActivity/OSAchieveCell.cs
index 7529b65..30b808a 100644
--- a/System/OpenServerActivity/OSAchieveCell.cs
+++ b/System/OpenServerActivity/OSAchieveCell.cs
@@ -40,14 +40,14 @@
OSRedEnvelopeModel.OSRedAchieve _achieve = model.m_OSRedAchieveDict[_key];
if (_achieve != null)
{
- var _cfg = ConfigManager.Instance.GetTemplate<OSRedAchieveConfig>(_achieve.id);
+ var _cfg = Config.Instance.Get<OSRedAchieveConfig>(_achieve.id);
m_AchieveIcon.SetSprite(_cfg.Icon);
m_AchieveName.text = _cfg.typeName;
m_AchiveGoto.onClick.RemoveAllListeners();
m_RedPack.onClick.RemoveAllListeners();
var _currentAchieve = _achieve.CurrentAchieve;
bool _isReach = false;
- var _achieveCfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(_currentAchieve);
+ var _achieveCfg = Config.Instance.Get<SuccessConfig>(_currentAchieve);
Achievement achievement;
if (achieveModel.TryGetAchievement(_currentAchieve, out achievement))
{
--
Gitblit v1.8.0