Merge remote-tracking branch 'remotes/origin/master' into xiaojie

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/CommonGame/components/ComHead.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
-  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4,,5," selected="0">
     <remark page="0" value="默认边框"/>
   </controller>
   <displayList>
@@ -29,6 +29,9 @@
     <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
       <gearDisplay controller="c2" pages="4"/>
     </image>
+    <image id="n50_t6j1" name="n50" src="kubi7f" fileName="images/zjm_txkuang_1.png" xy="23,32" size="178,179" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="5"/>
+    </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>

FGUIProject/assets/CommonGame/package.xml

@@ -187,7 +187,7 @@
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
-    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
+    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale9grid="31,31,62,62"/>
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" align="center" vAlign="middle" fill="scale">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usnjmn2p">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>

FGUIProject/assets/Main/MainUI.xml

@@ -5,7 +5,7 @@
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
+    <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="30,160" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
@@ -70,10 +70,10 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
     <group id="n89_vols" name="n89" xy="0,314" size="411,623" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -2,7 +2,7 @@
 <component size="125,125">
   <displayList>
     <image id="n19_q08x" name="n19" src="q08xc" fileName="images/zjm_mzkuang.png" xy="60,71"/>
-    <component id="n42_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-52,-52" pivot="0.55,0.5" scale="0.7,0.7"/>
+    <component id="n42_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-52,-52" pivot="0.55,0.5" scale="0.65,0.65" controller="c2,5"/>
     <text id="n20_q08x" name="txtName" xy="141,74" size="156,39" fontSize="28" color="#fdf2df" align="center" autoSize="none" text="名字五个字">
       <relation target="n19_q08x" sidePair="left-left,top-top"/>
     </text>
@@ -10,7 +10,7 @@
       <relation target="" sidePair="height-height"/>
     </graph>
     <image id="n37_slb4" name="n37" src="wg7t8w" fileName="images/zjm_dj_1.png" xy="88,78" group="n41_qqat"/>
-    <text id="n38_slb4" name="txtLvl" xy="95,84" size="27,29" group="n41_qqat" fontSize="20" color="#ffffff" align="center" text="99">
+    <text id="n38_slb4" name="txtLvl" xy="95,84" size="23,29" group="n41_qqat" fontSize="20" color="#ffffff" align="center" text="99">
       <relation target="n37_slb4" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n41_qqat" name="n41" xy="88,78" size="42,43"/>