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/WorldMap/WorldMapAreaBehaviour.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/WorldMap/WorldMapAreaBehaviour.cs b/System/WorldMap/WorldMapAreaBehaviour.cs
index 20da437..d1a1f82 100644
--- a/System/WorldMap/WorldMapAreaBehaviour.cs
+++ b/System/WorldMap/WorldMapAreaBehaviour.cs
@@ -86,7 +86,7 @@
try
{
var unLocked = model.IsMapUnLocked(m_MapArea.id);
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(m_MapArea.id);
+ var mapConfig = Config.Instance.Get<MapConfig>(m_MapArea.id);
m_AreaName.text = mapConfig.Name;
m_AreaLevel.text = mapConfig.LV.ToString();
m_Locked.gameObject.SetActive(!unLocked);
@@ -164,7 +164,7 @@
{
if (AchievementGoto.guideAchievementId != 0)
{
- var config = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);
+ var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
if (config.Type == 37 && config.Condition[0] == m_MapArea.id)
{
var guideEffect = AchievementGuideEffectPool.Require(4);
--
Gitblit v1.8.0