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

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -13,6 +13,7 @@
     <loader id="n4_bhmm" name="loaIcon" xy="21,17" size="58,61" group="n9_bhmm" aspect="true" url="ui://eg2y0ldply9g8n" fill="scale"/>
     <image id="n5_bhmm" name="n5" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="-54,40" group="n9_bhmm"/>
     <image id="n6_bhmm" name="n6" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="58,62" group="n9_bhmm"/>
+    <image id="n12_p8yf" name="n12" src="nyhme" fileName="images/qrhd_jdt_sz_db.png" xy="-42,52" group="n9_bhmm"/>
     <text id="n7_bhmm" name="Num" xy="58,54" size="47,42" group="n9_bhmm" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
     <text id="n8_bhmm" name="Score" xy="-48,39" size="66,42" group="n9_bhmm" fontSize="30" color="#fffbeb" autoSize="none" text="1000"/>
     <image id="n10_bhmm" name="Get" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="10,27" group="n9_bhmm">

FGUIProject/assets/EnduringGiftBox/SpecialOfferGiftBoxUI.xml

@@ -2,6 +2,7 @@
 <component size="1080,1116">
   <displayList>
     <image id="n0_yjmk" name="n0" src="yjmk2v" fileName="images/bg02.png" xy="-9,142"/>
+    <image id="n28_fter" name="n28" src="qqhz4" fileName="images/tape.png" xy="-3,626"/>
     <image id="n1_yjmk" name="n1" src="yjmk2u" fileName="images/bg01.png" xy="29,15"/>
     <graph id="n25_fter" name="holderBaby" xy="261,161" size="97,73"/>
     <image id="n2_yjmk" name="n2" src="yjmk2g" fileName="images/wz_thlb.png" xy="76,39"/>
@@ -26,6 +27,7 @@
     <item time="0" type="Alpha" target="n23_droi" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.InOut"/>
     <item time="0" type="Alpha" target="n24_droi" value="0"/>
     <item time="0" type="Alpha" target="n25_fter" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n28_fter" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
     <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="15"/>
     <item time="0" type="Alpha" target="n5_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
     <item time="0" type="Alpha" target="n6_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>