主界面

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="233,46" extention="Button">
+<component size="229,42" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <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"/>
+    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-9,0" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="181,-3" group="n4_qqat"/>
+    <text id="n1_r9gf" name="title" xy="47,1" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
+    <loader id="n2_r9gf" name="icon" xy="2,0" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
+    <group id="n4_qqat" name="n4" xy="-9,-3" size="238,48"/>
   </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="q08x1" fileName="imagesExport/zjm_jiahao.png" xy="0,0">
+    <image id="n0_ki96" name="n0" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="-4,-3">
       <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="921,47">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7," selected="6">
+<component size="1080,47">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7," selected="2">
     <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">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,2">
       <gearDisplay controller="c1" pages="3"/>
-      <gearXY controller="c1" pages="3" values="688,5" default="460,5"/>
+      <gearXY controller="c1" pages="3" values="688,2" 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,5" default="460,5"/>
+      <gearXY controller="c1" pages="4" values="688,2" default="460,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x4"/>
+    </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="0,1,5" values="37,2|166,2|296,5" default="0,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="230,5" default="460,5"/>
+      <gearXY controller="c1" pages="5" values="166,2" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="230,5">
+      <gearDisplay controller="c1" pages="0,1,6,7"/>
+      <gearXY controller="c1" pages="0,1,6,7" values="296,2|425,2|166,2|166,2" default="230,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x3"/>
+    </component>
+    <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" pages="0,5,6" values="555,2|425,2|425,2" default="460,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x6"/>
+    </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" pages="0,1,5,6" values="814,2|684,2|684,2|684,2" default="688,5"/>
+      <Button title="100" icon="ui://eg2y0ldpq08x5"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -19,7 +19,6 @@
     <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"/>
@@ -64,7 +63,6 @@
     <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"/>
@@ -226,6 +224,8 @@
     <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

@@ -1,68 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="up"/>
-    <remark page="1" value="down"/>
-  </controller>
   <displayList>
-    <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">
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
+    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
       <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://mfvz4q8kwg7t8x" name="btnBag"/>
+    </list>
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
+      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,790" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
+    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
+    <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="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="28,1323">
-      <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kq08xn"/>
+    <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="817,627" size="254,260" visible="false">
+    <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="0,1707" size="150,150" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kq08xm"/>
+      <Button icon="ui://mfvz4q8kv482fn"/>
     </component>
-    <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="817,1029" visible="false">
+    <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="180,1707" size="150,150" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kq08xl"/>
+      <Button icon="ui://mfvz4q8kv482fo"/>
     </component>
-    <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="817,1431" visible="false">
+    <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="360,1707" size="150,150" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kq08x7"/>
+      <Button icon="ui://mfvz4q8kv482fp"/>
     </component>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="309,1455" visible="false">
+    <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="540,1707" size="150,150" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kkqhddo"/>
+      <Button icon="ui://mfvz4q8kv482fq"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455" visible="false">
+    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1562" size="360,316" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://mfvz4q8kkqhddn"/>
+      <Button icon="ui://mfvz4q8kv482fm"/>
     </component>
-    <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 controller="c1" page="1"/>
+    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1080,1718" group="n59_oju1" advanced="true"/>
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1892,628" size="77,255" group="n58_oju1">
+      <relation target="" sidePair="middle-middle"/>
+      <Button icon="ui://mfvz4q8kv482ft"/>
+    </component>
+    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1982,1571" size="77,256" group="n58_oju1">
+      <relation target="" sidePair="middle-middle"/>
+      <Button icon="ui://mfvz4q8kv482fv"/>
+    </component>
+    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1293,1143" size="77,256" group="n58_oju1">
+      <relation target="" sidePair="middle-middle"/>
+      <Button icon="ui://mfvz4q8kv482fr"/>
     </component>
+    <group id="n58_oju1" name="grpRight" xy="1293,628" size="766,1199" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,160" size="2059,1718" advanced="true"/>
   </displayList>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
