Revert "主界面"

This reverts commit 6d9118c02c7f46a2809900e246f9276ce727a30a.

# Conflicts:
#	GameClient/Assets/ResIn/Prefab/SceneMain.prefab

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="230,42" extention="Button">
+<component size="233,46" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-8,0" group="n4_qqat"/>
-    <text id="n1_r9gf" name="title" xy="83,3" pivot="0.5,0" size="56,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="100"/>
-    <loader id="n2_r9gf" name="icon" xy="-8,0" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="182,-3" group="n4_qqat"/>
-    <group id="n4_qqat" name="n4" xy="-8,-3" size="238,48"/>
+    <image id="n0_r9gf" name="n0" src="j53916" fileName="images/zjm_gnk.png" xy="0,2"/>
+    <text id="n1_r9gf" name="title" xy="67,3" size="56,39" fontSize="28" color="#f3f1ff" vAlign="middle" singleLine="true" autoClearText="true" text="100"/>
+    <loader id="n2_r9gf" name="icon" xy="10,2" pivot="0.5,0.5" size="42,42" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
+    <image id="n3_r9gf" name="n3" src="q08x1" fileName="imagesExport/zjm_jiahao.png" xy="184,0"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ButtonPlus1.xml

@@ -2,7 +2,7 @@
 <component size="40,42" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ki96" name="n0" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="-4,-3">
+    <image id="n0_ki96" name="n0" src="q08x1" fileName="imagesExport/zjm_jiahao.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,47">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7," selected="0">
+<component size="921,47">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7," selected="6">
     <remark page="2" value="抽卡兑换"/>
     <remark page="3" value="抽卡活动兑换"/>
     <remark page="4" value="抽卡"/>
@@ -8,40 +8,40 @@
     <remark page="6" value="分解"/>
   </controller>
   <displayList>
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+      <gearDisplay controller="c1" pages="0,5,6"/>
+      <gearXY controller="c1" default="460,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x6"/>
+    </component>
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+      <gearDisplay controller="c1" pages="0,1,6,7"/>
+      <gearXY controller="c1" pages="1,7" values="460,5|688,5" default="230,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x3"/>
+    </component>
+    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+      <gearDisplay controller="c1" pages="0,1,5,6"/>
+      <gearXY controller="c1" default="688,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
+    </component>
+    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
+      <gearDisplay controller="c1" pages="0,1"/>
+      <gearXY controller="c1" pages="1" values="233,5" default="0,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x4"/>
+    </component>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="3"/>
-      <gearXY controller="c1" pages="3" values="688,2" default="460,5"/>
+      <gearXY controller="c1" pages="3" values="688,5" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="4"/>
-      <gearXY controller="c1" pages="4" values="688,2" default="460,5"/>
+      <gearXY controller="c1" pages="4" values="688,5" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
     <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="5"/>
-      <gearXY controller="c1" pages="5" values="153,2" default="460,5"/>
+      <gearXY controller="c1" pages="5" values="230,5" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="35,2">
-      <gearDisplay controller="c1" pages="0,1"/>
-      <gearXY controller="c1" pages="0,1" values="35,2|153,2" default="0,5"/>
-      <Button title="100" icon="ui://eg2y0ldpq08x4"/>
-    </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="295,2">
-      <gearDisplay controller="c1" pages="0,1,6,7"/>
-      <gearXY controller="c1" pages="0,1,6,7" values="295,2|421,2|153,2|688,2" default="230,5"/>
-      <Button title="100" icon="ui://eg2y0ldpq08x3"/>
-    </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,2">
-      <gearDisplay controller="c1" pages="0,5,6"/>
-      <gearXY controller="c1" pages="0,5,6" values="555,2|421,2|421,2" default="460,5"/>
-      <Button title="100" icon="ui://eg2y0ldpq08x6"/>
-    </component>
-    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="815,2">
-      <gearDisplay controller="c1" pages="0,1,5,6"/>
-      <gearXY controller="c1" pages="0,1,5,6" values="815,2|689,2|689,2|689,2" default="688,5"/>
-      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
-    </component>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -19,6 +19,7 @@
     <component id="d4iw55" name="DressUpItemTips.xml" path="/" exported="true"/>
     <image id="d4iw57" name="zx_ditutips_1.png" path="/imagesExport/" exported="true"/>
     <image id="q08x3" name="jinbi.png" path="/imgItemIcon/" exported="true"/>
