资源栏优化

FGUIProject/assets/Card/CardDetailUI.xml

@@ -10,10 +10,7 @@
     <image id="n7_pq5x" name="n7" src="pq5x62" fileName="images/kp_xian_di.png" xy="30,269" size="1020,2">
       <relation target="" sidePair="center-center,top-top"/>
     </image>
-    <component id="n1_ojlz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-    <component id="n2_ojlz" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="164,80">
+    <component id="n1_ojlz" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n5_ojlz" name="btnFilter" src="ojlzd" fileName="components/btnFilter.xml" xy="854,96">

FGUIProject/assets/Card/components/ComCard.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1100">
-  <displayList>
-    <loader id="n1_ojlz" name="loaCard" xy="540,129" pivot="0.5,0" anchor="true" size="464,725" fill="scaleFree"/>
-    <component id="n9_ojlz" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,832"/>
-    <component id="n10_842s" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="291,73"/>
-    <component id="n11_lc71" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="54,64"/>
-  </displayList>
-</component>

FGUIProject/assets/Card/components/ComFosterTop.xml

@@ -3,6 +3,6 @@
   <displayList>
     <image id="n71_lc71" name="n71" src="842s6d" fileName="images/kp_bj_1.png" xy="0,0"/>
     <component id="n69_lc71" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,6"/>
+    <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
   </displayList>
 </component>

FGUIProject/assets/Card/package.xml

@@ -8,7 +8,6 @@
     <component id="ojlzi" name="ListCardItem.xml" path="/components/"/>
     <component id="ojlzj" name="CardFosterUI.xml" path="/" exported="true"/>
     <component id="ojlzl" name="btnStory.xml" path="/components/"/>
-    <component id="ojlzn" name="ComCard.xml" path="/components/"/>
     <component id="ojlzr" name="btnTab.xml" path="/components/"/>
     <image id="pq5x5y" name="kp_anniu_2.png" path="/images/"/>
     <image id="pq5x60" name="kp_dikuang_1.png" path="/images/"/>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -9,8 +9,7 @@
       <relation target="" sidePair="top-top"/>
     </image>
     <image id="n22_qyr6" name="n22" src="qyr6n" fileName="images/fzfj_erdituditu.png" xy="72,406"/>
-    <image id="n23_qyr6" name="n23" src="qyr6p" fileName="images/fzfj_btbt.png" xy="0,45"/>
-    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
+    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,7"/>
     <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_wlc2" name="btnRule" src="wlc21" fileName="components/Button1.xml" xy="975,194"/>
     <list id="n29_ez2u" name="listTab" xy="100,343" size="880,63" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" colGap="12">

FGUIProject/assets/ClothingFoster/ClothingListUI.xml

@@ -4,9 +4,6 @@
     <loader id="n12_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,90">
-      <relation target="" sidePair="right-right,top-top"/>
-    </component>
     <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>

FGUIProject/assets/ClothingFoster/ClothingUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <controller name="c2" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n40_fz8v" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
@@ -10,11 +10,8 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n4_pjip" name="n4" src="bd1c1a" fileName="images/fzyc_mzkuang.png" xy="347,80"/>
-    <text id="n3_pjip" name="txtName" xy="346,94" size="387,52" fontSize="38" color="#9d824e" align="center" autoSize="none" text="分类名称">
-      <relation target="n4_pjip" sidePair="center-center,middle-middle"/>
-    </text>
-    <loader id="n18_py5g" name="loaRarity" xy="940,124" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
+    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,6"/>
+    <loader id="n18_py5g" name="loaRarity" xy="940,140" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
     <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -26,12 +23,34 @@
     </component>
     <component id="n12_py5g" name="btnTabFoster" src="py5gm" fileName="components/Button5.xml" xy="243,1259">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://uicwtr5bbd1c1i" selectedIcon="ui://uicwtr5bbd1c1h" controller="c1" page="0"/>
+      <Button checked="true" icon="ui://uicwtr5bbd1c1i" selectedIcon="ui://uicwtr5bbd1c1h" controller="c1" page="0"/>
     </component>
     <component id="n13_py5g" name="btnTabRenew" src="py5gm" fileName="components/Button5.xml" xy="561,1259">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button checked="true" icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
+      <Button icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
     </component>
+    <image id="n4_pjip" name="n4" src="bd1c1a" fileName="images/fzyc_mzkuang.png" xy="347,1128" group="n41_r9ri"/>
+    <text id="n3_pjip" name="txtName" xy="346,1142" size="387,52" group="n41_r9ri" fontSize="38" color="#9d824e" align="center" autoSize="none" text="套装名称"/>
+    <group id="n41_r9ri" name="n41" xy="346,1128" size="387,78" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
+    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" group="n29_nk8d"/>
+    <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1766" group="n29_nk8d"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
+    <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1411" size="300,300" group="n39_l4ui"/>
+    <list id="n25_nk8d" name="listRenewMaterial" xy="428,1468" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
+      <item/>
+      <item/>
+    </list>
+    <group id="n39_l4ui" name="n39" xy="68,1411" size="944,300" group="n29_nk8d" advanced="true" layout="hz" colGap="60" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n29_nk8d" name="grpRenew" xy="68,1386" size="944,509" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
     <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1416" group="n21_nk8d"/>
     <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1140" group="n21_nk8d"/>
     <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1432" group="n21_nk8d"/>
@@ -52,23 +71,6 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1375" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
-    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1706" group="n29_nk8d"/>
-    <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1755" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="442,1840" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
-    <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1400" size="300,300" group="n39_l4ui"/>
-    <list id="n25_nk8d" name="listRenewMaterial" xy="428,1457" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
-      <item/>
-      <item/>
-    </list>
-    <group id="n39_l4ui" name="n39" xy="68,1400" size="944,300" group="n29_nk8d" advanced="true" layout="hz" colGap="60" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <group id="n29_nk8d" name="grpRenew" xy="68,1375" size="944,509" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <relation target="" sidePair="bottom-bottom"/>
-    </group>
     <text id="n30_nk8d" name="n30" xy="414,1410" size="252,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
     <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="408,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
     <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="390,1578" group="n34_nk8d"/>

FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,3,,4,,5,,6," selected="4">
+  <controller name="c1" pages="2,,3,,4,,5,,6," selected="0">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -77,12 +77,12 @@
       </item>
     </list>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,105" controller="c1,6">
