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

client_linchunjie

2019-03-26 e005994d32105faa2cccdedfa2de4eaa8223fe0a

 System/ItemTip/TipGemInfoWidget.cs

@@ -74,6 +74,7 @@
                        }

                        propertyBehaviour.text = string.Join("\r\n", lines);
                        propertyBehaviour.gameObject.SetActive(true);
                    }
                    else
                    {