Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 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");