-      <gearXY controller="c1" pages="2,3,4,5,6" values="159,90|0,90|0,105|0,105|0,105"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6">
+      <gearXY controller="c1" pages="2,3,4,5,6" values="0,95|0,90|0,105|0,105|0,105"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="画廊商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店">
       <gearText controller="c1" pages="4,6" values="落星商店|画廊商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" advanced="true">

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -7,7 +7,7 @@
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,319"/>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,220"/>
-    <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" pivot="1,0" controller="c1,6"/>
+    <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
     <image id="n3_j539" name="n3" src="j539p" fileName="images/hc_btkuang.png" pkg="eg2y0ldp" xy="259,218"/>
     <text id="n4_j539" name="txtSuitName" xy="466,220" size="148,49" fontSize="36" color="#fdf4e3" text="套装名字">
       <relation target="n3_j539" sidePair="center-center,middle-middle"/>

FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -3,11 +3,11 @@
   <displayList>
     <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
     <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" xy="731,131"/>
-    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="69,237" group="n21_ai2z"/>
+    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="69,267" group="n21_ai2z"/>
     <loader id="n4_hinb" name="icon" xy="101,66" size="200,200" group="n21_ai2z" aspect="true"/>
     <loader id="n17_ugdz" name="rarity" xy="257,66" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n5_hinb" name="txtName" xy="169,236" pivot="0.5,0" size="63,42" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" text="名字"/>
-    <group id="n21_ai2z" name="n21" xy="69,66" size="264,212"/>
+    <text id="n5_hinb" name="txtName" xy="169,266" pivot="0.5,0" size="63,41" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" text="名字"/>
+    <group id="n21_ai2z" name="n21" xy="69,66" size="264,241"/>
     <image id="n8_hinb" name="n8" src="ai2z9d" fileName="imagesExport/hb_kuangdi_1.png" xy="353,138" group="n22_ai2z"/>
     <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" xy="618,130" group="n22_ai2z"/>
     <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" xy="344,130" group="n22_ai2z"/>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1019">
+<component size="962,970">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,1041">
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992">
       <relation target="" sidePair="height-height"/>
     </component>
     <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
@@ -13,30 +13,28 @@
     <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <text id="n28_s5s9" name="txtExchangeCount" xy="230,314" pivot="1,0" size="69,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
     <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,474" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="n3" xy="359,452" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,452" size="897,54"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,582" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,580" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,445" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="359,423" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,423" size="897,54"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,530" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,528" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,581" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,579" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,529" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,527" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="338,587" pivot="0.5,0" size="54,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,579" size="612,70"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,882" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="338,535" pivot="0.5,0" size="54,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="175,527" size="612,70"/>
+    <text id="n24_si5z" name="txtTips" xy="317,648" pivot="0.5,0" size="328,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="359,739" pivot="0.5,0" group="n26_si5z"/>
+    <group id="n26_si5z" name="n26" xy="317,648" size="328,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,827" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,882" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,827" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,882" size="714,89"/>
-    <text id="n24_si5z" name="txtTips" xy="317,700" pivot="0.5,0" size="328,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="359,791" pivot="0.5,0" group="n26_si5z"/>
-    <group id="n26_si5z" name="n26" xy="317,700" size="328,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true">
-      <relation target="" sidePair="middle-middle"/>
-    </group>
+    <group id="n20_si5z" name="n20" xy="124,827" size="714,89"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="1"/>
+  <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-34,6" size="578,116" url="ui://eg2y0ldpuyuxtj8" autoSize="true">
+    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" url="ui://eg2y0ldpuyuxtj7" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpuyuxtj7|ui://eg2y0ldpuyuxtj8"/>
     </loader>
     <loader id="n3_uyux" name="icon" xy="0,0" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>

FGUIProject/assets/CommonGame/package.xml

@@ -216,7 +216,7 @@
     <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
     <image id="r9ritji" name="anniuty3.png" path="/images/" exported="true"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
-    <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/"/>
+    <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/" scale="9grid" scale9grid="240,281,480,562"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <component id="r9ritjn" name="RuleUI.xml" path="/" exported="true"/>
   </resources>

FGUIProject/assets/DailyTask/DailyTaskUI.xml

@@ -32,7 +32,7 @@
     <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="697,1748">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,6">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -14,20 +14,16 @@
         <item title="5"/>
       </ComboBox>
     </component>
-    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60" group="n38_8lqj">
+    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="34,200" group="n38_8lqj" visible="false">
+    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,200" group="n38_8lqj" visible="false">
       <relation target="n1_qsvd" sidePair="left-left,top-top"/>
     </component>
-    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="23,230" group="n33_j48o">
-      <relation target="n2_qsvd" sidePair="left-left,top-top"/>
-    </image>
-    <loader id="n24_d4iw" name="scoreType" xy="18,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n14_vxw5" name="txtScore" xy="77,232" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
-      <relation target="n16_8xpg" sidePair="center-center,middle-middle"/>
-    </text>
-    <group id="n33_j48o" name="n33" xy="18,230" size="208,57" group="n38_8lqj"/>
+    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="24,230" group="n33_j48o"/>
+    <loader id="n24_d4iw" name="scoreType" xy="23,232" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n14_vxw5" name="txtScore" xy="78,232" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
+    <group id="n33_j48o" name="n33" xy="23,230" size="204,57" group="n38_8lqj"/>
     <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,305" group="n38_8lqj"/>
     <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -19,11 +19,11 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbrc0744"/>
     </component>
-    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60" group="n30_8lqj">
+    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n30_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n4_q08x" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n30_8lqj" visible="false"/>
-    <component id="n13_q08x" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n30_8lqj">
+    <component id="n13_q08x" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,80" group="n30_8lqj">
       <gearDisplay controller="c2" pages="0"/>
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
         <item title="1"/>

FGUIProject/assets/Field/FieldUI.xml

@@ -5,10 +5,10 @@
     <loader id="n34_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n11_ohun" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,1">
+    <component id="n11_ohun" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="30,80">
+    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <image id="n12_ohun" name="n12" src="ohuni" fileName="images/tydc_jbkuang_1.png" xy="166,202" group="n19_ohun"/>