+    <item time="0" type="Alpha" target="n58_oju1" value="0"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,160" endValue="-1080,160" duration="24" ease="Circ.InOut"/>
+    <item time="6" type="Alpha" target="n52_qqat" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
+    <item time="6" type="Visible" target="n57_oju1" value="false"/>
+    <item time="15" type="Alpha" target="n58_oju1" tween="true" startValue="0" endValue="1" duration="7" ease="Linear"/>
+  </transition>
+  <transition name="t2">
+    <item time="0" type="Alpha" target="n52_qqat" value="0"/>
+    <item time="0" type="Alpha" target="n57_oju1" value="0"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,160" endValue="0,160" duration="24" ease="Circ.InOut"/>
+    <item time="6" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
+    <item time="12" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="18" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="5" ease="Linear"/>
+    <item time="18" type="Visible" target="n57_oju1" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/Button2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="472,101" extention="Button">
+<component size="467,120" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ox5b" name="n0" src="ox5bf4" fileName="images/zjm_hdhd_3.png" xy="0,0">
+    <image id="n0_ox5b" name="n0" src="qqatfy" fileName="images/zjm_hdhd_2.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,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="113,102" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+<component size="102,113" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n3_wg7t" name="n3" src="wg7t8u" fileName="images/zjm_gndj_1.png" xy="0,0">
-      <gearDisplay controller="button" pages="1"/>
+      <gearDisplay controller="c1" pages="1"/>
     </image>
     <image id="n4_wg7t" name="n4" src="wg7t8v" fileName="images/zjm_gndj_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="0"/>
+      <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>
   <Button mode="Check"/>

FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -2,7 +2,9 @@
 <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"/>
+    <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>
     <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
@@ -11,4 +13,5 @@
     </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="124,124" pivot="0.5,0.5" mask="n40_kubi">
+<component size="125,125" pivot="0.5,0.5" mask="n40_kubi">
   <displayList>
-    <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"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/CompHeadWithBg.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="124,124">
+<component size="125,125">
   <displayList>
-    <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"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="124,124">
+<component size="125,125">
   <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" size="124,124"/>
+    <component id="n2_q08x" name="n2" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="0,0"/>
     <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>
-    <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>
-    <graph id="n40_lki4" name="holder" xy="62,62" size="0,0" touchable="false">
+    <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">
+      <relation target="n37_slb4" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n41_qqat" name="n41" xy="88,78" size="42,43"/>
   </displayList>
 </component>

FGUIProject/assets/Main/package.xml

@@ -3,7 +3,6 @@
   <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/"/>
@@ -13,15 +12,10 @@
     <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/"/>
     <component id="slb416" name="ComponentHeadBar.xml" path="/components/"/>
     <component id="slb419" name="StoryChapterListUI.xml" path="/" exported="true"/>
     <image id="slb41e" name="zhuxian_anniu_jy.png" path="/imagesStory/"/>
@@ -345,8 +339,6 @@
     <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/"/>
@@ -378,7 +370,6 @@
     <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/"/>
@@ -390,6 +381,21 @@
     <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/"/>
+    <image id="qqatfz" name="zjm_hdhd_3.png" path="/images/"/>
+    <image id="oju1g2" name="zjm_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -151,6 +151,7 @@ namespace GFGGame
             GameGlobal.userId = 0;
             GameGlobal.userAge = 0;
             GameGlobal.skipGuide = false;
+            MainDataManager.Instance.ViewType = 0;
             RoleDataHandler.StopUpdate();
             CardDataManager.Clear();
             DecomposeDataManager.Instance.Clear();

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -124,6 +124,8 @@ namespace GFGGame
                 return true;
             }
             GRoot.inst.touchable = true;
+            MainDataManager.Instance.CanSwipe = true;
+
             return false;
         }
         private static void ShowGuideByIndex(GObject target, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0, int guideId = 0, int index = 0, bool showAni = true, bool showEffect = true)
@@ -143,6 +145,8 @@ namespace GFGGame
             if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
             {
                 GRoot.inst.touchable = false;
+                MainDataManager.Instance.CanSwipe = true;
+
                 EventAgent.DispatchEvent(ConstMessage.FINSH_GUIDE_INDEX);
                 return true;
             }
