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

Client_PangDeRong

2018-08-23 85448a839d432aab4220e6b23e55a0270e007b6f

 System/Rune/RuneMosaicWin.cs

@@ -31,10 +31,11 @@
        [SerializeField] Text presentRuneNameTxt;

        [SerializeField] Text presentRuneAttrTxt;



        [SerializeField] RectTransform m_ContainerLevelUp;

        //[SerializeField] RectTransform m_ContainerLevelUp;

        [SerializeField] RectTransform m_ContainerLvUp1;

        [SerializeField] RectTransform m_ContainerLvUp2;

        [SerializeField] RectTransform m_ContainerItem;

        [SerializeField] RectTransform m_ContaienrMaxLevel;

        [SerializeField] Text runeLevelUpAttr1;

        [SerializeField] Text runeLevelUpAttr2;

        [SerializeField] Text runeLevelUpAttrNum1;

@@ -294,7 +295,8 @@
            m_ContainerLvUp1.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerItem.gameObject.SetActive(!_isRuneMaxLv);

            m_RuneLevelUpBtn.gameObject.SetActive(!_isRuneMaxLv);

            m_ContainerLevelUp.gameObject.SetActive(!_isRuneMaxLv);

            //m_ContainerLevelUp.gameObject.SetActive(!_isRuneMaxLv);

            m_ContaienrMaxLevel.gameObject.SetActive(_isRuneMaxLv);

            runeLevelUpItemNum.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(

                model.RuneSplinters >= _levelUpExp ? TextColType.Green : TextColType.Red

                , model.RuneSplinters.ToString(), true), "/", _levelUpExp);