From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Team/TeamModel.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index a652817..90ea8d6 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -563,7 +563,7 @@
}
var minLevel = 1;
- var maxLevel = 1;
+ var maxLevel = GeneralConfig.Instance.playerMaxLevel;
if (_mission != myTeam.mission)
{
@@ -580,8 +580,11 @@
{
var dungeonId = ModelCenter.Instance.GetModel<DungeonModel>().GetDungeonId(_mission.mapId, _mission.mapEx);
var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
- minLevel = dungeonConfig.LVLimitMin;
- maxLevel = dungeonConfig.LVLimitMax;
+ if (dungeonConfig != null)
+ {
+ minLevel = dungeonConfig.LVLimitMin;
+ maxLevel = dungeonConfig.LVLimitMax;
+ }
}
missionBuf = _mission;
--
Gitblit v1.8.0