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

client_linchunjie

2019-03-14 d0d289d502fe85e9bb597ced1b41c73b8bc75889

 System/OpenServerActivity/OSGiftBehaviour.cs

@@ -108,7 +108,7 @@
                    }

                    m_Items[i].gameObject.SetActive(true);

                    var _item = _shopItems[i];

                    var _itemModel = new ItemCellModel(_item.itemId, false, (ulong)_item.count, _item.isBind);

                    var _itemModel = new ItemCellModel(_item.itemId, false, (ulong)_item.count);

                    m_Items[i].SetItemRare(_itemModel, _storeConfig.MainItemID == _item.itemId);

                }

            }

@@ -198,7 +198,7 @@
                if (_index < _shopItems.Count)

                {

                    var item = _shopItems[_index];

                    ItemAttrData attrData = new ItemAttrData(item.itemId, false, (ulong)item.count, -1, item.isBind);

                    ItemAttrData attrData = new ItemAttrData(item.itemId, false, (ulong)item.count);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(attrData);

                }

            }