Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-26 dbceb10cd120b2121cb93b63d50d804bc6f02f16

 System/Skill/SkillAccordWin.cs

@@ -19,6 +19,7 @@
        [SerializeField] Text m_TreasureNameTxt;

        [SerializeField] Text m_SkillNameTxt;

        [SerializeField] Text m_SkillCoolDownTxt;

        [SerializeField] Text m_SkillLevel;

        [SerializeField] Text m_SkillDescTxt;

        [SerializeField] Button m_LeftBtn;

        [SerializeField] Button m_RightBtn;

@@ -46,6 +47,11 @@
            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<SkillModel>());

            }

        }



        TreasureSkillModel treasureSkillModel

        {

            get { return ModelCenter.Instance.GetModel<TreasureSkillModel>(); }

        }



        #region Built-in

@@ -218,6 +224,21 @@
                m_TreasureNameTxt.text = cfg.Skillsource;

                m_SkillDescTxt.text = UIHelper.ReplaceNewLine(cfg.Description);

                m_SkillCoolDownTxt.text = cfg.CoolDownTime == 0 ? string.Empty : Language.Get("L1065", cfg.CoolDownTime / 1000);



                TreasureSkill treasureSkill;

                var level = 0;

                if (treasureSkillModel.TryGetSkill(cfg.SkillTypeID, out treasureSkill))

                {

                    level = treasureSkill.level;

                }

                if (level > 0)

                {

                    m_SkillLevel.text = Language.Get("SkillActLevel", level);

                }

                else

                {

                    m_SkillLevel.text = Language.Get("SkillActLevel", Language.Get("TreasureSkilllock"));

                }

            }

        }