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

client_linchunjie

2018-12-27 7b5e0eea4360da63ca52aa329415f58372aedef1

 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs

@@ -86,6 +86,7 @@
                }

                else

                {

                    stateImg.gameObject.SetActive(false);

                    sellImg.gameObject.SetActive(true);

                    itemCell.countText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Red, remainNum.ToString()),

                        "/" + canBuyCnt.ToString());