Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/OpenServerActivity/WishGroupCell.cs

@@ -29,7 +29,7 @@
                    var info = items[i];

                    ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(info.itemId);

                    poolItem.nameText.text = itemConfig.ItemName;

                    poolItem.nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor);

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

                    ItemCellModel cellModel = new ItemCellModel(info.itemId,true,(ulong)info.itemCount,info.isBind);

                    poolItem.itemBaisc.Init(cellModel);

                    if(i == 0)