+    <image id="q08x1" name="zjm_jiahao.png" path="/imagesExport/" exported="true"/>
     <image id="q08x4" name="tili.png" path="/imgItemIcon/" exported="true"/>
     <image id="q08x5" name="zhuans_1.png" path="/imgItemIcon/" exported="true"/>
     <image id="q08x6" name="zhuans_2.png" path="/imgItemIcon/" exported="true"/>
@@ -63,6 +64,7 @@
     <component id="lwri5w" name="ApproachOfItemUI.xml" path="/" exported="true"/>
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="lwri5y" name="ButtonApproach.xml" path="/components/" exported="true"/>
+    <image id="j53916" name="zjm_gnk.png" path="/images/"/>
     <font id="kst18" name="STZHONGS.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
     <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
@@ -224,8 +226,6 @@
     <image id="orsttit" name="wpbb_di.png" path="/images/"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
     <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
-    <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
-    <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -5,73 +5,64 @@
     <remark page="1" value="down"/>
   </controller>
   <displayList>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
-    <list id="n41_wg7t" name="list" xy="953,305" size="96,0" overflow="scroll" scroll="horizontal" colGap="14" foldInvisibleItems="true">
-      <gearDisplay controller="c1" pages="1"/>
+    <component id="n2_q08x" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="20,160"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
+    <image id="n9_q08x" name="n9" src="q08xk" fileName="images/zjm_yying.png" xy="0,1491" size="1080,429">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="522,190" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dfe" name="btnStudio"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dff" name="btnField"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
-    </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="1001,305" pivot="0.5,0" anchor="true">
-      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
-      <Button controller="c1" page="1"/>
-    </component>
-    <image id="n50_v482" name="n50" src="v482fx" fileName="zjm_1.jpg" xy="0,-240" group="n52_qqat"/>
-    <image id="n49_v482" name="n49" src="v482fw" fileName="zjm_2.jpg" xy="1080,-240" group="n52_qqat"/>
-    <component id="n2_q08x" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
-      <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="0,1749" size="150,150" group="n52_qqat">
+    <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,790" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fn"/>
     </component>
-    <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="180,1749" size="150,150" group="n52_qqat">
+    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="28,1323">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fo"/>
+      <Button icon="ui://mfvz4q8kq08xn"/>
     </component>
-    <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="360,1749" size="150,150" group="n52_qqat">
+    <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="817,627" size="254,260" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fp"/>
+      <Button icon="ui://mfvz4q8kq08xm"/>
     </component>
-    <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="540,1749" size="150,150" group="n52_qqat">
+    <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="817,1029" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fq"/>
+      <Button icon="ui://mfvz4q8kq08xl"/>
     </component>
-    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1604" size="360,316" group="n52_qqat">
+    <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="817,1431" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fm"/>
+      <Button icon="ui://mfvz4q8kq08x7"/>
     </component>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1892,628" size="77,255" group="n52_qqat" visible="false">
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="309,1455" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482ft"/>
+      <Button icon="ui://mfvz4q8kkqhddo"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1982,1571" size="77,256" group="n52_qqat" visible="false">
+    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fv"/>
+      <Button icon="ui://mfvz4q8kkqhddn"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1293,1143" size="77,256" group="n52_qqat" visible="false">
+    <image id="n42_wg7t" name="n42" src="wg7t8t" fileName="images/zjm_gn_dik_1.png" xy="131,1756" size="995,105">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <list id="n41_wg7t" name="list" xy="148,1760" size="932,99" layout="row" overflow="scroll" scroll="horizontal" colGap="14" foldInvisibleItems="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dfe" name="btnStudio"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dff" name="btnField"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
+    </list>
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="32,1754">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kv482fr"/>
+      <Button controller="c1" page="1"/>
     </component>
-    <group id="n52_qqat" name="n52" xy="0,-240" size="2160,2400" advanced="true"/>
   </displayList>
-  <transition name="t1">
-    <item time="0" type="XY" target="n52_qqat" tween="true" startValue="0,-240" endValue="-1080,-240" duration="24" ease="Circ.InOut"/>
-  </transition>
-  <transition name="t2">
-    <item time="0" type="XY" target="n52_qqat" tween="true" startValue="-1080,-240" endValue="0,-240" duration="24" ease="Circ.InOut"/>
-  </transition>
 </component>

