0312 主动技能界面调整

hch

2019-09-30 521f5677bf852e1241d7185d2280d3c055816936

0312 主动技能界面调整

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

@@ -199,10 +199,7 @@


    public void SetQuickSkill(int pos, int id)

    {

        if (model.IsXpSkill(id))

        {

            return;

        }



        PlayerSkillData data = GetSKillById(id);

        if (data == null)

        {


 System/MainWin/MainWinSkillController.cs

@@ -6,7 +6,7 @@
{
    public class MainWinSkillController : Singleton<MainWinSkillController>
    {
        const int SKILL_COUNT_MAX = 7;
        const int SKILL_COUNT_MAX = 8;

        public bool enable { get; set; }

@@ -18,7 +18,7 @@
        public readonly LogicStruct<SkillCD> skillcd5 = new LogicStruct<SkillCD>();
        public readonly LogicStruct<SkillCD> skillcd6 = new LogicStruct<SkillCD>();
        public readonly LogicStruct<SkillCD> skillcd7 = new LogicStruct<SkillCD>();
        public readonly LogicStruct<SkillCD> skillcdxp = new LogicStruct<SkillCD>();
        public readonly LogicStruct<SkillCD> skillcd8 = new LogicStruct<SkillCD>();

        public readonly LogicBool forbid0 = new LogicBool();
        public readonly LogicBool forbid1 = new LogicBool();
@@ -28,7 +28,7 @@
        public readonly LogicBool forbid5 = new LogicBool();
        public readonly LogicBool forbid6 = new LogicBool();
        public readonly LogicBool forbid7 = new LogicBool();
        public readonly LogicBool forbidxp = new LogicBool();
        public readonly LogicBool forbid8 = new LogicBool();

        Dictionary<int, int> skillPlaceMap = new Dictionary<int, int>();
        Dictionary<int, int> placeSkillMap = new Dictionary<int, int>();
@@ -68,13 +68,13 @@
                skillPlaceMap[blinkSkill.id] = 0;
            }

            var skillXpId = model.GetXpSkillID();
            var skillXpData = PlayerDatas.Instance.skill.GetSKillById(skillXpId);
            placeSkillMap[8] = skillXpData != null ? skillXpData.id : 0;
            if (skillXpData != null)
            {
                skillPlaceMap[skillXpId] = 8;
            }
            //var skillXpId = model.GetXpSkillID();
            //var skillXpData = PlayerDatas.Instance.skill.GetSKillById(skillXpId);
            //placeSkillMap[8] = skillXpData != null ? skillXpData.id : 0;
            //if (skillXpData != null)
            //{
            //    skillPlaceMap[skillXpId] = 8;
            //}

            if (PlayerDatas.Instance.hero != null)
            {
@@ -101,7 +101,7 @@
            skillcd5.value = default(SkillCD);
            skillcd6.value = default(SkillCD);
            skillcd7.value = default(SkillCD);
            skillcdxp.value = default(SkillCD);
            skillcd8.value = default(SkillCD);

            forbid0.value = false;
            forbid1.value = false;
@@ -111,7 +111,7 @@
            forbid5.value = false;
            forbid6.value = false;
            forbid7.value = false;
            forbidxp.value = false;
            forbid8.value = false;

            skillPlaceMap.Clear();
            placeSkillMap.Clear();
@@ -138,7 +138,7 @@
                case 7:
                    return skillcd7;
                case 8:
                    return skillcdxp;
                    return skillcd8;
                default:
                    return null;
            }
@@ -165,7 +165,7 @@
                case 7:
                    return forbid7;
                case 8:
                    return forbidxp;
                    return forbid8;
                default:
                    return null;
            }

 System/MainWin/SkillTurnplate.cs

@@ -41,10 +41,13 @@


        public void Init()

        {

            m_SkillGroupSign.AddListener(ShowSkillGroup);

            m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow());

            if (m_SkillGroupSign != null)

            {

                m_SkillGroupSign.AddListener(ShowSkillGroup);

                m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow());

                SwitchGroup(groupIndex);

            }



            SwitchGroup(groupIndex);

        }



        public void ShowSkillGroup()


 System/Skill/SkillAccordWin.cs