@@ -159,6 +163,8 @@ namespace GFGGame
             if (result)
             {
                 GRoot.inst.touchable = true;
+                MainDataManager.Instance.CanSwipe = true;
+
                 GuideDataManager.currentGuideId = 0;
                 HideGuide();
             }

GameClient/Assets/Game/HotUpdate/Data/MainDataManager.cs

@@ -0,0 +1,37 @@
+namespace GFGGame
+{
+    public class MainDataManager : SingletonBase<MainDataManager>
+    {
+        private int _viewType = 0;
+        /// <summary>
+        /// 界面类型，0：主界面，1：二级界面
+        /// </summary>
+        public int ViewType
+        {
+            get
+            {
+                return _viewType;
+            }
+            set
+            {
+                _viewType = value;
+            }
+        }
+
+        private bool _canSwipe = true;
+        /// <summary>
+        /// 是否可以拖动
+        /// </summary>
+        public bool CanSwipe
+        {
+            get
+            {
+                return _canSwipe;
+            }
+            set
+            {
+                _canSwipe = value;
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/MainDataManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f22954bda4cb9de42b56e9e29331386d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -25,13 +25,20 @@ namespace GFGGame
 
         public static void UpdateMainScene(GameObject sceneObj)
         {
-            //背景
+            //背景0
             Transform tf = sceneObj.transform.Find("Bg");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            var resPath = ResPathUtil.GetDressUpPath("zjm_bg1", "jpg");
+            var resPath = ResPathUtil.GetBgImgPath("zjm_1");
             Sprite sp = GFGAsset.Load<Sprite>(resPath);
             DressUpUtil.AddAssetReleaser(tf.gameObject, resPath);
             spr.sprite = sp;
+            //背景1
+            Transform tf1 = sceneObj.transform.Find("Bg1");
+            SpriteRenderer spr1 = tf1.GetComponent<SpriteRenderer>();
+            var resPath1 = ResPathUtil.GetBgImgPath("zjm_2");
+            Sprite sp1 = GFGAsset.Load<Sprite>(resPath1);
+            DressUpUtil.AddAssetReleaser(tf1.gameObject, resPath);
+            spr1.sprite = sp1;
             //角色
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitList();
             List<int> equipDatas = suitSavedData.equipDatas;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs

@@ -8,13 +8,13 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnDiamondRed;
-        public GButton m_btnGold;
-        public GButton m_btnDiamondPurple;
-        public GButton m_btnPower;
         public GButton m_btnCJLuoXing;
         public GButton m_btnCJHuoDong;
+        public GButton m_btnPower;
         public GButton m_btnCJ;
+        public GButton m_btnGold;
+        public GButton m_btnDiamondRed;
+        public GButton m_btnDiamondPurple;
         public const string URL = "ui://eg2y0ldpv3541v";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComponentValueBar";
@@ -63,24 +63,24 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
-            m_btnGold = (GButton)comp.GetChild("btnGold");
-            m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
-            m_btnPower = (GButton)comp.GetChild("btnPower");
             m_btnCJLuoXing = (GButton)comp.GetChild("btnCJLuoXing");
             m_btnCJHuoDong = (GButton)comp.GetChild("btnCJHuoDong");
+            m_btnPower = (GButton)comp.GetChild("btnPower");
             m_btnCJ = (GButton)comp.GetChild("btnCJ");
+            m_btnGold = (GButton)comp.GetChild("btnGold");
+            m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
+            m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnDiamondRed = null;
-            m_btnGold = null;
-            m_btnDiamondPurple = null;
-            m_btnPower = null;
             m_btnCJLuoXing = null;
             m_btnCJHuoDong = null;
+            m_btnPower = null;
             m_btnCJ = null;
+            m_btnGold = null;
+            m_btnDiamondRed = null;
+            m_btnDiamondPurple = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonChange.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonChange
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://mfvz4q8kwg7t8z";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonChange";
+        private static UI_ButtonChange _proxy;
+
+        public static UI_ButtonChange Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonChange();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonChange Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonChange();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonChange.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d4cba16318b059940b4a69a67c099750
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentHeadBar.cs

@@ -8,8 +8,8 @@ namespace UI.Main
     {
         public GComponent target;
         public GTextField m_txtName;
-        public GTextField m_txtLvl;
         public GGraph m_holder;
+        public GTextField m_txtLvl;
         public const string URL = "ui://mfvz4q8kslb416";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComponentHeadBar";
@@ -58,14 +58,14 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtName = null;
-            m_txtLvl = null;
             m_holder = null;
+            m_txtLvl = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -7,19 +7,25 @@ namespace UI.Main
     public partial class UI_MainUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_ComponentHeadBar m_headBar;
         public GComponent m_valueBar;
+        public GList m_list;
+        public UI_ButtonChange m_btnChange;
+        public GGroup m_grpList;
+        public UI_ComponentHeadBar m_headBar;
         public UI_Button2 m_btnDailyLogin;
-        public UI_ButtonModle1 m_btnXiuFang;
-        public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
-        public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnCiPai;
+        public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModle1 m_btnMain;
+        public GGroup m_grpLeft;
         public UI_ButtonModle1 m_btnStudio;
         public UI_ButtonModle1 m_btnField;
-        public GList m_list;
-        public GButton m_btnChange;
+        public UI_ButtonModle1 m_btnPoem;
+        public GGroup m_grpRight;
+        public GGroup m_grpMove;
+        public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -67,44 +73,58 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_list = (GList)comp.GetChild("list");
+            m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
+            m_grpList = (GGroup)comp.GetChild("grpList");
+            m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
-            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
-            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
-            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
+            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
+            m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_btnStudio = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnStudio"));
             m_btnField = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnField"));
-            m_list = (GList)comp.GetChild("list");
-            m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_btnPoem = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnPoem"));
+            m_grpRight = (GGroup)comp.GetChild("grpRight");
+            m_grpMove = (GGroup)comp.GetChild("grpMove");
+            m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_valueBar = null;
+            m_list = null;
+            m_btnChange.Dispose();
+            m_btnChange = null;
+            m_grpList = null;
             m_headBar.Dispose();
             m_headBar = null;
-            m_valueBar = null;
             m_btnDailyLogin.Dispose();
             m_btnDailyLogin = null;
-            m_btnXiuFang.Dispose();
-            m_btnXiuFang = null;
-            m_btnMain.Dispose();
-            m_btnMain = null;
             m_btnHuanZhuang.Dispose();
             m_btnHuanZhuang = null;
-            m_btnZhaiXing.Dispose();
-            m_btnZhaiXing = null;
+            m_btnXiuFang.Dispose();
+            m_btnXiuFang = null;
             m_btnCiPai.Dispose();
             m_btnCiPai = null;
+            m_btnZhaiXing.Dispose();
+            m_btnZhaiXing = null;
+            m_btnMain.Dispose();
+            m_btnMain = null;
+            m_grpLeft = null;
             m_btnStudio.Dispose();
             m_btnStudio = null;
             m_btnField.Dispose();
             m_btnField = null;
-            m_list = null;
-            m_btnChange = null;
+            m_btnPoem.Dispose();
+            m_btnPoem = null;
+            m_grpRight = null;
+            m_grpMove = null;
+            m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -59,13 +59,24 @@ namespace GFGGame
                 }
                 if (isOptionalGuide) this.OnClickTarget();
             });
-            string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
-            SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath0, out _gameObject, out _wrapper);
+
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+
+            if (GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex == 1)
+            {
+                string resPath1 = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_dj_2");
+                SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath1, out _gameObject, out _wrapper);
+            }
+            else
+            {
+                string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
+                SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_comHolder.m_holder, resPath0, out _gameObject, out _wrapper);
+            }
             List<object> dataList = viewData as List<object>;
             guideTarget = dataList[0] as GObject;
             string txtContent = (string)dataList[1];