FGUIProject/assets/FieldGuide/FieldGuideUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n2_pjip" name="compBanner" src="pjipg" fileName="components/CompBanner.xml" xy="0,0"/>
-    <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <list id="n13_pjip" name="listGuide" xy="43,407" size="994,1513" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -5,8 +5,7 @@
     <loader id="n18_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n0_pjip" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
-    <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376">
       <gearDisplay controller="c1" pages="0"/>
     </image>

FGUIProject/assets/FieldGuide/TravelGuideUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_s61p" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3b"/>

FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -4,7 +4,7 @@
     <loader id="n15_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3c"/>
     </component>
     <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m" autoClearItems="true">

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -4,11 +4,11 @@
     <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usvek811">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>
     </list>
-    <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n32_vek8"/>
-    <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8"/>
-    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n32_vek8">
+    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n32_vek8">
       <relation target="" sidePair="right-right"/>
     </component>
+    <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n32_vek8"/>
+    <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8"/>
     <group id="n32_vek8" name="grpTop" xy="0,80" size="1080,236" advanced="true"/>
     <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
     <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>

FGUIProject/assets/Main/MainUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080" designImageOffsetY="-240">
   <displayList>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
     <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"/>

FGUIProject/assets/Main/StoryChapterListUI.xml

@@ -11,7 +11,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n1_slb4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70" visible="false"/>
     <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" visible="false" layout="row" colGap="10">

FGUIProject/assets/Main/StoryChapterUI.xml

@@ -4,7 +4,7 @@
     <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="0,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,1"/>
+    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1"/>
     <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <image id="n5_v354" name="n5" src="v3541y" fileName="imagesStory/zx_gka_di_1.png" xy="34,375" aspect="true"/>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,7 +7,7 @@
     <image id="n52_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="154,108" pivot="0,0.5" anchor="true">

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -4,7 +4,7 @@
     <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,108" pivot="0,0.5" anchor="true">

FGUIProject/assets/RechargeStore/RechargeStoreUI.xml

@@ -6,7 +6,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n3_d4iw" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,10"/>
+    <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <image id="n15_10not" name="n15" src="dmsi1d" fileName="images/sc_kuangjia_1.png" xy="0,414" size="1080,1506">
       <relation target="" sidePair="height-height,top-top"/>
     </image>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -32,7 +32,7 @@
       <item/>
     </list>
     <component id="n18_n3xh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,1"/>
+    <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1"/>
     <text id="n21_n3xh" name="txtNum" xy="709,264" size="243,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
     <text id="n20_n3xh" name="txtTime" xy="476,264" size="204,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
     <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,250" group="n23_fa5e"/>

FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_rqo4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n25_v482" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,1">
+    <component id="n25_v482" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="10,60">

FGUIProject/assets/Studio/StudioUI.xml

@@ -4,7 +4,7 @@
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>

FGUIProject/assets/Travel/TravelUI.xml

@@ -10,8 +10,8 @@
     <graph id="n9_wono" name="n9" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
-    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,8"/>
+    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
+  <controller name="c1" pages="0,,1,,2,,3," selected="3">
+    <remark page="0" value="推荐"/>
+    <remark page="1" value="好友"/>
+    <remark page="2" value="收藏"/>
+    <remark page="3" value="我的"/>
+  </controller>
   <displayList>
-    <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <loader id="n1_r9ri" name="loaPicture" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <component id="n2_r9ri" name="comHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="mfvz4q8k" xy="327,149" pivot="0.5,0.5" scale="1.6,1.6"/>
-    <text id="n3_r9ri" name="txtlevel" xy="453,269" size="59,42" fontSize="30" text="999"/>
-    <text id="n4_r9ri" name="txtName" xy="515,203" size="63,42" fontSize="30" text="老六"/>
+    <text id="n3_r9ri" name="txtlevel" xy="453,269" size="59,41" fontSize="30" text="999"/>
+    <text id="n4_r9ri" name="txtName" xy="515,203" size="63,41" fontSize="30" text="老六"/>
     <component id="n7_r9ri" name="btnAddFriend" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="944,283" size="77,76">
+      <gearDisplay controller="c1" pages="0,2"/>
       <Button title="好友" icon="ui://iyz778gkuyuxzp"/>
     </component>
     <component id="n8_r9ri" name="btnDelete" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="942,426" size="77,76">
+      <gearDisplay controller="c1" pages="3"/>
       <Button title="删除作品" icon="ui://iyz778gkuyuxzp"/>
     </component>
     <component id="n5_r9ri" name="btnVote" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="938,1819" size="77,76">

FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -5,7 +5,7 @@
     <loader id="n0_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n1_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>

FGUIProject/assets/poem/PoemPhotoShareUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth">
       <gearDisplay controller="c1" pages="0"/>
@@ -10,19 +10,19 @@
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
-    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n2_v482" name="btnSave" src="v482e" fileName="components/Button5.xml" xy="666,1391" group="n4_mdd9"/>
-    <component id="n3_v482" name="btnShare" src="v482e" fileName="components/Button5.xml" xy="846,1391" group="n4_mdd9">
+    <component id="n2_v482" name="btnSave" src="v482e" fileName="componentsPhoto/Button5.xml" xy="699,1756" group="n4_mdd9"/>
+    <component id="n3_v482" name="btnShare" src="v482e" fileName="componentsPhoto/Button5.xml" xy="879,1756" group="n4_mdd9">
       <Button icon="ui://iyz778gkuyuxzk"/>
     </component>
-    <group id="n4_mdd9" name="n4" xy="666,1391" size="320,116" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
+    <group id="n4_mdd9" name="n4" xy="699,1756" size="320,116" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <gearXY controller="c1" pages="1" values="666,1391" default="699,1756"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </group>
-    <component id="n5_wono" name="comPostcard" src="wono10t" fileName="components/ComPostcard.xml" xy="540,960" pivot="0.5,0.5" anchor="true">
+    <component id="n5_wono" name="comPostcard" src="wono10t" fileName="componentsPhoto/ComPostcard.xml" xy="540,960" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="middle-middle"/>
     </component>

FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -6,7 +6,7 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60" controller="c1,1">
+    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>

FGUIProject/assets/poem/PoemUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60">
+    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>

FGUIProject/assets/poem/componentsGallery/ComRank.xml

@@ -5,7 +5,7 @@
     <loader id="n0_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="34,60" controller="c1,1">