FGUIProject/assets/Main/components/Button2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="467,120" extention="Button">
+<component size="472,101" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ox5b" name="n0" src="qqatfy" fileName="images/zjm_hdhd_2.png" xy="0,0">
+    <image id="n0_ox5b" name="n0" src="ox5bf4" fileName="images/zjm_hdhd_3.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <graph id="n1_ox5b" name="holder" xy="235,50" size="1,1" touchable="false"/>

FGUIProject/assets/Main/components/ButtonChange.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="102,113" extention="Button">
+<component size="113,102" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n3_wg7t" name="n3" src="wg7t8u" fileName="images/zjm_gndj_1.png" xy="0,0">

FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -2,9 +2,7 @@
 <component size="254,260" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n1_wg7t" name="icon" xy="127,130" pivot="0.5,0.5" anchor="true" size="254,260" url="ui://mfvz4q8kq08xi" autoSize="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
+    <loader id="n1_wg7t" name="icon" xy="127,130" pivot="0.5,0.5" anchor="true" size="254,260" url="ui://mfvz4q8kq08xi" autoSize="true"/>
     <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
@@ -13,5 +11,4 @@
     </graph>
   </displayList>
   <Button/>
-  <relation target="n1_wg7t" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/Main/components/CompHead.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="125,125" pivot="0.5,0.5" mask="n40_kubi">
+<component size="124,124" pivot="0.5,0.5" mask="n40_kubi">
   <displayList>
-    <loader id="n39_kubi" name="icon" xy="0,0" size="125,125" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scaleFree"/>
-    <image id="n40_kubi" name="n40" src="q08xh" fileName="images/zjm_txkuang.png" xy="2,2" size="120,120" aspect="true"/>
+    <loader id="n39_kubi" name="icon" xy="0,0" size="124,124" url="ui://mfvz4q8kkubi7e" fill="scaleFree"/>
+    <image id="n40_kubi" name="n40" src="q08xh" fileName="images/zjm_txkuang.png" xy="0,0" size="124,124"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/CompHeadWithBg.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="125,125">
+<component size="124,124">
   <displayList>
-    <image id="n2_q08x" name="n2" src="q08xh" fileName="images/zjm_txkuang.png" xy="0,0" size="125,125" aspect="true"/>
-    <component id="n39_kubi" name="n39" src="kubi7g" fileName="components/CompHead.xml" xy="0,0"/>
-    <image id="n40_wg7t" name="n40" src="kubi7f" fileName="images/zjm_txkuang_1.png" xy="0,0"/>
+    <image id="n2_q08x" name="n2" src="q08xh" fileName="images/zjm_txkuang.png" xy="0,0" size="124,124"/>
+    <component id="n39_kubi" name="n39" src="kubi7g" fileName="components/CompHead.xml" xy="0,0" size="124,124" scale="0.9,0.9"/>
+    <image id="n40_wg7t" name="n40" src="kubi7f" fileName="images/zjm_txkuang_1.png" xy="0,0" size="124,124"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="125,125">
+<component size="124,124">
   <displayList>
     <image id="n19_q08x" name="n19" src="q08xc" fileName="images/zjm_mzkuang.png" xy="60,71"/>
-    <component id="n2_q08x" name="n2" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="0,0"/>
+    <component id="n2_q08x" name="n2" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="0,0" size="124,124"/>
     <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>
-    <graph id="n40_lki4" name="holder" xy="62,62" size="0,1" touchable="false">
-      <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="29,29" group="n41_qqat" fontSize="20" color="#ffffff" align="center" text="99">
+    <image id="n37_slb4" name="n37" src="wg7t8w" fileName="images/zjm_dj_1.png" xy="89,78"/>
+    <text id="n38_slb4" name="txtLvl" xy="96,84" size="29,29" 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"/>
+    <graph id="n40_lki4" name="holder" xy="62,62" size="0,0" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
   </displayList>
 </component>

FGUIProject/assets/Main/package.xml

@@ -3,6 +3,7 @@
   <resources>
     <component id="q08x0" name="MainUI.xml" path="/" exported="true"/>
     <image id="q08x2" name="huodongkuang.png" path="/images/"/>
+    <image id="q08x7" name="zjm_cipai.png" path="/images/"/>
     <image id="q08x9" name="zjm_gongg.png" path="/images/"/>
     <image id="q08xa" name="zjm_haoy.png" path="/images/"/>
     <image id="q08xb" name="zjm_jshu.png" path="/images/"/>
