Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -39,7 +39,7 @@
     <text id="n17_wlc2" name="txtConsume" xy="445,1506" pivot="0.5,0" size="188,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n18_wlc2" name="txtTips" xy="254,1660" size="571,44" fontSize="26" color="#bbafa3" align="center" autoSize="none" text="服装会自动保留一件不显示在列表中"/>
+    <text id="n18_wlc2" name="txtTips" xy="254,1660" size="571,44" fontSize="26" color="#bbafa3" align="center" autoSize="none" text="自动保留只拥有一件的衣服和服装合成的材料"/>
     <component id="n19_hvn0" name="btnSelect" src="hvn06" fileName="components/Button5.xml" xy="831,1642"/>
   </displayList>
 </component>