+    <component id="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="38,80" controller="c1,1">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>
@@ -18,12 +18,12 @@
       <item/>
     </list>
     <component id="n8_r9ri" name="comHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="mfvz4q8k" xy="207,1672" pivot="0.5,0.5" scale="1.6,1.6"/>
-    <text id="n9_r9ri" name="txtName" xy="408,1747" size="63,42" fontSize="30" text="老六"/>
-    <text id="n11_r9ri" name="txtRank" xy="543,1746" size="37,42" fontSize="30" text="- -"/>
+    <text id="n9_r9ri" name="txtName" xy="408,1747" size="63,41" fontSize="30" text="老六"/>
+    <text id="n11_r9ri" name="txtRank" xy="543,1746" size="37,41" fontSize="30" text="- -"/>
     <component id="n10_r9ri" name="n10" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="742,1729" size="77,76">
       <Button icon="ui://iyz778gkuyuxzp"/>
     </component>
-    <text id="n12_r9ri" name="n12" xy="316,939" size="448,42" fontSize="30" text="排行榜数据正在结算，请稍后再来">
+    <text id="n12_r9ri" name="n12" xy="316,939" size="448,41" fontSize="30" text="排行榜数据正在结算，请稍后再来">
       <gearDisplay controller="c1" pages="1"/>
     </text>
   </displayList>

FGUIProject/assets/poem/package.xml

@@ -53,7 +53,7 @@
     <component id="wono10t" name="ComPostcard.xml" path="/componentsPhoto/"/>
     <component id="r9ri10u" name="PoemGalleryUI.xml" path="/" exported="true"/>
     <component id="r9ri10v" name="Button9.xml" path="/componentsGallery/"/>
-    <component id="r9ri10w" name="ListRecommendItem.xml" path="/componentsGallery/"/>
+    <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/"/>
     <component id="r9ri10x" name="ComRank.xml" path="/componentsGallery/"/>
     <component id="r9ri10y" name="ListRankItem.xml" path="/componentsGallery/"/>
     <component id="r9ri114" name="ComNormal.xml" path="/componentsGallery/"/>

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

