Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Treasure/PotentialItemBehaviour.cs

@@ -51,9 +51,9 @@
            m_ItemBehaviour.SetItem(potentialBook.itemId, 1);

            m_CostCount.text = StringUtility.Contact(own, "/", need);

            m_CostCount.color = own >= need ? UIHelper.GetUIColor(TextColType.White) : UIHelper.GetUIColor(TextColType.Red);

            m_Click.interactable = own >= need;

            //m_Click.interactable = own >= need;

            m_AddBtnText.color = own >= need ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.White);

            m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            //m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            var config = Config.Instance.Get<TreasureSkillConfig>(potentialBook.levelUpId);

            var upRate = potentialBook.successRate - config.InitialRate;

            m_SuccessRatio.text = Language.Get("HallowsWin_UpSuccess", StringUtility.Contact((upRate * 0.01f).ToString("f0"), "%"));

@@ -61,15 +61,15 @@


        private void SelectPotentialBook()

        {

            if (own >= need)

            {

            //if (own >= need)

            //{

                model.selectedPotentialBook = potentialBook.itemId;

                WindowCenter.Instance.Close<PotentialItemUseWin>();

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            }

            //}

            //else

            //{

            //    SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            //}

        }



        private void Awake()