@@ -27,14 +27,9 @@
        [SerializeField] Button m_LeftBtn;

        [SerializeField] Button m_RightBtn;

        [SerializeField] List<SkillCell> m_QuickSkills = new List<SkillCell>();

        [SerializeField] SkillCell m_XpSkill;

        [SerializeField] Image m_XpCoolDownImg;

        [SerializeField] Text m_XpCoolDownTxt;

        [SerializeField] Image m_DragImg;

        [SerializeField] Image m_DragSkillImg;

        [SerializeField] List<RectTransform> m_QuickSkillRect = new List<RectTransform>();

        [SerializeField] Button m_PageOneBtn;

        [SerializeField] Button m_PageTwoBtn;

        [SerializeField] SkillTurnplate m_SkillTurnplate;

        [SerializeField] Button m_AutoUseXp;

        [SerializeField] Image m_AutoXpCheck;

@@ -103,10 +98,6 @@
                });

            }



            m_XpSkill.skillData.m_SkillBtn.AddListener(() =>

            {

                OnXpClick();

            });



            m_LevelUp.AddListener(LevelUp);

        }

@@ -137,7 +128,7 @@
            }

            m_SkillTurnplate.Init();

            UpdateSkillPage();

            RefreshXpSkill();

            //RefreshXpSkill();

            DisplayButtonState();



            m_IsAutoUseXp = model.AutoUseXp();

@@ -153,7 +144,7 @@
        private void OnRefreshSkill()

        {

            UpdateSltSkill();

            RefreshXpSkill();

            //RefreshXpSkill();

        }



        protected override void OnAfterOpen()

@@ -365,10 +356,10 @@
                var _activeSkill = PlayerDatas.Instance.skill.GetSKillById(_skillData.skillId) != null;

                _skillData.m_SelectImg.gameObject.SetActive(_select && _activeSkill);

            }

            var _xpSkillId = model.GetXpSkillID();

            bool xpSkillSelect = PlayerDatas.Instance.skill.GetSKillById(_xpSkillId) != null

                                   && model.presentSltSkillID == _xpSkillId;

            m_XpSkill.skillData.m_SelectImg.gameObject.SetActive(xpSkillSelect);

            //var _xpSkillId = model.GetXpSkillID();

            //bool xpSkillSelect = PlayerDatas.Instance.skill.GetSKillById(_xpSkillId) != null

            //                       && model.presentSltSkillID == _xpSkillId;



        }



        private void UpdateSltSkill()

