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

client_linchunjie

2019-03-14 d0d289d502fe85e9bb597ced1b41c73b8bc75889

 System/OpenServerActivity/SuperValueGiftBehaviour.cs

@@ -68,7 +68,7 @@
                    if (index < items.Count)

                    {

                        var item = items[index];

                        ItemAttrData attrData = new ItemAttrData(item.id, false, (ulong)item.count, -1, item.bind?1:0);

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

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

                    }

                }

@@ -102,7 +102,7 @@
                {

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

                    var _item = items[i];

                    var _itemModel = new ItemCellModel(_item.id, false, (ulong)_item.count, _item.bind?1:0);

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

                    m_Items[i].SetItemRare(_itemModel, i == 0);

                }

                else