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/Team/TeamTargetJoinLimitWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Team/TeamTargetJoinLimitWin.cs b/System/Team/TeamTargetJoinLimitWin.cs
index e8f5ded..e80ac3b 100644
--- a/System/Team/TeamTargetJoinLimitWin.cs
+++ b/System/Team/TeamTargetJoinLimitWin.cs
@@ -101,7 +101,7 @@
}
else if (dungeonId != 0)
{
- var dungeonConfig = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);
+ var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
if (model.targetPreferences.ContainsKey(dungeonId))
{
var target = model.targetPreferences[dungeonId];
@@ -191,7 +191,7 @@
if (mapId == 31110)
{
- var config = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
+ var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
if (config.IsBigRealm != 1 || !ModelCenter.Instance.GetModel<RealmModel>().IsDungeonState)
{
SysNotifyMgr.Instance.ShowTip("NOGreatBourn");
--
Gitblit v1.8.0