@@ -378,44 +369,44 @@
            OnUpdateSltSkillInfo();

        }



        private void RefreshXpSkill()

        {

            var xpSkillId = model.GetXpSkillID();

            m_XpSkill.skillData.SetSkillData(xpSkillId);

            var hasXpSkill = PlayerDatas.Instance.skill.GetSKillById(xpSkillId) != null;

            m_XpSkill.skillData.SetActive(hasXpSkill);

            m_XpSkill.skillData.m_LockImg.gameObject.SetActive(!hasXpSkill);

            m_XpCoolDownImg.gameObject.SetActive(false);

            onXpCoolDown = false;

            if (hasXpSkill)

            {

                Skill xpSkill = PlayerDatas.Instance.hero.SkillMgr.Get(xpSkillId);

                if (xpSkill.cd > 0)

                {

                    m_XpCoolDownImg.gameObject.SetActive(true);

                    onXpCoolDown = true;

                    RefreshXpCd();

                }

            }

        }

        //private void RefreshXpSkill()

        //{

        //    var xpSkillId = model.GetXpSkillID();

        //    m_XpSkill.skillData.SetSkillData(xpSkillId);

        //    var hasXpSkill = PlayerDatas.Instance.skill.GetSKillById(xpSkillId) != null;

        //    m_XpSkill.skillData.SetActive(hasXpSkill);

        //    m_XpSkill.skillData.m_LockImg.gameObject.SetActive(!hasXpSkill);

        //    m_XpCoolDownImg.gameObject.SetActive(false);

        //    onXpCoolDown = false;

        //    if (hasXpSkill)

        //    {

        //        Skill xpSkill = PlayerDatas.Instance.hero.SkillMgr.Get(xpSkillId);

        //        if (xpSkill.cd > 0)

        //        {

        //            m_XpCoolDownImg.gameObject.SetActive(true);

        //            onXpCoolDown = true;

        //            RefreshXpCd();

        //        }

        //    }

        //}



        private void RefreshXpCd()

        {

            if (model.xpSkill != null)

            {

                m_XpCoolDownImg.fillAmount = model.xpSkill.cd / (model.xpSkill.skillInfo.config.CoolDownTime * Constants.F_GAMMA);

                m_XpCoolDownTxt.text = TimeUtility.SecondsToHMS((int)model.xpSkill.cd);

                if (model.xpSkill.cd <= 0)

                {

                    onXpCoolDown = false;

                    m_XpCoolDownImg.gameObject.SetActive(false);

                }

            }

            else

            {

                onXpCoolDown = false;

            }

        }

        //private void RefreshXpCd()

        //{

        //    if (model.xpSkill != null)

        //    {

        //        m_XpCoolDownImg.fillAmount = model.xpSkill.cd / (model.xpSkill.skillInfo.config.CoolDownTime * Constants.F_GAMMA);

        //        m_XpCoolDownTxt.text = TimeUtility.SecondsToHMS((int)model.xpSkill.cd);

        //        if (model.xpSkill.cd <= 0)

        //        {

        //            onXpCoolDown = false;

        //            m_XpCoolDownImg.gameObject.SetActive(false);

        //        }

        //    }

        //    else

        //    {

        //        onXpCoolDown = false;

        //    }

        //}



        void DisplayButtonState()

        {

@@ -441,7 +432,7 @@
                model.presentSltSkillID = treasureSkill.GetSkillConfig(treasureSkill.level).SkillID;

            }

            RefreshSkills();

            RefreshXpSkill();

            //RefreshXpSkill();

            flipActScroll.RefreshActive();

            UpdateQuickSkillSelect();

            OnUpdateSltSkillInfo();

@@ -477,10 +468,10 @@
                    flipActScroll.locked = false;

                }

            }

            if (onXpCoolDown)

            {

                RefreshXpCd();

            }

            //if (onXpCoolDown)

            //{

            //    RefreshXpCd();

            //}

        }



        private void LevelUp()

@@ -508,10 +499,11 @@


        private void UpdateSkillPage()

        {

            m_PageOneBtn.image.SetSprite(m_SkillTurnplate.GroupIndex == 1 ?

                "SkillRightbtn_A" : "Skillbtnbtn_A");

            m_PageTwoBtn.image.SetSprite(m_SkillTurnplate.GroupIndex == 2 ?

                "SkillRightbtn_A" : "Skillbtnbtn_A");

            // 根据法宝开放显示第二批

            //m_PageOneBtn.image.SetSprite(m_SkillTurnplate.GroupIndex == 1 ?

            //    "SkillRightbtn_A" : "Skillbtnbtn_A");

            //m_PageTwoBtn.image.SetSprite(m_SkillTurnplate.GroupIndex == 2 ?

            //    "SkillRightbtn_A" : "Skillbtnbtn_A");

        }



        private void CheckReplaceQuickSkill()


 System/Skill/SkillCell.cs

@@ -49,10 +49,10 @@
            {
                return;
            }
            if (model.IsXpSkill(skill.skillId))

            {
                return;
            }
            //if (model.IsXpSkill(skill.skillId))

            //{
            //    return;
            //}
            onPress = true;
        }


 System/Skill/SkillModel.cs

@@ -642,7 +642,7 @@
            }

            playerLoginOk = true;

            UpdateRedpoint();

            VerifyQuickSkillExistXp();

            //VerifyQuickSkillExistXp();

            UpdateSkillMatchRedpoint();

            //UpdateTaskHoleRedpoint();

        }