@@ -9,40 +9,64 @@ namespace GFGGame
 {
     public class PoemGalleryDataManager : SingletonBase<PoemGalleryDataManager>
     {
+
+
+
         /// <summary>
-        /// 推荐数据
+        /// 推荐Id数据
         /// </summary>
-        /// <typeparam name="PoemGalleryData"></typeparam>
-        /// <returns></returns>
-        public List<PoemGalleryData> RecommendInfos = new List<PoemGalleryData>();
+        public List<long> RecommendInfos = new List<long>();
 
         /// <summary>
-        /// 好友数据
+        /// 好友Id数据
         /// </summary>
-        /// <typeparam name="PoemGalleryData"></typeparam>
-        /// <returns></returns>
-        public List<PoemGalleryData> FrinedInfos = new List<PoemGalleryData>();
+        public List<long> FrinedInfos = new List<long>();
 
         /// <summary>
-        /// 收藏数据
+        /// 收藏Id数据
         /// </summary>
-        /// <typeparam name="PoemGalleryData"></typeparam>
-        /// <returns></returns>
-        public List<PoemGalleryData> FavoriteInfos = new List<PoemGalleryData>();
+        public List<long> FavoriteInfos = new List<long>();
 
         /// <summary>
-        /// 我的作品数据
+        /// 我的作品Id数据
         /// </summary>
-        /// <typeparam name="PoemGalleryData"></typeparam>
-        /// <returns></returns>
-        public List<PoemGalleryData> MySelfInfos = new List<PoemGalleryData>();
+        public List<long> MySelfInfos = new List<long>();
 
+
+        private Dictionary<long, PoemGalleryData> _dicGalleryInfo = new Dictionary<long, PoemGalleryData>();
         public void Clear()
         {
+            _dicGalleryInfo.Clear();
             RecommendInfos.Clear();
             FrinedInfos.Clear();
             FavoriteInfos.Clear();
             MySelfInfos.Clear();
         }
+        public void AddGalleryData(PoemGalleryData data)
+        {
+            _dicGalleryInfo.Add(data.PictureId, data);
+        }
+        public void RemoveGalleryData(PoemGalleryData data)
+        {
+            if (_dicGalleryInfo.ContainsKey(data.PictureId))
+            {
+                _dicGalleryInfo.Remove(data.PictureId);
+            }
+        }
+        public void UpdateGalleryData(PoemGalleryData data)
+        {
+            if (_dicGalleryInfo.ContainsKey(data.PictureId))
+            {
+                _dicGalleryInfo.Remove(data.PictureId);
+            }
+        }
+        public PoemGalleryData GetGalleryDataById(long pictureId)
+        {
+            if (_dicGalleryInfo.ContainsKey(pictureId))
+            {
+                return _dicGalleryInfo[pictureId];
+            }
+            return null;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardDetailUI.cs

@@ -9,7 +9,6 @@ namespace UI.Card
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GButton m_btnHome;
         public GButton m_btnFilter;
         public GList m_listRole;
         public GList m_listCard;
@@ -63,7 +62,6 @@ namespace UI.Card
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnHome = (GButton)comp.GetChild("btnHome");
             m_btnFilter = (GButton)comp.GetChild("btnFilter");
             m_listRole = (GList)comp.GetChild("listRole");
             m_listCard = (GList)comp.GetChild("listCard");
@@ -73,7 +71,6 @@ namespace UI.Card
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_btnHome = null;
             m_btnFilter = null;
             m_listRole = null;
             m_listCard = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingListUI.cs

@@ -8,7 +8,6 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GComboBox m_comBoxSort;
         public GButton m_btnNotGet;
@@ -62,7 +61,6 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comBoxSort = (GComboBox)comp.GetChild("comBoxSort");
             m_btnNotGet = (GButton)comp.GetChild("btnNotGet");
@@ -72,7 +70,6 @@ namespace UI.ClothingFoster
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_valueBar = null;
             m_btnBack = null;
             m_comBoxSort = null;
             m_btnNotGet = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingUI.cs

@@ -12,17 +12,13 @@ namespace UI.ClothingFoster
         public GLoader m_loaBg;
         public GGraph m_holder;
         public GButton m_btnBack;
-        public GTextField m_txtName;
+        public GComponent m_valueBar;
         public GLoader m_loaRarity;
         public GButton m_btnRight;
         public GButton m_btnLeft;
         public GButton m_btnTabFoster;
         public GButton m_btnTabRenew;
-        public UI_ComFosterReward m_comFosterReward;
-        public GButton m_btnPropertyShow;
-        public GList m_listProperty;
-        public GList m_listFoster;
-        public GGroup m_grpFoster;
+        public GTextField m_txtName;
         public GTextField m_txtRenewProperty;
         public GComponent m_comRenewCost;
         public GButton m_btnRenew;
@@ -30,6 +26,11 @@ namespace UI.ClothingFoster
         public UI_ComRenewReward m_comRenewReward;
         public GList m_listRenewMaterial;
         public GGroup m_grpRenew;
+        public UI_ComFosterReward m_comFosterReward;
+        public GButton m_btnPropertyShow;
+        public GList m_listProperty;
+        public GList m_listFoster;
+        public GGroup m_grpFoster;
         public GTextField m_txtRenewShow;
         public UI_ComRenewRewardGet m_comRenewRewardGet;
         public GGroup m_grpRenewFinish;
@@ -86,17 +87,13 @@ namespace UI.ClothingFoster
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_holder = (GGraph)comp.GetChild("holder");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_btnRight = (GButton)comp.GetChild("btnRight");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnTabFoster = (GButton)comp.GetChild("btnTabFoster");
             m_btnTabRenew = (GButton)comp.GetChild("btnTabRenew");
-            m_comFosterReward = (UI_ComFosterReward)UI_ComFosterReward.Create(comp.GetChild("comFosterReward"));
-            m_btnPropertyShow = (GButton)comp.GetChild("btnPropertyShow");
-            m_listProperty = (GList)comp.GetChild("listProperty");
-            m_listFoster = (GList)comp.GetChild("listFoster");
-            m_grpFoster = (GGroup)comp.GetChild("grpFoster");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtRenewProperty = (GTextField)comp.GetChild("txtRenewProperty");
             m_comRenewCost = (GComponent)comp.GetChild("comRenewCost");
             m_btnRenew = (GButton)comp.GetChild("btnRenew");
@@ -104,6 +101,11 @@ namespace UI.ClothingFoster
             m_comRenewReward = (UI_ComRenewReward)UI_ComRenewReward.Create(comp.GetChild("comRenewReward"));
             m_listRenewMaterial = (GList)comp.GetChild("listRenewMaterial");
             m_grpRenew = (GGroup)comp.GetChild("grpRenew");
+            m_comFosterReward = (UI_ComFosterReward)UI_ComFosterReward.Create(comp.GetChild("comFosterReward"));
+            m_btnPropertyShow = (GButton)comp.GetChild("btnPropertyShow");
+            m_listProperty = (GList)comp.GetChild("listProperty");
+            m_listFoster = (GList)comp.GetChild("listFoster");
+            m_grpFoster = (GGroup)comp.GetChild("grpFoster");
             m_txtRenewShow = (GTextField)comp.GetChild("txtRenewShow");
             m_comRenewRewardGet = (UI_ComRenewRewardGet)UI_ComRenewRewardGet.Create(comp.GetChild("comRenewRewardGet"));
             m_grpRenewFinish = (GGroup)comp.GetChild("grpRenewFinish");
@@ -116,18 +118,13 @@ namespace UI.ClothingFoster
             m_loaBg = null;
             m_holder = null;
             m_btnBack = null;
-            m_txtName = null;
+            m_valueBar = null;
             m_loaRarity = null;
             m_btnRight = null;
             m_btnLeft = null;
             m_btnTabFoster = null;
             m_btnTabRenew = null;
-            m_comFosterReward.Dispose();
-            m_comFosterReward = null;
-            m_btnPropertyShow = null;
-            m_listProperty = null;
-            m_listFoster = null;
-            m_grpFoster = null;
+            m_txtName = null;
             m_txtRenewProperty = null;
             m_comRenewCost = null;
             m_btnRenew = null;
@@ -136,6 +133,12 @@ namespace UI.ClothingFoster
             m_comRenewReward = null;
             m_listRenewMaterial = null;
             m_grpRenew = null;
+            m_comFosterReward.Dispose();
+            m_comFosterReward = null;
+            m_btnPropertyShow = null;
+            m_listProperty = null;
+            m_listFoster = null;
+            m_grpFoster = null;
             m_txtRenewShow = null;
             m_comRenewRewardGet.Dispose();
             m_comRenewRewardGet = null;

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

@@ -14,14 +14,15 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
+        public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
         public UI_Button16 m_btnAdd;
         public UI_Button3 m_btnMax;
         public GTextField m_txtCostCount;
-        public GButton m_btnCancle;
-        public GButton m_btnConfirm;
         public GTextField m_txtTips;
         public UI_ComCostCurrency m_comCost;
+        public GButton m_btnCancle;
+        public GButton m_btnConfirm;
         public const string URL = "ui://eg2y0ldps5s9tik";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ItemExchangeUI";
@@ -76,14 +77,15 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
+            m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
             m_btnAdd = (UI_Button16)UI_Button16.Create(comp.GetChild("btnAdd"));
             m_btnMax = (UI_Button3)UI_Button3.Create(comp.GetChild("btnMax"));
             m_txtCostCount = (GTextField)comp.GetChild("txtCostCount");
-            m_btnCancle = (GButton)comp.GetChild("btnCancle");
-            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_comCost = (UI_ComCostCurrency)UI_ComCostCurrency.Create(comp.GetChild("comCost"));
+            m_btnCancle = (GButton)comp.GetChild("btnCancle");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -94,6 +96,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_txtDesc = null;
             m_txtExchangeCount = null;
+            m_txtShow = null;
             m_btnMinus.Dispose();
             m_btnMinus = null;
             m_btnAdd.Dispose();
@@ -101,11 +104,11 @@ namespace UI.CommonGame
             m_btnMax.Dispose();
             m_btnMax = null;
             m_txtCostCount = null;
-            m_btnCancle = null;
-            m_btnConfirm = null;
             m_txtTips = null;
             m_comCost.Dispose();
             m_comCost = null;
+            m_btnCancle = null;
+            m_btnConfirm = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideUI.cs

@@ -9,7 +9,6 @@ namespace UI.FieldGuide
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_listType;
         public GList m_listSuit;
@@ -66,7 +65,6 @@ namespace UI.FieldGuide
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listType = (GList)comp.GetChild("listType");
             m_listSuit = (GList)comp.GetChild("listSuit");
@@ -79,7 +77,6 @@ namespace UI.FieldGuide
         {
             m_c1 = null;
             m_loaBg = null;
-            m_valueBar = null;
             m_btnBack = null;
             m_listType = null;
             m_listSuit = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxUI.cs

@@ -8,9 +8,9 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GList m_listBg;
+        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GButton m_btnHome;
-        public GComponent m_valueBar;
         public GGroup m_grpTop;
         public GButton m_btnLeft;
         public GButton m_btnRight;
@@ -62,9 +62,9 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_listBg = (GList)comp.GetChild("listBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_grpTop = (GGroup)comp.GetChild("grpTop");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
@@ -72,9 +72,9 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_listBg = null;
+            m_valueBar = null;
             m_btnBack = null;
             m_btnHome = null;
-            m_valueBar = null;
             m_grpTop = null;
             m_btnLeft = null;
             m_btnRight = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListRecommendItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Poem
 {
-    public partial class UI_ListRecommendItem
+    public partial class UI_ListItem
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -13,12 +13,12 @@ namespace UI.Poem
         public GButton m_btnVote;
         public const string URL = "ui://iyz778gkr9ri10w";
         public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ListRecommendItem";
-        private static UI_ListRecommendItem _proxy;
+        public const string RES_NAME = "ListItem";
+        private static UI_ListItem _proxy;
 
-        public static UI_ListRecommendItem Create(GObject gObject = null)
+        public static UI_ListItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListRecommendItem();
+            var ui = new UI_ListItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.Poem
             return ui;
         }
 
-        public static UI_ListRecommendItem Proxy(GObject gObject = null)
+        public static UI_ListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListRecommendItem();
+                _proxy = new UI_ListItem();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d10a9a033b342a47acf068d5b37c1ec
+guid: 79c2e092b864c2845b83015f3041d3b7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ListRecommendItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryPreviewUI.cs

@@ -7,6 +7,7 @@ namespace UI.Poem
     public partial class UI_PoemGalleryPreviewUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GButton m_btnback;
         public GLoader m_loaPicture;
         public GComponent m_comHead;
@@ -63,6 +64,7 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_loaPicture = (GLoader)comp.GetChild("loaPicture");
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -75,6 +77,7 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_btnback = null;
             m_loaPicture = null;
             m_comHead = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemGallerySProxy.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using ET;
-using FairyGUI;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace GFGGame
-{
-    public static class PoemGallerySProxy
-    {
-
-    }
-
-}

GameClient/Assets/Game/HotUpdate/ServerProxy/PoemPhotoSProxy.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Http;
 using ET;
 using FairyGUI;
-using GFGGame;
-using ICSharpCode.SharpZipLib.GZip;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -32,9 +29,15 @@ namespace GFGGame
                         photoData.ToppingStatus = response.PictureInfosA[i].ToppingStatus;
                         photoData.LockingStatus = response.PictureInfosA[i].LockingStatus;
                         photoData.SourceType = response.PictureInfosA[i].SourceType;
-
                         photoData.PictureTempUrl = response.PictureInfosA[i].PictureTempUrl;
-                        Timers.inst.StartCoroutine(DownloadFile(photoData));
+                        ET.Log.Debug("PictureId0:" + photoData.PictureId);
+                        Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(photoData.PictureTempUrl, (Texture2D texture) =>
+                        {
+                            ET.Log.Debug("PictureId1:" + photoData.PictureId);
+
+                            photoData.Bytes = texture.EncodeToJPG();
+                            photoData.Ntexture = new NTexture(texture);
+                        }));
                         PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.PersonalAlbum);
                     }
                     for (int i = 0; i < response.PictureInfosB.Count; i++)
@@ -50,7 +53,6 @@ namespace GFGGame
                         photoData.TravelSuitId = response.PictureInfosB[i].TravelSuitId;
                         photoData.SuitResIndex = response.PictureInfosB[i].TravelSuitResourceIndex;
                         photoData.PositionIndex = response.PictureInfosB[i].PositionIndex;
-                        // Timers.inst.StartCoroutine(DownloadFile(photoData));
 
                         PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.WanShuiQianShan);
                     }
