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

client_linchunjie

2019-06-10 01afde3a4c7a3db09a92388b437791a39bfaf5be

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

 System/KnapSack/PreciousItemGetBehaviour.cs

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

        [SerializeField] Button m_Close;

        [SerializeField] Button m_Use;

        [SerializeField] Text m_Title;

        [SerializeField] Button m_ViewItemDetail;

        [SerializeField] float delayShowTime = 2f;



@@ -97,8 +98,8 @@
                    switch ((ItemType)item.config.Type)

                    {

                        case ItemType.WingsMat:

                            int jumpId = 0;

                            bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(item.itemId, out jumpId);

                            var jumpId = 0;

                            var isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(item.itemId, out jumpId);

                            if (isUnlock)

                            {

                                ItemOperateUtility.Instance.GotoComposeItem(jumpId);

@@ -129,6 +130,7 @@
        {

            if (_item != null)

            {

                m_Title.text = GeneralDefine.onlyUsedAtBackpackItems.Contains(_item.itemId) ? "查看" : "使用";

                var itemConfig = ItemConfig.Get(_item.itemId);

                m_ItemName.text = itemConfig.ItemName;

                m_ItemName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);