1930【1.0.15】【主干】功能预告跳转八卦炉激活，功能预告界面未关闭

client_linchunjie

2018-09-14 a0ede150686a218c92b901b1f20aef12a9913890

 System/Dungeon/TrialExchangeBehaviour.cs

@@ -15,6 +15,7 @@
        [SerializeField] ItemCell m_Item;

        [SerializeField] Text m_Description;

        [SerializeField] Text m_SpecialDescription;

        [SerializeField] Text m_ChestDescription;

        [SerializeField] ItemBehaviour m_Token;

        [SerializeField] LongPressButton m_Exchange;

        [SerializeField] Image m_Redpoint;

@@ -37,16 +38,27 @@
            if (trialExchangeId != 0)

            {

                int error = 0;

                if (!model.TrialSendExchange(trialExchangeId, out error))

                var config = Config.Instance.Get<TrialExchangeConfig>(trialExchangeId);

                if (config != null)

                {

                    if (error == 1)

                    {

                        var config = Config.Instance.Get<TrialExchangeConfig>(trialExchangeId);

                        if (config != null)

                        {

                            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.tokenId);

                        }

                    }

                    var itemConfig = Config.Instance.Get<ItemConfig>(model.GetExchangeItemByJob(config));

                    ItemAttrData itemAttrData = new ItemAttrData(itemConfig.ID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData, false);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().curAttrData.SetTipsFuncBtn(ItemWinBtnType.exchange,

                        (ItemWinBtnType btnType, string value) =>

                     {

                         if (btnType == ItemWinBtnType.exchange)

                         {

                             if (!model.TrialSendExchange(trialExchangeId, out error))

                             {

                                 if (error == 1)

                                 {

                                     ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(config.tokenId);

                                 }

                             }

                         }

                     });

                    ModelCenter.Instance.GetModel<ItemTipsModel>().ShowUICtrl();

                }

            }

        }

@@ -71,7 +83,7 @@


        public void Display(int id, bool equipBetter = true, bool first = false)

        {

            m_Bottom.SetSprite(first ? "SpecialExchangeBottom" : "Title_PopupWindow");

            m_Bottom.SetSprite(first ? "XT_VIP_63" : "XT_VIP_63");

            m_ContainerSpecial.gameObject.SetActive(first);

            m_ContainerNormal.gameObject.SetActive(!first);

            trialExchangeId = id;

@@ -95,9 +107,13 @@
            {

                m_SpecialDescription.text = config.description;

            }

            if (m_ChestDescription != null)

            {

                m_ChestDescription.text = config.chestDesc;

            }

            m_Token.SetItem(config.tokenId, config.tokenCount);

            var count = model.GetTrialTokenCount(config.tokenId);

            m_Token.count.text = StringUtility.Contact(count >= config.tokenCount ? "<color=#35e112>" : string.Empty, count,

            m_Token.count.text = StringUtility.Contact(count >= config.tokenCount ? "<color=#109d06>" : string.Empty, count,

                count >= config.tokenCount ? "</color>" : string.Empty, "/", config.tokenCount);

            var equipCompare = model.EquipCompare(model.GetExchangeItemByJob(config));

            m_Up.gameObject.SetActive(equipCompare == 1);