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/TeamModel.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index ded05e6..63e50de 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -120,7 +120,7 @@
if (m_IsMatching == false)
{
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(myTeam.mission.mapId);
+ var mapConfig = Config.Instance.Get<MapConfig>(myTeam.mission.mapId);
if (mapConfig != null && (MapType)mapConfig.MapFBType == MapType.MultipleFB)
{
if (myTeam.iamCaptainer && myTeam.memberCount >= 4)
@@ -243,7 +243,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");
@@ -260,7 +260,7 @@
if (dungeonId != 0)
{
- var dungeonConfig = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);
+ var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
limitLevelMin = dungeonConfig.LVLimitMin;
limitLevelMax = dungeonConfig.LVLimitMax;
}
@@ -352,12 +352,12 @@
var missionName = string.Empty;
if (dungeonId == 0)
{
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var config = Config.Instance.Get<MapConfig>(mapId);
missionName = config.Name;
}
else
{
- var config = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);
+ var config = Config.Instance.Get<DungeonConfig>(dungeonId);
missionName = config.FBName;
}
@@ -519,7 +519,7 @@
if (_mission != myTeam.mission)
{
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (_mission.mapId == 0)
{
if (mapConfig.MapFBType == (int)MapType.OpenCountry)
@@ -531,7 +531,7 @@
else
{
var dungeonId = ModelCenter.Instance.GetModel<DungeonModel>().DungeonMap(_mission.mapId, _mission.mapEx);
- var dungeonConfig = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);
+ var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
minLevel = dungeonConfig.LVLimitMin;
maxLevel = dungeonConfig.LVLimitMax;
}
@@ -987,7 +987,7 @@
else
{
var dungeonId = dungeonModel.DungeonMap(_mapId, _mapEx);
- var dungeonConfig = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);
+ var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
return PlayerDatas.Instance.baseData.LV >= dungeonConfig.LVLimitMin;
}
}
@@ -1077,7 +1077,7 @@
teammissions[NONE_MISSION] = new List<int>() { 0 };
teammissions[CURRENTMAP_MISSION] = new List<int>() { 0 };
- var allTeamTargets = ConfigManager.Instance.GetAllValues<TeamTargetConfig>();
+ var allTeamTargets = Config.Instance.GetAllValues<TeamTargetConfig>();
foreach (var config in allTeamTargets)
{
List<int> missionGroup;
@@ -1127,7 +1127,7 @@
public void OnMapInitOk()
{
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (mapConfig != null && mapConfig.MapFBType == (int)MapType.OpenCountry)
{
lastOpenCountryMapRecorder = PlayerDatas.Instance.baseData.MapID;
--
Gitblit v1.8.0