3335 代码维护

client_Wu Xijin

2018-09-10 fa78d3bfc6b56846a8b824bd8a60b9d61bdb40ac

3335  代码维护

 Core/GameEngine/Model/TelPartialConfig/tagChinSkillConfig.cs

@@ -104,6 +104,7 @@
            m_Skills.TryGetValue(occupy, out dic);

            return dic;

        }



        //------坐骑技能获取

        public static SkillConfig GetSkillTypeIDAndSkillLV(int _SkillTypeID, int SkillLV)

        {

@@ -112,7 +113,20 @@
            SkillConfig _tagChinSkillModel = null;

            T_HorseSkill.TryGetValue(_textBuilder.ToString(), out _tagChinSkillModel);

            return _tagChinSkillModel;

        }



        public static int FindSkillByJob(int[] skillIds,int job)

        {

            foreach (var skill in skillIds)

            {

                var config = Config.Instance.Get<SkillConfig>(skill);

                if (config != null && (config.UseType == 0 || config.UseType == 1 << job))

                {

                    return skill;

                }

            }



            return 0;

        }



    }


 System/Achievement/AchievementModel.cs

@@ -116,6 +116,7 @@
            {

                return this == (AchievementCondition)obj;

            }



            public override int GetHashCode()

            {

                var _value = type;

@@ -125,6 +126,7 @@
                }

                return _value.GetHashCode();

            }



            public static bool operator ==(AchievementCondition x, AchievementCondition y)

            {

                if (x.type != y.type)

@@ -144,6 +146,7 @@
                }

                return true;

            }



            public static bool operator !=(AchievementCondition x, AchievementCondition y)

            {

                return !(x == y);

@@ -225,7 +228,6 @@
                            {

                                var mapId = PlayerDatas.Instance.baseData.MapID;

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



                                if (mapConfig != null && mapConfig.MapFBType != 0)

                                {

                                    SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");

@@ -248,7 +250,6 @@
                    case 4:

                    case 86:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();



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

                        var pointId = mapModel.GetRecommendHangPoint();

                        var mapEventConfig = Config.Instance.Get<MapEventPointConfig>(pointId);

@@ -257,13 +258,11 @@
                        break;

                    case 36:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();



                        WindowCenter.Instance.Open<MainInterfaceWin>();

                        MapTransferUtility.Instance.MoveToNPC(config.Condition[0]);

                        break;

                    case 37:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();



                        WindowCenter.Instance.Open<MainInterfaceWin>();

                        MapTransferUtility.Instance.MoveToLocalMapPosition(config.Condition2.Vector3Parse());

                        break;

@@ -408,7 +407,7 @@
                    case 109:

                        WindowCenter.Instance.Close<TreasureLevelUpWin>();



                        var skillId = FindSkillByJob(config.Condition, PlayerDatas.Instance.baseData.Job);

                        var skillId = SkillConfig.FindSkillByJob(config.Condition, PlayerDatas.Instance.baseData.Job);

                        if (skillId != 0)

                        {

                            if (ModelCenter.Instance.GetModel<SkillModel>().GetXpSkillID() == skillId)

@@ -454,8 +453,8 @@


        private string GetHighestSorceEquipByPlace(List<int> _places)

        {

            var package = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = package.GetPackModelIndexDict();

            var itemPackage = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = itemPackage.GetPackModelIndexDict();



            var guid = string.Empty;

            var equips = new List<string>();

@@ -478,15 +477,14 @@


        private string GetBetterEquipByPlace(List<int> _places)

        {

            var package = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = package.GetPackModelIndexDict();



            var equipPackage = playerPack.GetSinglePackModel(PackType.rptEquip);

            var itemPackage = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = itemPackage.GetPackModelIndexDict();



            var guid = string.Empty;

            var equips = new List<string>();

            var score = 0;

            var job = PlayerDatas.Instance.baseData.Job;

            var equipPackage = playerPack.GetSinglePackModel(PackType.rptEquip);

            foreach (var item in allItems.Values)

            {

                var overdue = packModelInterface.IsOverdue(item.itemInfo.ItemGUID, item.itemId, item.useDataDict);

@@ -507,15 +505,14 @@


        public string GetBetterEquipByPlace()

        {

            var package = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = package.GetPackModelIndexDict();



            var equipPackage = playerPack.GetSinglePackModel(PackType.rptEquip);

            var itemPackage = playerPack.GetSinglePackModel(PackType.rptItem);

            var allItems = itemPackage.GetPackModelIndexDict();



            var guid = string.Empty;

            var equips = new List<string>();

            var score = 0;

            var job = PlayerDatas.Instance.baseData.Job;

            var equipPackage = playerPack.GetSinglePackModel(PackType.rptEquip);

            foreach (var item in allItems.Values)

            {

                var config = Config.Instance.Get<ItemConfig>(item.itemId);

@@ -536,21 +533,6 @@
            }



            return guid;

        }



        public int FindSkillByJob(int[] _skillIds, int _job)

        {

            foreach (var skill in _skillIds)

            {

                var config = Config.Instance.Get<SkillConfig>(skill);



                if (config != null && (config.UseType == 0 || config.UseType == 1 << _job))

                {

                    return skill;

                }

            }



            return 0;

        }



        private void ProcessAchievementGotoGuide(int _achievementId)


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -977,7 +977,7 @@
                    ShowCastSkill();//显示技能组隐藏按钮组(强制切换)

                }

                var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);

                var _skillId = SkillConfig.FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);

                if (_skillId != 0)

                {

                    if (ModelCenter.Instance.GetModel<SkillModel>().GetXpSkillID() != _skillId)


 System/MainWin/SkillContainer.cs

@@ -430,7 +430,7 @@
            if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
            {
                var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
                var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
                var _skillId = SkillConfig.FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
                if (_skillId != 0)
                {
                    if (ModelCenter.Instance.GetModel<SkillModel>().GetXpSkillID() == _skillId)

 System/Skill/SkillAccordWin.cs

@@ -478,7 +478,7 @@
            if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)

            {

                var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);

                var _skillId = SkillConfig.FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);

                if (_skillId != 0)

                {

                    m_AchieveSkillId = _skillId;