@@ -104,6 +115,7 @@ namespace GFGGame
             _ui.m_rectFrameTemp.visible = showAni;
 
             GRoot.inst.touchable = true;
+            MainDataManager.Instance.CanSwipe = false;
 
             if (guideTarget != null)
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -3,6 +3,7 @@ using UI.Main;
 using UnityEngine;
 using System.Collections.Generic;
 using ET;
+using System;
 
 namespace GFGGame
 {
@@ -12,7 +13,9 @@ namespace GFGGame
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
         private ValueBarController _valueBarController;
-
+        private SwipeGesture swipeGesture;
+        private const int swipeDistance = 100;
+        private float _listHeight = 0;
         private float effectTime = 0.7f;
         private bool isOpen = false;
         private GButton _btnGongGao;
@@ -52,7 +55,7 @@ namespace GFGGame
                 _valueBarController = null;
             }
 
-            for (int i = 0; i < _btns.Length; i++)
+            for (int i = 0; i < _effects.Count; i++)
             {
                 SceneController.DestroyObjectFromView(_effects[i], _wrappers[i]);
                 SceneController.DestroyObjectFromView(_effects1[i], _wrappers1[i]);
@@ -101,8 +104,8 @@ namespace GFGGame
             _btnTianGong = _ui.m_list.GetChild("btnTianGong").asButton;
             _btnTuJian = _ui.m_list.GetChild("btnTuJian").asButton;
             _btnJInShu = _ui.m_list.GetChild("btnJInShu").asButton;
-            _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
-            _btnField = _ui.m_list.GetChild("btnField").asButton;
+            // _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
+            // _btnField = _ui.m_list.GetChild("btnField").asButton;
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
 
             // _btnGongGao.visible = false;
@@ -113,14 +116,14 @@ namespace GFGGame
             _btnTianGong.visible = false;
 
             _btns = new UI_ButtonModle1[] { _ui.m_btnHuanZhuang, _ui.m_btnZhaiXing, _ui.m_btnXiuFang, _ui.m_btnCiPai, _ui.m_btnStudio, _ui.m_btnField };
-            _ui.m_btnMain.target.onTouchBegin.Add(OnClickBtnMain);
-            _ui.m_btnHuanZhuang.target.onTouchBegin.Add(OnClickBtnHuanZhuang);
-            _ui.m_btnZhaiXing.target.onTouchBegin.Add(OnClickBtnZhaiXing);
-            _ui.m_btnDailyLogin.target.onTouchBegin.Add(OnClickBtnDailyLogin);
-            _ui.m_btnXiuFang.target.onTouchBegin.Add(OnClickBtnXiuFang);
-            _ui.m_btnCiPai.target.onTouchBegin.Add(OnClickBtnCiPai);
-            _ui.m_btnStudio.target.onTouchBegin.Add(OnClickBtnStudio);
-            _ui.m_btnField.target.onTouchBegin.Add(OnClickBtnField);
+            _ui.m_btnMain.target.onClick.Add(OnClickBtnMain);
+            _ui.m_btnHuanZhuang.target.onClick.Add(OnClickBtnHuanZhuang);
+            _ui.m_btnZhaiXing.target.onClick.Add(OnClickBtnZhaiXing);
+            _ui.m_btnDailyLogin.target.onClick.Add(OnClickBtnDailyLogin);
+            _ui.m_btnXiuFang.target.onClick.Add(OnClickBtnXiuFang);
+            _ui.m_btnCiPai.target.onClick.Add(OnClickBtnCiPai);
+            _ui.m_btnStudio.target.onClick.Add(OnClickBtnStudio);
+            _ui.m_btnField.target.onClick.Add(OnClickBtnField);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
 
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -129,14 +132,19 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
-            _btnStudio.onClick.Add(OnClickBtnStudio);
-            _btnField.onClick.Add(OnClickBtnField);
+            // _btnStudio.onClick.Add(OnClickBtnStudio);
+            // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
 
-
-            AddEffect();
-
-            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + 4, 0).Coroutine();
+            _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
+            // AddEffect();
+            swipeGesture = new SwipeGesture(_ui.target);
+            swipeGesture.onAction.Add(OnSwipe);
+            swipeGesture.actionDistance = swipeDistance;
+            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + 12, 0).Coroutine();
+            _ui.m_list.ResizeToFit();
+            _ui.m_btnChange.m_c1.selectedIndex = 1;
+            _ui.m_btnChange.target.selected = true;
         }
         protected override void AddEventListener()
         {
@@ -148,7 +156,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_btnChange.selected = true;
+
             _ui.m_headBar.m_txtName.text = RoleDataManager.roleName;
             if (_sceneObject == null)
             {
@@ -161,13 +169,14 @@ namespace GFGGame
             UpdateRoleLvl();
             _valueBarController.OnShown();
 
+
             long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
             {
                 ViewManager.Show<DailyLoginView>();
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
-
+            SetPos();
             Timers.inst.AddUpdate(CheckGuide);
             Timers.inst.AddUpdate(Update);
         }
@@ -218,7 +227,101 @@ namespace GFGGame
             SceneController.AddObjectToView(_effectObj5, _wrapper5, _ui.m_headBar.m_holder, resPath2, out _effectObj5, out _wrapper5);
         }
 
+        private void SetPos()
+        {
+            if (MainDataManager.Instance.ViewType == 0)
+            {
+                _ui.m_t1.Stop();
+                _sceneObject.transform.position = Vector2.zero;
+            }
+            else if (MainDataManager.Instance.ViewType == 1)
+            {
+                _ui.m_t2.Stop();
+                _sceneObject.transform.position = new Vector2(-GRoot.inst.actualWidth / 100f, 0);
+            }
+        }
+        private void OnSwipe(EventContext context)
+        {
+            if (!MainDataManager.Instance.CanSwipe) return;
+
+            SwipeGesture swipeture = (SwipeGesture)context.sender;
+            if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 && swipeture.position.y > -swipeDistance && swipeture.position.y < swipeDistance)
+            {
+                MoveLeft();
+            }
+            else if (MainDataManager.Instance.ViewType == 1 && swipeture.position.x > 0 && swipeture.position.y > -swipeDistance && swipeture.position.y < swipeDistance)
+            {
+                MoveRight();
+            }
+        }
+        private void MoveLeft()
+        {
+            _ui.target.touchable = false;
+            TryCompleteGuide();
+
+            GTween.To(0, -GRoot.inst.actualWidth / 100f, 1f)
+            .SetTarget(_sceneObject)
+            .OnUpdate((GTweener t) =>
+            {
+                _sceneObject.transform.position = new Vector2(t.value.x, 0);
+            })
+            .SetEase(EaseType.CircInOut);
+            _ui.m_t1.Play(() =>
+            {
+                _ui.target.touchable = true;
+                MainDataManager.Instance.ViewType = 1;
+            });
+        }
+        private void MoveRight()
+        {
+
+            _ui.target.touchable = false;
+            GTween.To(-GRoot.inst.actualWidth / 100f, 0f, 1f)
+           .SetTarget(_sceneObject)
+           .OnUpdate((GTweener t) =>
+           {
+               _sceneObject.transform.position = new Vector2(t.value.x, 0);
+           })
+           .SetEase(EaseType.CircInOut);
+            _ui.m_t2.Play(() =>
+            {
+                _ui.target.touchable = true;
+                MainDataManager.Instance.ViewType = 0;
+            });
+        }
+        private void OnBtnChangClick()
+        {
+            int count = 0;
+            for (int i = 0; i < _ui.m_list.numItems; i++)
+            {
+                if (_ui.m_list.GetChildAt(i).visible == true) count++;
+            }
+            float height = count * (97 + 20);
+            if (_ui.m_btnChange.target.selected == true)
+            {
+                _ui.m_btnChange.m_c1.selectedIndex = 1;
+
+                GTween.To(0, height, 0.4f).SetTarget(_ui.m_list)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_list.height = t.value.x;
+                }).SetEase(EaseType.QuintInOut);
+                // _ui.m_list.ResizeToFit();
+                // _ui.m_btnChange.m_c1.selectedIndex = 1;
+            }
+            else
+            {
+                _ui.m_btnChange.m_c1.selectedIndex = 0;
 
+                GTween.To(height, 0, 0.4f).SetTarget(_ui.m_list)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_list.height = t.value.x;
+                }).SetEase(EaseType.QuintInOut);
+                // _ui.m_list.height = 0;
+                // _ui.m_btnChange.m_c1.selectedIndex = 0;
+            }
+        }
         private void OnClickBtnMain()
         {
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
@@ -411,13 +514,13 @@ namespace GFGGame
         {
             _ui.m_btnXiuFang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
             _ui.m_btnMain.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            // _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
             || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
-            // _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
@@ -425,8 +528,8 @@ namespace GFGGame
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
-            _btnStudio.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            _btnField.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            // _btnStudio.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            // _btnField.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             // _btnTianGong.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             // _btnPengYouQuan.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             // _btnJInShu.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
@@ -442,8 +545,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
-            RedDotController.Instance.SetComRedDot(_btnField, RedDotDataManager.Instance.GetFieldRed());
-            RedDotController.Instance.SetComRedDot(_btnStudio, RedDotDataManager.Instance.GetStudioFilingRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed());
         }
 
         private void CheckGuide(object param)
@@ -479,12 +582,23 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”，点击查看。", -1, false, 0, 0, 0, true, true);
 
-            GuideController.TryGuide(_btnStudio, ConstGuideId.STUDIO_OPEN, 1, "工作室开门啦，进去看看。");
+            bool isGuide = GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 1, "滑动界面看看。", -1, false, (int)(this.viewCom.height - 600), 0, 0, false);
+            if (isGuide)
+            {
+                MainDataManager.Instance.CanSwipe = true;
+            }
+
+            if (MainDataManager.Instance.ViewType == 1) GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_OPEN, 2, "工作室开门啦，进去看看。");
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
 
 
         }
