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

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -2,7 +2,7 @@
 <component size="172,241" overflow="hidden">
   <displayList>
     <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
-    <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" autoSize="none" text="0"/>
+    <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" vAlign="middle" autoSize="shrink" text="100"/>
     <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
     <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
     <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1" group="n20_yjmk"/>

FGUIProject/assets/EnduringGiftBox/components/ComLeftGiftBox.xml

@@ -2,7 +2,7 @@
 <component size="204,188">
   <displayList>
     <image id="n0_qqhz" name="n0" src="qqhzf" fileName="images/cz_lbicon_db.png" xy="10,0" group="n7_qqhz"/>
-    <loader id="n9_qqhz" name="loaIcon" xy="47,42" size="120,104" group="n7_qqhz"/>
+    <loader id="n9_qqhz" name="loaIcon" xy="117,95" pivot="0.5,0.5" anchor="true" size="120,104" group="n7_qqhz" fill="scale"/>
     <component id="n6_qqhz" name="comDiscount" src="qqhz1o" fileName="components/ComDiscount.xml" xy="0,2" group="n7_qqhz"/>
     <component id="n8_qqhz" name="comGouMaiGetText" src="qqhz1r" fileName="components/ComGouMaiGetText.xml" xy="10,127" group="n7_qqhz"/>
     <group id="n7_qqhz" name="n7" xy="0,0" size="204,186"/>