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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/ChatFrame.cs

@@ -44,7 +44,7 @@
        public void Init()

        {

            OneKeyList.Clear();

            var funconfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OneKeyBtnMap");

            var funconfig = Config.Instance.Get<FuncConfigConfig>("OneKeyBtnMap");

            int[] Listmap = ConfigParse.GetMultipleStr<int>(funconfig.Numerical1);

            for (int i = 0; i < Listmap.Length; i++)

            {

@@ -164,7 +164,7 @@
        private void GetRealmLevel()//关于境界

        {

            int realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(realmLevel);

            var realmConfig = Config.Instance.Get<RealmConfig>(realmLevel);

            if (FuncOpen.Instance.IsFuncOpen(12))

            {

                if (realmConfig != null && realmConfig.Lv > 0)

@@ -339,7 +339,7 @@
            if (OneKeyList.Contains(PlayerDatas.Instance.baseData.MapID))

            {

                var dataMapId = modelD.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID);

                var config = ConfigManager.Instance.GetTemplate<DungeonOpenTimeConfig>(dataMapId);

                var config = Config.Instance.Get<DungeonOpenTimeConfig>(dataMapId);

                string language = string.Empty;

                if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId)

                {

@@ -350,7 +350,7 @@
                    var vipLevel = PlayerDatas.Instance.baseData.VIPLv;

                    var vipNeed = bossHomeModel.GetFloorVipRequirement(PlayerDatas.Instance.baseData.dungeonLineId + 1);

                    var dungeonId = modelD.DungeonMap(dataMapId, PlayerDatas.Instance.baseData.dungeonLineId);

                    var dungeonConfig = ConfigManager.Instance.GetTemplate<DungeonConfig>(dungeonId);

                    var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);



                    if (vipLevel < vipNeed)

                    {

@@ -387,7 +387,7 @@
        {

            var mapModel = ModelCenter.Instance.GetModel<MapModel>();

            var point = mapModel.GetRecommendHangPoint();

            var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(point);

            var config = Config.Instance.Get<MapEventPointConfig>(point);



            var flyBootOwn = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, GeneralConfig.Instance.flyBootItemId);

            var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;

@@ -451,7 +451,7 @@
        private bool IsDungeon()//判断是否再副本中

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            return mapConfig != null && mapConfig.MapFBType != 0;

        }