+        protected override void TryCompleteGuide()
+        {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
+            GuideController.TryCompleteGuideIndex(cfg.id, 1);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -125,16 +125,16 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 2, "通关相应副本，可以获得各种升级材料哦，快开始今天的日常工作吧。", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
+            GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 3, "通关相应副本，可以获得各种升级材料哦，快开始今天的日常工作吧。", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
 
         }
 
         protected override void TryCompleteGuide()
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-            GuideController.TryCompleteGuideIndex(cfg.id, 2);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
+            GuideController.TryCompleteGuideIndex(cfg.id, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
         }
     }
 }

GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &8934048990313003903
+--- !u!1 &846544056943548434
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,90 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8934048990313003902}
-  - component: {fileID: 8934048990313003901}
+  - component: {fileID: 2397053893390390833}
+  - component: {fileID: 2950675430542732463}
+  m_Layer: 0
+  m_Name: Bg1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2397053893390390833
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846544056943548434}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.8, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2950675430542732463
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846544056943548434}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -999
+  m_Sprite: {fileID: 21300000, guid: eee2437b6cdf59c46a1f6936ab081a3e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.8046875, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &1202262495373414002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2432797848204161373}
+  - component: {fileID: 726315018073398983}
   m_Layer: 0
   m_Name: Bg
   m_TagString: Untagged
@@ -17,13 +99,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8934048990313003902
+--- !u!4 &2432797848204161373
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8934048990313003903}
+  m_GameObject: {fileID: 1202262495373414002}
   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 +113,13 @@ Transform:
   m_Father: {fileID: 8934048990737965464}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &8934048990313003901
+--- !u!212 &726315018073398983
 SpriteRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8934048990313003903}
+  m_GameObject: {fileID: 1202262495373414002}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -71,7 +153,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 3292dbe82a207d9489a8d8d48103b832, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1813906bd64fd34458617bdd17d54c02, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -109,7 +191,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8934048990313003902}
+  - {fileID: 2432797848204161373}
+  - {fileID: 2397053893390390833}
   - {fileID: 3768987550495608174}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -123,7 +206,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x