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

client_Zxw

2018-12-27 73ecb4c90051a6ae90c4bfd520d455cd6940a358

 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs

@@ -67,6 +67,7 @@
            }



            vipText.gameObject.SetActive(!isShowBuyPrice);

            refreshTimeText.gameObject.SetActive(false);

            moneyIcon.gameObject.SetActive(isShowBuyPrice);

            if (canBuyCnt > 0)

            {

@@ -88,6 +89,12 @@
                    sellImg.gameObject.SetActive(true);

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

                        "/" + canBuyCnt.ToString());

                    string refreshDes = m_storeModel.GetStoreRefreshTimeByType(storeConfig.RefreshType);

                    if(!string.IsNullOrEmpty(refreshDes))

                    {

                        refreshTimeText.gameObject.SetActive(true);

                        refreshTimeText.text = refreshDes;

                    }

                }

            }

            else

@@ -100,7 +107,7 @@
            {

                m_storeModel.OnClickShopCell(storeConfig);

            });

            refreshTimeText.gameObject.SetActive(false);

           
        }



        private void UpdateRefreshTime()