Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-03-05 def3ea673c722221e06ec83a0cc9e6da1861c071

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs

@@ -63,6 +63,16 @@
            }

            _playerSkills.Remove(vNetData.OldSkillID);

            olddata = null;



            var oldConfig = SkillConfig.Get(vNetData.OldSkillID);

            if (oldConfig.SkillTypeID == data.skillCfg.SkillTypeID)

            {

                var pos = ContainsQuickSkill(vNetData.OldSkillID);

                if (pos != -1)

                {

                    SetQuickSkill(pos, vNetData.NewSkillID);

                }

            }

        }



        UpdateQuickSkill(data);

@@ -201,8 +211,7 @@
        {

            return;

        }

        if (data.skillCfg == null || PlayerDatas.Instance.baseData.LV < data.skillCfg.LearnLVReq

            || data.skillCfg.FuncType != SkillModel.ACT_SKILL_TYPE)

        if (data.skillCfg == null || data.skillCfg.FuncType != SkillModel.ACT_SKILL_TYPE)

        {

            ServerTipDetails.DisplayNormalTip(Language.Get("L1009"));

            return;


 System/Skill/TreasurePotentialLevelUpWin.cs

@@ -144,7 +144,8 @@


                if (!isMax)

                {

                    m_Item.SetItem(config.ExAttr4, config.ExAttr5);

                    var nextConfig = potential.GetSkillConfig(potential.level + 1);

                    m_Item.SetItem(nextConfig.ExAttr4, nextConfig.ExAttr5);

                }

            }



@@ -165,8 +166,8 @@
            TreasurePotential potential;

            if (model.TryGetPotential(selectPotentialId, out potential))

            {

                var config = potential.GetSkillConfig(potential.level);

                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.ExAttr4);

                var upConfig = potential.GetSkillConfig(potential.level + 1);

                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(upConfig.ExAttr4);

            }

        }




 System/Skill/TreasureSkillModel.cs

@@ -261,9 +261,9 @@
                    error = 1;

                    return false;

                }

                var config = skill.GetSkillConfig(skill.level);

                var count = packModel.GetItemCountByID(PackType.Item, config.ExAttr4);

                if (count < config.ExAttr5)

                var upConfig = skill.GetSkillConfig(skill.level + 1);

                var count = packModel.GetItemCountByID(PackType.Item, upConfig.ExAttr4);

                if (count < upConfig.ExAttr5)

                {

                    error = 2;

                    return false;

@@ -294,8 +294,9 @@
                        return false;

                    }

                }

                var count = packModel.GetItemCountByID(PackType.Item, config.ExAttr4);

                if (count < config.ExAttr5)

                var upConfig = potential.GetSkillConfig(potential.level + 1);

                var count = packModel.GetItemCountByID(PackType.Item, upConfig.ExAttr4);

                if (count < upConfig.ExAttr5)

                {

                    error = 13;

                    return false;


 System/Skill/TreasureSkillWin.cs

@@ -181,7 +181,7 @@
                {

                    var nextSkillConfig = SkillConfig.Get(skill.skillId + skill.level);

                    m_SkillDescNext.text = nextSkillConfig.Description;

                    m_Item.SetItem(config.ExAttr4, config.ExAttr5);

                    m_Item.SetItem(nextSkillConfig.ExAttr4, nextSkillConfig.ExAttr5);

                    m_GetWay.AddListener(() =>

                    {

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.Daily_EmperorRelic);