少年修仙传客户端代码仓库
client_linchunjie
2019-07-03 6385912194ac469bbfdc145189db35ec575511c3
4353 【主干】主界面技能面板显示2个龙雀环图标
3个文件已修改
124 ■■■■■ 已修改文件
Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/SkillCell.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/SkillModel.cs 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
@@ -199,7 +199,7 @@
    public void SetQuickSkill(int pos, int id)
    {
        if (model.GetXpSkillID() == id)
        if (model.IsXpSkill(id))
        {
            return;
        }
@@ -349,6 +349,8 @@
    public void ClearSkillData()
    {
        hasInitQuickSkill = false;
        isServerPrepare = false;
        m_QuickSkills.Clear();
        m_PlayerSkills.Clear();
    }
System/Skill/SkillCell.cs
@@ -13,15 +13,19 @@
        [SerializeField] SkillData skill;
        [SerializeField] RedpointBehaviour m_Redpoint;
        public SkillData skillData {
            get {
        public SkillData skillData
        {
            get
            {
                return skill;
            }
        }
        SkillModel m_Model;
        SkillModel model {
            get {
        SkillModel model
        {
            get
            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<SkillModel>());
            }
        }
@@ -37,13 +41,16 @@
        public void OnPointerDown(PointerEventData eventData)
        {
            skill.m_SkillBtn.OnPointerClick(eventData);
            if (model.skillDraging) {
            if (model.skillDraging)
            {
                return;
            }
            if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null) {
            if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null)
            {
                return;
            }
            if (model.GetXpSkillID() == skill.skillId) {
            if (model.IsXpSkill(skill.skillId))
            {
                return;
            }
            onPress = true;
@@ -66,10 +73,12 @@
        public void Refresh(int skillId)
        {
            skill.SetSkillData(skillId);
            if (model.presentSltSkillID == skillId) {
            if (model.presentSltSkillID == skillId)
            {
                skill.m_SelectImg.gameObject.SetActive(true);
            }
            else {
            else
            {
                skill.m_SelectImg.gameObject.SetActive(false);
            }
@@ -96,9 +105,11 @@
        private void LateUpdate()
        {
            if (onPress && !model.skillDraging) {
            if (onPress && !model.skillDraging)
            {
                m_Time += Time.deltaTime;
                if (m_Time > model.onDragDelay) {
                if (m_Time > model.onDragDelay)
                {
                    model.skillDragId = skill.skillId;
                    model.skillDraging = true;
                    m_Time = 0;
System/Skill/SkillModel.cs
@@ -194,6 +194,92 @@
            }
            return skillID;
        }
        public bool IsXpSkill(int skillId)
        {
            var config = SkillConfig.Get(skillId);
            if (config != null)
            {
                var job = PlayerDatas.Instance.baseData.Job;
                if (xpSkillsDic.ContainsKey(job))
                {
                    return xpSkillsDic[job] == config.SkillTypeID;
                }
            }
            return false;
        }
        void VerifyQuickSkillExistXp()
        {
            var quickSkills = PlayerDatas.Instance.skill.GetQuickSkills();
            var existXp = false;
            var lastIndex = 0;
            foreach (var index in quickSkills.Keys)
            {
                if (quickSkills[index] != null)
                {
                    if (IsXpSkill(quickSkills[index].id))
                    {
                        existXp = true;
                        QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, "***", index);
                        continue;
                    }
                    if (existXp)
                    {
                        var temp = QuickSetting.Instance.GetQuickSetting(QuickSetting.QuickSettingType.Skill, index);
                        QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, temp, index - 1);
                        QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, "***", index);
                    }
                    lastIndex = index;
                }
            }
            if (existXp)
            {
                if (lastIndex == QUICK_SKILL_COUNT - 1)
                {
                    var skills = GetActSkills();
                    for (int i = 0; i < skills.Count; i++)
                    {
                        if (PlayerDatas.Instance.skill.GetSKillById(skills[i]) != null
                            && !IsXpSkill(skills[i]) && PlayerDatas.Instance.skill.ContainsQuickSkill(skills[i]) == -1)
                        {
                            string value = MathUtils.Convert10To64(skills[i]);
                            QuickSetting.Instance.SetQuickSetting(QuickSetting.QuickSettingType.Skill, value, lastIndex);
                            break;
                        }
                    }
                }
                QuickSetting.Instance.SendPackage();
                PlayerDatas.Instance.skill.SetQuickSkills();
            }
        }
        List<int> GetActSkills()
        {
            List<int> skills = new List<int>();
            var skillType = (int)Math.Pow(2, PlayerDatas.Instance.baseData.Job);
            Dictionary<int, List<int>> dict = skillActDict[skillType];
            foreach (int key in dict.Keys)
            {
                List<int> list = dict[key];
                var skillId = list[0];
                foreach (var id in list)
                {
                    if (PlayerDatas.Instance.skill.GetSKillById(id) != null)
                    {
                        skillId = id;
                        break;
                    }
                }
                if (PlayerDatas.Instance.skill.GetFilterPlayerSkill(PlayerDatas.Instance.baseData.Job).Contains(skillId))
                {
                    continue;
                }
                skills.Add(skillId);
            }
            return skills;
        }
        #endregion
        #region 主动技能
@@ -545,6 +631,7 @@
            }
            playerLoginOk = true;
            UpdateRedpoint();
            VerifyQuickSkillExistXp();
            //UpdateTaskHoleRedpoint();
        }