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

client_Hale

2019-03-06 196eee7eb454006a26e9a9586fb6fd2060dbb5b0

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

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

@@ -104,6 +104,11 @@
                {

                    continue;

                }

                var config = SkillConfig.Get(id);

                if (config == null)

                {

                    continue;

                }

                PlayerSkillData data = GetSKillById(id);

                if (data == null)

                {


 System/MainWin/SkillContainer.cs

@@ -97,7 +97,7 @@
            m_Skill7.RemoveAllListeners();
            skillXP.RemoveAllListeners();
            PlayerSkillDatas.OnRefreshSkill -= OnSkillRefresh;
            if(AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
            if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
            {
                AchievementGoto.achievementType = 0;
            }
@@ -119,17 +119,10 @@
            m_Skill7.SetSkillData(indexSkillDataDict[6]);

            m_BlinkSkill.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(190));
            switch (PlayerDatas.Instance.baseData.Job)
            {
                case 1:
                    m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(150));
                    break;
                case 2:
                    m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(250));
                    break;
                default:
                    break;
            }

            var model = ModelCenter.Instance.GetModel<SkillModel>();

            var skillXpId = model.GetXpSkillID();
            m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(skillXpId));          
        }

        void SwitchTarget()
@@ -244,32 +237,15 @@
        }

        void CastSkillXp()
        {
            switch (PlayerDatas.Instance.baseData.Job)
            {
                case 1:
                    if (PlayerDatas.Instance.skill.GetSKillById(150) == null)
                    {
                        DebugEx.Log("技能未解锁");
                        return;
                    }

                    DoCastSkill(150);
                    break;
                case 2:
                    if (PlayerDatas.Instance.skill.GetSKillById(250) == null)
                    {
                        DebugEx.Log("技能未解锁");
                        return;
                    }

                    DoCastSkill(250);
                    break;
                default:
                    break;
            }


        {

            var model = ModelCenter.Instance.GetModel<SkillModel>();

            var skillXpId = model.GetXpSkillID();

            if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null)

            {

                DebugEx.Log("技能未解锁");

                return;

            }

            DoCastSkill(skillXpId);          
        }

        void PrepareCastSkill1()

 System/Skill/SkillModel.cs

@@ -176,6 +176,13 @@
        {

            int skillID;

            xpSkillsDic.TryGetValue(PlayerDatas.Instance.baseData.Job, out skillID);



            var model = ModelCenter.Instance.GetModel<TreasureSkillModel>();

            TreasureSkill skill;

            if (model.TryGetSkill(skillID, out skill))

            {

                return skill.GetSkillConfig(skill.level).SkillID;

            }

            return skillID;

        }

        #endregion