Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 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;