@@ -60,49 +62,49 @@ namespace GFGGame
             return false;
         }
 
-        //获取图片的临时上传地址协议
-        public static async ETTask<string[]> ReqTempPictureUrl(int pictureType)
-        {
-            S2C_GetTempPictureUrl response = null;
-            response = (S2C_GetTempPictureUrl)await MessageHelper.SendToServer(new C2S_GetTempPictureUrl() { PictureType = pictureType });
-
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    return new string[] { response.TempPictureUrl, response.PictureObjectPath };
-                }
-            }
-            else
-            {
-                ViewManager.Hide<ModalStatusView>();
-                PromptController.Instance.ShowFloatTextPrompt("获取上传地址失败");
-            }
-
-            return null;
-        }
-
-        //将图片上传到华为云
-        public static async ETTask<bool> PushToHWCloud(string signUrl, byte[] buffer)
-        {
-
-            HttpContent content = new ByteArrayContent(buffer);
-            HttpClient httpClient = new HttpClient(new HttpClientHandler() { UseCookies = false });
-            HttpResponseMessage response = await httpClient.PutAsync(signUrl, content);
-            response.EnsureSuccessStatusCode();
-            await response.Content.ReadAsStreamAsync();
-            if (response.StatusCode != HttpStatusCode.OK)
-            {
-                ViewManager.Hide<ModalStatusView>();
-                PromptController.Instance.ShowFloatTextPrompt("上传资源失败");
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-
-        }
+        // //获取图片的临时上传地址协议
+        // public static async ETTask<string[]> ReqTempPictureUrl(int pictureType)
+        // {
+        //     S2C_GetTempPictureUrl response = null;
+        //     response = (S2C_GetTempPictureUrl)await MessageHelper.SendToServer(new C2S_GetTempPictureUrl() { PictureType = pictureType });
+
+        //     if (response != null)
+        //     {
+        //         if (response.Error == ErrorCode.ERR_Success)
+        //         {
+        //             return new string[] { response.TempPictureUrl, response.PictureObjectPath };
+        //         }
+        //     }
+        //     else
+        //     {
+        //         ViewManager.Hide<ModalStatusView>();
+        //         PromptController.Instance.ShowFloatTextPrompt("获取上传地址失败");
+        //     }
+
+        //     return null;
+        // }
+
+        // //将图片上传到华为云
+        // public static async ETTask<bool> PushToHWCloud(string signUrl, byte[] buffer)
+        // {
+
+        //     HttpContent content = new ByteArrayContent(buffer);
+        //     HttpClient httpClient = new HttpClient(new HttpClientHandler() { UseCookies = false });
+        //     HttpResponseMessage response = await httpClient.PutAsync(signUrl, content);
+        //     response.EnsureSuccessStatusCode();
+        //     await response.Content.ReadAsStreamAsync();
+        //     if (response.StatusCode != HttpStatusCode.OK)
+        //     {
+        //         ViewManager.Hide<ModalStatusView>();
+        //         PromptController.Instance.ShowFloatTextPrompt("上传资源失败");
+        //         return false;
+        //     }
+        //     else
+        //     {
+        //         return true;
+        //     }
+
+        // }
         //保存成功后，添加图片至相册
         public static async ETTask<long> ReqAddTophoto(string pictureObjectPath, int sourceType)
         {
@@ -133,32 +135,32 @@ namespace GFGGame
             PromptController.Instance.ShowFloatTextPrompt("存储数据失败");
             return 0;
         }
-        public static IEnumerator DownloadFile(PoemPhotoData poemPhotoData)
-        {
-            ET.Log.Debug("PictureTempUrl:" + poemPhotoData.PictureTempUrl);
-            using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(poemPhotoData.PictureTempUrl))
-            {
-                yield return request.SendWebRequest();
-                if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
-                {
-                    ET.Log.Debug("Error: " + request.error);
-                    // while (!request.isDone)
-                    // {
-                    DownloadFile(poemPhotoData);
-                    yield return null;
-                    // }
-                }
-                else
-                {
-
-                    Texture2D texture = (request.downloadHandler as DownloadHandlerTexture).texture;
-                    poemPhotoData.Bytes = texture.EncodeToJPG();
-                    poemPhotoData.Ntexture = new NTexture(texture);
-                }
-
-            }
-
-        }
+        // public static IEnumerator DownloadFile(PoemPhotoData poemPhotoData)
+        // {
+        //     ET.Log.Debug("PictureTempUrl:" + poemPhotoData.PictureTempUrl);
+        //     using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(poemPhotoData.PictureTempUrl))
+        //     {
+        //         yield return request.SendWebRequest();
+        //         if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
+        //         {
+        //             ET.Log.Debug("Error: " + request.error);
+        //             // while (!request.isDone)
+        //             // {
+        //             DownloadFile(poemPhotoData);
+        //             yield return null;
+        //             // }
+        //         }
+        //         else
+        //         {
+
+        //             Texture2D texture = (request.downloadHandler as DownloadHandlerTexture).texture;
+        //             poemPhotoData.Bytes = texture.EncodeToJPG();
+        //             poemPhotoData.Ntexture = new NTexture(texture);
+        //         }
+
+        //     }
+
+        // }
         //批量删除玩家相册
         public static async ETTask<bool> ReqRemovedPhoto(List<long> pictureIds, int sourceType)
         {
@@ -214,5 +216,4 @@ namespace GFGGame
             return false;
         }
     }