@@ -12,8 +13,12 @@
     <image id="q08xf" name="zjm_tiangong.png" path="/images/"/>
     <image id="q08xg" name="zjm_tujian.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
+    <image id="q08xi" name="zjm_xiufang.png" path="/images/"/>
     <image id="q08xj" name="zjm_yjian.png" path="/images/"/>
     <image id="q08xk" name="zjm_yying.png" path="/images/"/>
+    <image id="q08xl" name="zjm_zx.png" path="/images/"/>
+    <image id="q08xm" name="zjm_zyhz.png" path="/images/"/>
+    <image id="q08xn" name="zjm_zzlzj.png" path="/images/"/>
     <component id="q08xt" name="ButtonZhaiXing.xml" path="/components/"/>
     <component id="q08xu" name="ButtonModle1.xml" path="/components/"/>
     <image id="slb415" name="zjm_dengjitu.png" path="/images/"/>
@@ -340,6 +345,8 @@
     <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>
     <component id="jj0mdl" name="ButtonSpeedUp1.xml" path="/componentsDialog/"/>
     <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
+    <image id="kqhddn" name="zjm_rk_7.png" path="/images/"/>
+    <image id="kqhddo" name="zjm_rk_6.png" path="/images/"/>
     <image id="k1khdp" name="zd_zdjdt_liang.png" path="/imagesStory/"/>
     <image id="k1khdq" name="zdsz_0.png" path="/Font5/"/>
     <image id="k1khdr" name="zdsz_1.png" path="/Font5/"/>
@@ -371,6 +378,7 @@
     <component id="sd8cei" name="Component6.xml" path="/components/"/>
     <component id="wet2ew" name="ComRewardEffect.xml" path="/components/" exported="true"/>
     <movieclip id="wet2f3" name="MovieClip4.jta" path="/Movie/"/>
+    <image id="ox5bf4" name="zjm_hdhd_3.png" path="/images/"/>
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
     <image id="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
     <image id="gd29fd" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/imagesStory/"/>
@@ -382,19 +390,6 @@
     <image id="hbiofj" name="dz_hz_rwdh_1.png" path="/images/" scale="9grid" scale9grid="249,32,73,64"/>
     <image id="v482fk" name="cyjd_zy.png" path="/images/"/>
     <image id="v482fl" name="cyjd_tsts.png" path="/images/"/>
-    <image id="v482fm" name="zjm_rk_5.png" path="/images/"/>
-    <image id="v482fn" name="zjm_rk_1.png" path="/images/"/>
-    <image id="v482fo" name="zjm_rk_2.png" path="/images/"/>
-    <image id="v482fp" name="zjm_rk_3.png" path="/images/"/>
-    <image id="v482fq" name="zjm_rk_4.png" path="/images/"/>
-    <image id="v482fr" name="zjm_rk_10.png" path="/images/"/>
-    <image id="v482fs" name="zjm_rk_6.png" path="/images/"/>
-    <image id="v482ft" name="zjm_rk_7.png" path="/images/"/>
-    <image id="v482fu" name="zjm_rk_8.png" path="/images/"/>
-    <image id="v482fv" name="zjm_rk_9.png" path="/images/"/>
-    <image id="v482fw" name="zjm_2.jpg" path="/"/>
-    <image id="v482fx" name="zjm_1.jpg" path="/"/>
-    <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1202262495373414002
+--- !u!1 &8934048990313003903
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2432797848204161373}
-  - component: {fileID: 726315018073398983}
+  - component: {fileID: 8934048990313003902}
+  - component: {fileID: 8934048990313003901}
   m_Layer: 0
   m_Name: Bg
   m_TagString: Untagged
@@ -17,13 +17,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2432797848204161373
+--- !u!4 &8934048990313003902
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1202262495373414002}
+  m_GameObject: {fileID: 8934048990313003903}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -31,13 +31,13 @@ Transform:
   m_Father: {fileID: 8934048990737965464}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &726315018073398983
+--- !u!212 &8934048990313003901
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1202262495373414002}
+  m_GameObject: {fileID: 8934048990313003903}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -71,7 +71,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 4b60240d2df756846950095660f8e383, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3292dbe82a207d9489a8d8d48103b832, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -109,7 +109,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 2432797848204161373}
+  - {fileID: 8934048990313003902}
   - {fileID: 3768987550495608174}
   m_Father: {fileID: 0}
   m_RootOrder: 0