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

client_linchunjie

2018-10-24 e89c81f45f344186069dc9cfa8b4e232f6f9822d

 System/OpenServerActivity/WishItemCell.cs

@@ -17,6 +17,7 @@
        {

            WishingPoolModel.WishingWellItem wellItem = null;

            bool isWishData = wishingModel.TryGetWishDataByIndex(index, out wellItem);

            noneItemBtn.RemoveAllListeners();

            if (isWishData)

            {

                nameText.gameObject.SetActive(true);

@@ -41,6 +42,10 @@
                noneItemObj.gameObject.SetActive(true);

                nameText.gameObject.SetActive(false);

                bestIconObj.SetActive(false);

                noneItemBtn.AddListener(()=>

                {

                    wishingModel.SetHandMovePos(index);

                });

            }

        }

    }