-
 }

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -94,6 +94,7 @@ namespace GFGGame
             _ui.m_btnMax.m_c1.selectedIndex = _count == hasCount ? 1 : 0;
             _ui.m_btnMax.target.touchable = _count == hasCount ? false : true;
 
+            _ui.m_txtShow.text = "选择使用数量";
             _ui.m_txtTips.text = string.Format("是否使用{0}个{1}？", _count, itemCfg.name);
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -30,7 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            // _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             _ui.m_btnFilter.onClick.Add(OnclickBtnFilter);
 
             _ui.m_listCard.itemRenderer = RenderListCardItem;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs

@@ -7,18 +7,18 @@ namespace GFGGame
     public class ClothingListView : BaseWindow
     {
         private UI_ClothingListUI _ui;
-        private ValueBarController _valueBarController;
+        // private ValueBarController _valueBarController;
         private int _menuType = ConstSuitGuideTypeId.TYPE_1;
         private int[] _menuTypeDataArray;
         private List<int> _suitIds;
 
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
+            // if (_valueBarController != null)
+            // {
+            //     _valueBarController.Dispose();
+            //     _valueBarController = null;
+            // }
 
             if (_ui != null)
             {
@@ -37,7 +37,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            // _valueBarController = new ValueBarController(_ui.m_valueBar);
 
             _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
             _ui.m_comBoxSort.items = new string[] { "默认排序", "稀有度高", "稀有度低", "收集度高", "收集度低" };
@@ -56,7 +56,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
+            // _valueBarController.OnShown();
             _ui.m_btnHaveGot.selected = true;
             _ui.m_btnNotGet.selected = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
@@ -70,7 +70,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _valueBarController.OnHide();
+            // _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
 
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
     public class ClothingView : BaseWindow
     {
         private UI_ClothingUI _ui;
-
+        private ValueBarController _valueBarController;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
         private GoWrapper _wrapper;
@@ -43,6 +43,11 @@ namespace GFGGame
                 _wrapper.Dispose();
                 _wrapper = null;
             }
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
             SceneController.DestroyObjectFromView(_gameobject1, _wrapper1);
             _propertyList.Clear();
             _addPropertyList.Clear();
@@ -59,7 +64,7 @@ namespace GFGGame
             // this.viewCom.Center();
             isfullScreen = true;
             // this.clickBlankToClose = false;
-
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneSuitFoster"));
             _dressUpObjDataCache = new DressUpObjDataCache();
 
@@ -103,6 +108,7 @@ namespace GFGGame
                     _suitIds.Add(suitId);
                 }
             }
+            _valueBarController.OnShown();
 
             _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
             _ui.m_c1.selectedIndex = 0;
@@ -116,6 +122,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
 
         }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -164,8 +164,9 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
-            this.Hide();
-            ViewManager.Show(ViewName.MAINUI_VIEW);
+            // this.Hide();
+            // ViewManager.Show(ViewName.MAINUI_VIEW);
+            ViewManager.GoBackFrom(typeof(DressUpView).FullName);
         }
 
         private void OnClickBtnHome()

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -78,13 +78,12 @@ namespace GFGGame
                 return;
             }
 
