Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

MacBuilder

2018-08-23 9f1102900faf6adf5994cf6e870ce0716a06a09c

 System/HappyXB/RuneXBWin.cs

@@ -17,10 +17,12 @@
        [SerializeField] Transform verRightContent;

        [SerializeField] Button xbBtn;

        [SerializeField] Text xbBtnText;

        [SerializeField] Text xbOneDesText;

        [SerializeField] Text xbBtnMoneyText;

        [SerializeField] Button xbManyBtn;

        [SerializeField] Text xbManyBtnText;

        [SerializeField] Text xbManyMoneyText;

        [SerializeField] Text xbManyDesText;

        [SerializeField] Button freeXbBtn;

        [SerializeField] GameObject luckDesObj;

        [SerializeField] Text luckText;

@@ -193,6 +195,8 @@
                xbManyMoneyText.text = funcSet.xbPrices[1].ToString();

                xbOneMoney = funcSet.xbPrices[0];

                xbManyMoney = funcSet.xbPrices[1];

                xbOneDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[0]);

                xbManyDesText.text = Language.Get("HappyXB106", funcSet.costToolNums[1]);

                ItemConfig itemConfig1 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[0]);

                ItemConfig itemConfig2 = Config.Instance.Get<ItemConfig>(funcSet.costToolIds[1]);

                if (itemConfig1 != null)