-            ViewManager.Show<ModalStatusView>("上传中...");
 
-            string[] rsp = await PoemPhotoSProxy.ReqTempPictureUrl((int)PictureType.jpg);
+            string[] rsp = await PictureStorageHelper.ReqTempPictureUrl((int)PictureType.jpg);
             if (rsp == null) return;
 
 
-            bool pushResult = await PoemPhotoSProxy.PushToHWCloud(rsp[0], bytes);
+            bool pushResult = await PictureStorageHelper.PushToHWCloud(rsp[0], bytes);
             if (!pushResult) return;
 
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class SuitGuideView : BaseWindow
     {
         private UI_SuitGuideUI _ui;
-        private ValueBarController _valueBarController;
+        // private ValueBarController _valueBarController;
         private int _menuType = ConstSuitGuideTypeId.TYPE_1;
         private int[] _menuTypeDataArray;
         private List<int> _suitIds;
@@ -17,11 +17,11 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
+            // if (_valueBarController != null)
+            // {
+            //     _valueBarController.Dispose();
+            //     _valueBarController = null;
+            // }
 
             if (_ui != null)
             {
@@ -39,7 +39,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            // _valueBarController = new ValueBarController(_ui.m_valueBar);
 
             _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
             _ui.m_listType.itemRenderer = ListTypeItemRenderer;
@@ -64,7 +64,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
+            // _valueBarController.OnShown();
             _ui.m_btnHaveGot.selected = true;
             _ui.m_btnNotGet.selected = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
@@ -77,7 +77,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _valueBarController.OnHide();
+            // _valueBarController.OnHide();
 
         }
         protected override void RemoveEventListener()

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

@@ -361,7 +361,7 @@ namespace GFGGame
             {
                 _ui.m_btnHuanZhuang.m_holder1.visible = false;
                 this.Hide();
-                ViewManager.Show(ViewName.DRESS_UP_VIEW);
+                ViewManager.Show(ViewName.DRESS_UP_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
                 isOpen = false;
 
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class PoemGalleryView : BaseWindow
     {
         private UI_PoemGalleryUI _ui;
-        private List<PoemGalleryData> _galleryInfos = new List<PoemGalleryData>();
+        private List<long> _galleryIds = new List<long>();
         private int _infoType = 0;//0推荐1好友2收藏3我的
 
         public override void Dispose()
@@ -87,7 +87,7 @@ namespace GFGGame
         /// </summary>
         private void OnBtnJoinClick()
         {
-
+            ViewManager.Show<DressUpView>(1, new object[] { typeof(PoemGalleryView).FullName, this.viewData }, true);
         }
 
         /// <summary>
@@ -119,14 +119,14 @@ namespace GFGGame
             {
                 if (_ui.m_comNormal.m_c1.selectedIndex == 0)
                 {
-                    _infoType = 0;
-                    _galleryInfos = PoemGalleryDataManager.Instance.RecommendInfos;
+                    _infoType = GalleryType.Recommend;
+                    _galleryIds = PoemGalleryDataManager.Instance.RecommendInfos;
                     _ui.m_comNormal.m_listRecommend.numItems = 5;
                 }
                 else if (_ui.m_comNormal.m_c1.selectedIndex == 1)
                 {
-                    _infoType = 1;
-                    _galleryInfos = PoemGalleryDataManager.Instance.FrinedInfos;
+                    _infoType = GalleryType.Friend;
+                    _galleryIds = PoemGalleryDataManager.Instance.FrinedInfos;
                 }
             }
         }
@@ -137,13 +137,13 @@ namespace GFGGame
         {
             if (_ui.m_comFavorites.m_c1.selectedIndex == 0)
             {
-                _infoType = 2;
-                _galleryInfos = PoemGalleryDataManager.Instance.FavoriteInfos;
+                _infoType = GalleryType.Favorite;
+                _galleryIds = PoemGalleryDataManager.Instance.FavoriteInfos;
             }
             else if (_ui.m_comFavorites.m_c1.selectedIndex == 1)
             {
-                _infoType = 3;
-                _galleryInfos = PoemGalleryDataManager.Instance.MySelfInfos;
+                _infoType = GalleryType.MySelf;
+                _galleryIds = PoemGalleryDataManager.Instance.MySelfInfos;
             }
         }
 
@@ -173,6 +173,7 @@ namespace GFGGame
         {
             ViewManager.Show<PoemGalleryRewardView>(null, new object[] { typeof(PoemGalleryView).FullName, this.viewData }, true);
         }
+
         /// <summary>
         /// 排行榜奖励
         /// </summary>
@@ -183,6 +184,26 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
+            PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(_galleryIds[index]);
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+
+
+            if (item.m_loaIcon.data == null)
+            {
+                item.m_loaIcon.onClick.Add(OnLoaIconClick);
+            }
+            item.m_loaIcon.data = data;
+            if (item.m_btnCollect.data == null)
+            {
+                item.m_btnCollect.onClick.Add(OnBtnCollectClick);
+            }
+            item.m_btnCollect.data = data;
+            if (item.m_btnVote.data == null)
+            {
+                item.m_btnVote.onClick.Add(OnBtnVoteClick);
+            }
+            item.m_btnVote.data = data;
+            UI_ListItem.ProxyEnd();
 
         }
 
@@ -193,6 +214,26 @@ namespace GFGGame
         }
 
 
+        private void OnLoaIconClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            PoemGalleryData data = obj.data as PoemGalleryData;
+
+        }
+
+        private void OnBtnCollectClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            PoemGalleryData data = obj.data as PoemGalleryData;
+
+        }
+
+        private void OnBtnVoteClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            PoemGalleryData data = obj.data as PoemGalleryData;
+
+        }
 
 
 

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs

@@ -98,6 +98,7 @@ namespace GFGGame
             _ui.m_btnMax.m_c1.selectedIndex = _buyCount == _maxCanBuy ? 1 : 0;
             _ui.m_btnMax.target.touchable = _buyCount == _maxCanBuy ? false : true;
 
+            _ui.m_txtShow.text = "选择购买数量";
             _ui.m_txtTips.text = string.Format("确定购买{0}个{1}？", _buyCount, itemCfg.name);
             ItemUtil.SetItemNeedNum(_ui.m_comCost.target, cfg.costId, _buyCount * cfg.costNum);
         }