画廊

FGUIProject/assets/Main/package.xml

@@ -199,7 +199,7 @@
     <image id="wg7t8t" name="zjm_gn_dik_1.png" path="/images/" scale="9grid" scale9grid="42,26,84,52"/>
     <image id="wg7t8u" name="zjm_gndj_1.png" path="/images/"/>
     <image id="wg7t8v" name="zjm_gndj_2.png" path="/images/"/>
-    <image id="wg7t8w" name="zjm_dj_1.png" path="/images/"/>
+    <image id="wg7t8w" name="zjm_dj_1.png" path="/images/" exported="true"/>
     <image id="wg7t8x" name="zjm_gn_dik_2.png" path="/images/"/>
     <component id="wg7t8y" name="ButtonModle.xml" path="/components/"/>
     <component id="wg7t8z" name="ButtonChange.xml" path="/components/"/>

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3">
+  <controller name="c1" pages="0,,1,,2,,3," selected="2">
     <remark page="0" value="推荐"/>
     <remark page="1" value="好友"/>
     <remark page="2" value="收藏"/>
     <remark page="3" value="我的"/>
   </controller>
   <displayList>
+    <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="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,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">
+    <image id="n10_r9ri" name="n10" src="r9ri126" fileName="imagesGallery/hl_hyxxk.png" xy="165,35" group="n12_r9ri"/>
+    <component id="n9_r9ri" name="comHead" src="r9ri12m" fileName="componentsGallery/ComHead.xml" xy="200,62" group="n12_r9ri"/>
+    <text id="n4_r9ri" name="txtName" xy="361,103" size="71,46" group="n12_r9ri" fontSize="34" color="#9d7f5c" text="老六"/>
+    <component id="n7_r9ri" name="btnAddFriend" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="787,95" size="198,59" group="n12_r9ri">
       <gearDisplay controller="c1" pages="0,2"/>
-      <Button title="好友" icon="ui://iyz778gkuyuxzp"/>
+      <Button icon="ui://iyz778gkr9ri129"/>
     </component>
-    <component id="n8_r9ri" name="btnDelete" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="942,426" size="77,76">
+    <component id="n8_r9ri" name="btnDelete" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="787,95" size="198,59" group="n12_r9ri">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="删除作品" icon="ui://iyz778gkuyuxzp"/>
+      <Button icon="ui://iyz778gkr9ri12a"/>
     </component>
-    <component id="n5_r9ri" name="btnVote" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="938,1819" size="77,76">
-      <Button title="点赞" icon="ui://iyz778gkuyuxzp"/>
+    <group id="n12_r9ri" name="n12" xy="165,35" size="902,195"/>
+    <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1813"/>
+    <component id="n13_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="718,1853" group="n16_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>
-    <component id="n6_r9ri" name="btnCollect" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="813,1818" size="77,76">
-      <Button title="收藏" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n14_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="877,1853" group="n16_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
+    <text id="n15_r9ri" name="txtTheme" xy="58,1845" size="349,46" group="n16_r9ri" fontSize="34" color="#ac9370" text="2018-10-5主题名称xx"/>
+    <group id="n16_r9ri" name="n16" xy="58,1845" size="851,46" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -9,20 +9,25 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n11_r9ri" name="comNormal" src="r9ri114" fileName="componentsGallery/ComNormal.xml" xy="90,83">
+    <component id="n11_r9ri" name="comNormal" src="r9ri114" fileName="componentsGallery/ComNormal.xml" xy="0,0" size="1080,1736">
       <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="height-height"/>
     </component>
     <component id="n23_r9ri" name="comFavorites" src="r9ri115" fileName="componentsGallery/ComFavorites.xml" xy="129,278">
       <gearDisplay controller="c1" pages="2"/>
     </component>
-    <component id="n2_r9ri" name="btnRecover" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="96,1716" size="77,76">
-      <Button title="首页" icon="ui://iyz778gkuyuxzp" controller="c1" page="1"/>
+    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="imagesGallery/hl_xz_ddik_1.png" xy="0,1736" group="n25_r9ri"/>
+    <component id="n2_r9ri" name="btnRecover" src="r9ri12l" fileName="componentsGallery/Button11.xml" xy="0,1710" group="n25_r9ri">
+      <Button title="首页" icon="ui://iyz778gkr9ri11l" selectedIcon="ui://iyz778gkr9ri11c" controller="c1" page="1"/>
     </component>
-    <component id="n3_r9ri" name="btnJoin" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="504,1712" size="77,76">
-      <Button title="投稿" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n3_r9ri" name="btnJoin" src="r9ri12l" fileName="componentsGallery/Button11.xml" xy="357,1710" group="n25_r9ri">
+      <Button title="投稿" icon="ui://iyz778gkr9ri11j" selectedIcon="ui://iyz778gkr9ri11k"/>
     </component>
-    <component id="n4_r9ri" name="btnFavorites" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="857,1713" size="77,76">
-      <Button title="收藏" icon="ui://iyz778gkuyuxzp" controller="c1" page="2"/>
+    <component id="n4_r9ri" name="btnFavorites" src="r9ri12l" fileName="componentsGallery/Button11.xml" xy="714,1710" group="n25_r9ri">
+      <Button title="收藏" icon="ui://iyz778gkr9ri11i" selectedIcon="ui://iyz778gkr9ri11v" controller="c1" page="2"/>
     </component>
+    <group id="n25_r9ri" name="n25" xy="0,1710" size="1080,210" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/Button10.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="32,30" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_r9ri" name="icon" xy="0,0" size="32,30" url="ui://iyz778gkr9ri124" autoSize="true"/>
+    <text id="n3_r9ri" name="title" xy="34,-2" size="78,34" fontSize="24" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="50000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <relation target="n4_r9ri" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/poem/componentsGallery/Button11.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="366,210" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n6_r9ri" name="n6" src="r9ri11u" fileName="imagesGallery/hl_xz_ddik.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n4_r9ri" name="icon" xy="127,60" size="112,128" url="ui://iyz778gkr9ri11c" autoSize="true"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/poem/componentsGallery/Button9.xml

@@ -2,7 +2,7 @@
 <component size="50,50" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n5_r9ri" name="n5" xy="0,0" size="50,50" type="rect">
+    <graph id="n5_r9ri" name="n5" xy="0,0" size="50,50" visible="false" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     <loader id="n4_r9ri" name="icon" xy="0,0" size="50,50" autoSize="true"/>

FGUIProject/assets/poem/componentsGallery/ComHeadIcon.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,125" mask="n9_r9ri">
+  <displayList>
+    <image id="n9_r9ri" name="n9" src="r9ri122" fileName="imagesGallery/hl_txkuang.png" xy="7,6" size="108,109" aspect="true"/>
+    <loader id="n10_r9ri" name="loaicon" xy="14,15" size="95,95" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scale"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -1,53 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="971,1619" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+<component size="1080,1619" overflow="hidden">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <component id="n11_r9ri" name="btnShop" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="893,0" size="77,76">
-      <Button title="商店" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n11_r9ri" name="btnShop" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="900,56" size="180,113">
+      <Button icon="ui://iyz778gkr9ri11t"/>
     </component>
-    <component id="n12_r9ri" name="btnRecommend" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="781,92" size="77,76">
-      <gearDisplay controller="c1" pages="0"/>
-      <Button title="推荐" icon="ui://iyz778gkuyuxzp"/>
-    </component>
-    <component id="n13_r9ri" name="btnNewest" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="894,93" size="77,76">
-      <gearDisplay controller="c1" pages="0"/>
-      <Button title="最新" icon="ui://iyz778gkuyuxzp"/>
-    </component>
-    <component id="n24_r9ri" name="btnReward" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="787,2" size="77,76">
+    <component id="n24_r9ri" name="btnReward" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="460,30" size="77,76">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="奖励" icon="ui://iyz778gkuyuxzp"/>
     </component>
-    <image id="n5_r9ri" name="n5" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="30,180" size="840,76" group="n8_r9ri"/>
-    <component id="n6_r9ri" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="30,178" group="n8_r9ri">
-      <Button title="推荐" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="0"/>
+    <image id="n5_r9ri" name="n5" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="165,206" size="750,76" group="n8_r9ri"/>
+    <component id="n6_r9ri" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="163,204" group="n8_r9ri">
+      <Button checked="true" icon="ui://iyz778gkr9ri11p" selectedIcon="ui://iyz778gkr9ri11h" controller="c1" page="0"/>
     </component>
-    <component id="n7_r9ri" name="btnTab1" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="310,178" group="n8_r9ri">
-      <Button title="好友" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="1"/>
+    <component id="n7_r9ri" name="btnTab1" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="414,204" group="n8_r9ri">
+      <Button icon="ui://iyz778gkr9ri11o" selectedIcon="ui://iyz778gkr9ri11g" controller="c1" page="1"/>
     </component>
-    <component id="n9_r9ri" name="btnTab2" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="590,178" group="n8_r9ri">
-      <Button checked="true" title="排行榜" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="2"/>
+    <component id="n9_r9ri" name="btnTab2" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="665,204" group="n8_r9ri">
+      <Button icon="ui://iyz778gkr9ri11n" selectedIcon="ui://iyz778gkr9ri11f" controller="c1" page="2"/>
     </component>
-    <group id="n8_r9ri" name="grpTab" xy="30,178" size="840,82"/>
-    <text id="n22_r9ri" name="txtTheme" xy="296,298" pivot="0.5,0" size="270,41" fontSize="30" text="本期主题：风花雪月"/>
-    <list id="n14_r9ri" name="listRecommend" xy="0,397" size="918,1222" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkr9ri11a," colGap="20" defaultItem="ui://iyz778gkr9ri10w">
+    <group id="n8_r9ri" name="grpTab" xy="163,204" size="753,83"/>
+    <image id="n25_r9ri" name="n25" src="r9ri11e" fileName="imagesGallery/hl_xzbtzt.png" xy="310,309" group="n26_r9ri"/>
+    <text id="n22_r9ri" name="txtTheme" xy="355,315" pivot="0.5,0" size="364,54" group="n26_r9ri" fontSize="40" color="#b08a5d" text="本期主题：风花雪月"/>
+    <group id="n26_r9ri" name="n26" xy="310,309" size="499,81"/>
+    <list id="n14_r9ri" name="listRecommend" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" ptrRes="ui://iyz778gkr9ri12p," lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n21_r9ri" name="listFriend" xy="0,397" size="918,1222" layout="flow_hz" overflow="scroll" colGap="20" defaultItem="ui://iyz778gkr9ri10w">
+    <list id="n21_r9ri" name="listFriend" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" lineGap="17" colGap="28" defaultItem="ui://iyz778gkr9ri10w">
       <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n23_r9ri" name="listRank" xy="106,418" size="933,1064" layout="flow_hz" overflow="scroll" defaultItem="ui://iyz778gkr9ri10y">
+    <list id="n23_r9ri" name="listRank" xy="24,483" size="1032,1136" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://iyz778gkr9ri10y" align="center">
       <gearDisplay controller="c1" pages="2"/>
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
     </list>
+    <component id="n28_r9ri" name="comBoBox" src="r9ri12d" fileName="componentsGallery/ComboBox1.xml" xy="886,412">
+      <gearDisplay controller="c1" pages="0"/>
+      <ComboBox visibleItemCount="10"/>
+    </component>
+    <text id="n27_r9ri" name="txtTime" xy="266,430" size="317,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="截止日期:11/01至11/2 "/>
+    <text id="n33_r9ri" name="txtRewardCount" xy="603,430" size="211,39" group="n34_r9ri" fontSize="28" color="#b9a073" text="奖励次数:10/30"/>
+    <group id="n34_r9ri" name="n34" xy="266,430" size="548,39" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <text id="n29_r9ri" name="txtRank" xy="830,427" pivot="1,0" size="169,41" fontSize="30" color="#c58383" text="我的排名:20">
+      <gearDisplay controller="c1" pages="2"/>
+    </text>
+    <image id="n30_r9ri" name="n30" src="r9ri12o" fileName="imagesGallery/hl_ddandik.png" xy="391,660" group="n32_r9ri"/>
+    <text id="n31_r9ri" name="n31" xy="231,783" size="617,52" group="n32_r9ri" fontSize="38" color="#ac9b7f" text="排行榜数据正在结算中，请稍后再来!"/>
+    <group id="n32_r9ri" name="grpResult" xy="231,660" size="617,298" advanced="true">
+      <gearDisplay controller="c1" pages="2"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/poem/componentsGallery/ComRoleHead.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,125">
+  <displayList>
+    <image id="n10_r9ri" name="n10" src="r9ri122" fileName="imagesGallery/hl_txkuang.png" xy="0,0"/>
+    <component id="n9_r9ri" name="n9" src="r9ri12n" fileName="componentsGallery/ComHeadIcon.xml" xy="0,0"/>
+    <image id="n11_r9ri" name="n11" src="wg7t8w" fileName="images/zjm_dj_1.png" pkg="mfvz4q8k" xy="82,82" group="n13_r9ri"/>
+    <text id="n12_r9ri" name="txtLvl" xy="89,88" size="29,29" group="n13_r9ri" fontSize="20" color="#ffffff" align="center" text="99">
+      <relation target="n11_r9ri" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n13_r9ri" name="n13" xy="82,82" size="42,43"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/componentsGallery/ComboBox.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,146">
+  <displayList>
+    <image id="n6_r9ri" name="n6" src="r9ri11q" fileName="imagesGallery/hl_tzkuang_1.png" xy="0,0"/>
+    <list id="n7_r9ri" name="list" xy="33,11" size="166,123" overflow="scroll" defaultItem="ui://iyz778gkr9ri12g">
+      <item title="推荐" icon="ui://iyz778gkr9ri11s"/>
+      <item title="最新" icon="ui://iyz778gkr9ri11b"/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/poem/componentsGallery/ComboBox1.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="164,58" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n4_r9ri" name="n4" src="r9ri11d" fileName="imagesGallery/hl_xzkuku.png" xy="0,0"/>
+    <text id="n3_r9ri" name="title" xy="19,0" size="79,58" font="ui://eg2y0ldpwonotja" fontSize="34" color="#c6a974" vAlign="middle" autoSize="none" singleLine="true" text="最新">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <loader id="n5_r9ri" name="icon" xy="112,17" size="34,24" url="ui://iyz778gkr9ri11s" autoSize="true"/>
+  </displayList>
+  <ComboBox dropdown="ui://iyz778gkr9ri12c"/>
+</component>

FGUIProject/assets/poem/componentsGallery/ComboBox1_popup.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,146">
+  <displayList>
+    <image id="n0_r9ri" name="n0" src="r9ri11q" fileName="imagesGallery/hl_tzkuang_1.png" xy="0,0"/>
+    <list id="n1_r9ri" name="list" xy="33,11" size="166,123" overflow="scroll" defaultItem="ui://iyz778gkr9ri12g" align="center">
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/poem/componentsGallery/ComboBoxSort_item.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,60" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <text id="n2_k6he" name="title" xy="21,7" size="60,39" group="n5_r9ri" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="最新"/>
+    <loader id="n4_r9ri" name="icon" xy="112,15" size="33,24" group="n5_r9ri" url="ui://iyz778gkr9ri11b" autoSize="true"/>
+    <group id="n5_r9ri" name="n5" xy="21,7" size="124,39"/>
+    <image id="n6_r9ri" name="n6" src="r9ri11r" fileName="imagesGallery/hl_tzkuang.png" xy="0,58"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="365,749">
+<component size="500,644">
   <displayList>
-    <loader id="n15_r9ri" name="loaIcon" xy="0,0" size="361,669" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleMatchWidth"/>
-    <text id="n16_r9ri" name="txtName" xy="4,680" size="211,42" fontSize="30" text="名字名字名字啊"/>
-    <component id="n19_r9ri" name="btnCollect" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="201,673" size="77,76">
-      <Button title="收藏" icon="ui://iyz778gkuyuxzp"/>
+    <loader id="n15_r9ri" name="loaIcon" xy="4,2" pivot="0.5,0" size="492,567" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleFree" clearOnPublish="true"/>
+    <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,649">
+      <relation target="n15_r9ri" sidePair="height-height"/>
+    </image>
+    <text id="n16_r9ri" name="txtName" xy="20,585" size="187,42" group="n22_r9ri" font="ui://eg2y0ldpkst18" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="276,591" group="n22_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>
-    <component id="n20_r9ri" name="btnVote" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="288,673" size="77,76">
-      <Button title="点赞" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,591" group="n22_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
+    <group id="n22_r9ri" name="n22" xy="20,585" size="398,42" advanced="true">
+      <relation target="n15_r9ri" sidePair="top-bottom"/>
+    </group>
   </displayList>
+  <relation target="n15_r9ri" sidePair="height-height"/>
 </component>

FGUIProject/assets/poem/componentsGallery/ListRankItem.xml

@@ -1,14 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="365,749">
+<component size="996,1004" overflow="hidden">
+  <controller name="c1" pages="0,,1,,2,,3," selected="1"/>
   <displayList>
-    <loader id="n3_r9ri" name="loaIcon" xy="0,0" size="361,669" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleMatchWidth"/>
-    <text id="n7_r9ri" name="txtRank" xy="21,56" size="63,42" fontSize="30" text="第六"/>
-    <text id="n4_r9ri" name="txtName" xy="4,680" size="211,41" fontSize="30" text="名字名字名字啊"/>
-    <component id="n5_r9ri" name="btnCollect" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="201,673" size="77,76">
-      <Button title="收藏" icon="ui://iyz778gkuyuxzp"/>
+    <loader id="n3_r9ri" name="loaIcon" xy="1,0" pivot="0.5,0" size="994,909" url="ui://iyz778gkuyux102" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <image id="n11_r9ri" name="n11" src="r9ri120" fileName="imagesGallery/hl_phb_b_1.png" xy="34,4">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n12_r9ri" name="n12" src="r9ri121" fileName="imagesGallery/hl_phb_b_2.png" xy="34,4">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n13_r9ri" name="n13" src="r9ri11w" fileName="imagesGallery/hl_phb_b_3.png" xy="34,4">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n9_r9ri" name="n9" src="r9ri11x" fileName="imagesGallery/hl_phb_1.png" xy="0,0" size="996,1009">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="n3_r9ri" sidePair="height-height"/>
+    </image>
+    <image id="n10_r9ri" name="n10" src="r9ri11y" fileName="imagesGallery/hl_phb_2.png" xy="0,0" size="996,1009">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="n3_r9ri" sidePair="height-height"/>
+    </image>
+    <image id="n8_r9ri" name="n8" src="r9ri11z" fileName="imagesGallery/hl_phb_3.png" xy="0,0" size="996,1009">
+      <gearDisplay controller="c1" pages="2"/>
+      <relation target="n3_r9ri" sidePair="height-height"/>
+    </image>
+    <text id="n7_r9ri" name="txtRank" xy="21,56" size="63,41" fontSize="30" text="第六"/>
+    <text id="n4_r9ri" name="txtName" xy="37,928" size="211,41" group="n14_r9ri" fontSize="30" color="#ac806f" text="名字名字名字啊"/>
+    <component id="n5_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="740,936" size="32,30" group="n14_r9ri">
+      <Button title="5000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>
-    <component id="n6_r9ri" name="btnVote" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="288,673" size="77,76">
-      <Button title="点赞" icon="ui://iyz778gkuyuxzp"/>
+    <component id="n6_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="860,936" size="32,30" group="n14_r9ri">
+      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
+    <group id="n14_r9ri" name="n14" xy="37,928" size="855,41" advanced="true">
+      <relation target="n3_r9ri" sidePair="top-bottom"/>
+    </group>
   </displayList>
+  <relation target="n3_r9ri" sidePair="height-height"/>
 </component>

FGUIProject/assets/poem/componentsPhoto/Button6.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="280,82" extention="Button">
+<component size="251,83" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n3_uyux" name="icon" xy="140,41" pivot="0.5,0.5" anchor="true" size="280,82" autoSize="true"/>
-    <text id="n4_r9ri" name="title" xy="0,0" size="280,82" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
+    <loader id="n3_uyux" name="icon" xy="125,41" pivot="0.5,0.5" anchor="true" size="251,83" url="ui://iyz778gkr9ri11f" autoSize="true"/>
+    <text id="n4_r9ri" name="title" xy="0,0" size="251,83" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/poem/package.xml

@@ -62,7 +62,55 @@
     <component id="r9ri117" name="PoemGalleryRewardUI.xml" path="/" exported="true"/>
     <component id="r9ri118" name="ListRankRewardItem.xml" path="/componentsGallery/"/>
     <movieclip id="r9ri119" name="MovieClip1.jta" path="/componentsGallery/"/>
-    <component id="r9ri11a" name="ComHead.xml" path="/componentsGallery/"/>
+    <image id="r9ri11b" name="hl_zxzx.png" path="/imagesGallery/"/>
+    <image id="r9ri11c" name="hl_xzliang_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11d" name="hl_xzkuku.png" path="/imagesGallery/"/>
+    <image id="r9ri11e" name="hl_xzbtzt.png" path="/imagesGallery/"/>
+    <image id="r9ri11f" name="hl_xzanniu_3.png" path="/imagesGallery/"/>
+    <image id="r9ri11g" name="hl_xzanniu_2.png" path="/imagesGallery/"/>
+    <image id="r9ri11h" name="hl_xzanniu_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11i" name="hl_xz_xl_3.png" path="/imagesGallery/"/>
+    <image id="r9ri11j" name="hl_xz_xl_2.png" path="/imagesGallery/"/>
+    <image id="r9ri11k" name="hl_xzliang_2.png" path="/imagesGallery/"/>
+    <image id="r9ri11l" name="hl_xz_xl_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11m" name="hl_xtxtxt.png" path="/imagesGallery/"/>
+    <image id="r9ri11n" name="hl_wxzzi_3.png" path="/imagesGallery/"/>
+    <image id="r9ri11o" name="hl_wxzzi_2.png" path="/imagesGallery/"/>
+    <image id="r9ri11p" name="hl_wxzzi_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11q" name="hl_tzkuang_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11r" name="hl_tzkuang.png" path="/imagesGallery/"/>
+    <image id="r9ri11s" name="hl_pxpx.png" path="/imagesGallery/"/>
+    <image id="r9ri11t" name="hl_dhsc.png" path="/imagesGallery/"/>
+    <image id="r9ri11u" name="hl_xz_ddik.png" path="/imagesGallery/"/>
+    <image id="r9ri11v" name="hl_xzliang_3.png" path="/imagesGallery/"/>
+    <image id="r9ri11w" name="hl_phb_b_3.png" path="/imagesGallery/"/>
+    <image id="r9ri11x" name="hl_phb_1.png" path="/imagesGallery/" scale="9grid" scale9grid="249,29,498,1104"/>
+    <image id="r9ri11y" name="hl_phb_2.png" path="/imagesGallery/" scale="9grid" scale9grid="249,22,498,1124"/>
+    <image id="r9ri11z" name="hl_phb_3.png" path="/imagesGallery/" scale="9grid" scale9grid="249,19,498,1124"/>
+    <image id="r9ri120" name="hl_phb_b_1.png" path="/imagesGallery/"/>
+    <image id="r9ri121" name="hl_phb_b_2.png" path="/imagesGallery/"/>
+    <image id="r9ri122" name="hl_txkuang.png" path="/imagesGallery/"/>
+    <image id="r9ri123" name="hl_dz_1.png" path="/imagesGallery/"/>
+    <image id="r9ri124" name="hl_dz_2.png" path="/imagesGallery/"/>
+    <image id="r9ri125" name="hl_grxxdi.png" path="/imagesGallery/"/>
+    <image id="r9ri126" name="hl_hyxxk.png" path="/imagesGallery/"/>
+    <image id="r9ri127" name="hl_sc_1.png" path="/imagesGallery/"/>
+    <image id="r9ri128" name="hl_sc_2.png" path="/imagesGallery/"/>
+    <image id="r9ri129" name="hl_sqanniu_1.png" path="/imagesGallery/"/>
+    <image id="r9ri12a" name="hl_sqanniu_2.png" path="/imagesGallery/"/>
+    <component id="r9ri12c" name="ComboBox1_popup.xml" path="/componentsGallery/"/>
+    <component id="r9ri12d" name="ComboBox1.xml" path="/componentsGallery/"/>
+    <component id="r9ri12e" name="ComboBox.xml" path="/componentsGallery/"/>
+    <component id="r9ri12g" name="ComboBoxSort_item.xml" path="/componentsGallery/"/>
+    <image id="r9ri12h" name="hl_cjkuangdi.png" path="/imagesGallery/" scale="9grid" scale9grid="124,13,250,774"/>
+    <image id="r9ri12i" name="hl_hlzibt.png" path="/imagesGallery/"/>
+    <component id="r9ri12j" name="Button10.xml" path="/componentsGallery/"/>
+    <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/imagesGallery/"/>
+    <component id="r9ri12l" name="Button11.xml" path="/componentsGallery/"/>
+    <component id="r9ri12m" name="ComRoleHead.xml" path="/componentsGallery/"/>
+    <component id="r9ri12n" name="ComHeadIcon.xml" path="/componentsGallery/"/>
+    <image id="r9ri12o" name="hl_ddandik.png" path="/imagesGallery/"/>
+    <component id="r9ri12p" name="ComHead.xml" path="/componentsGallery/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -9,14 +9,53 @@ namespace GFGGame
 {
     public class PoemGalleryDataManager : SingletonBase<PoemGalleryDataManager>
     {
+        private long _themeOrder = 0;
         /// <summary>
         /// 主题期数
         /// </summary>
-        public long ThemeOrder { get; set; }
+        public long ThemeOrder
+        {
+            get
+            {
+                return _themeOrder;
+            }
+            set
+            {
+                _themeOrder = value;
+            }
+        }
+
+        private long _themeId = 0;
         /// <summary>
         /// 主题配置id
         /// </summary>
-        public long ThemeId { get; set; }
+        public long ThemeId
+        {
+            get
+            {
+                return _themeId;
+            }
+            set
+            {
+                _themeId = value;
+            }
+        }
+
+        private long _myRank = 0;
+        /// <summary>
+        /// 我的最高排行
+        /// </summary>
+        public long MyRank
+        {
+            get
+            {
+                return _myRank;
+            }
+            set
+            {
+                _myRank = value;
+            }
+        }
 
 
         /// <summary>
@@ -43,6 +82,11 @@ namespace GFGGame
         /// </summary>
         public List<PoemGalleryData> MySelfDatas = new List<PoemGalleryData>();
 
+        /// <summary>
+        /// 排行榜数据
+        /// </summary>
+        public List<PoemGalleryData> RankDatas = new List<PoemGalleryData>();
+
 
         public void Clear()
         {
@@ -50,6 +94,7 @@ namespace GFGGame
             FrinedDatas.Clear();
             FavoriteDatas.Clear();
             MySelfDatas.Clear();
+            RankDatas.Clear();
         }
 
     }

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

@@ -8,7 +8,7 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public const string URL = "ui://iyz778gkr9ri11a";
+        public const string URL = "ui://iyz778gkr9ri12p";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComHead";
         private static UI_ComHead _proxy;

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComHeadIcon
+    {
+        public GComponent target;
+        public GLoader m_loaicon;
+        public const string URL = "ui://iyz778gkr9ri12n";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComHeadIcon";
+        private static UI_ComHeadIcon _proxy;
+
+        public static UI_ComHeadIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHeadIcon();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComHeadIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHeadIcon();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaicon = (GLoader)comp.GetChild("loaicon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaicon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -9,8 +9,6 @@ namespace UI.Poem
         public GComponent target;
         public Controller m_c1;
         public GButton m_btnShop;
-        public GButton m_btnRecommend;
-        public GButton m_btnNewest;
         public GButton m_btnReward;
         public GButton m_btnTab0;
         public GButton m_btnTab1;
@@ -19,6 +17,11 @@ namespace UI.Poem
         public GList m_listRecommend;
         public GList m_listFriend;
         public GList m_listRank;
+        public GComboBox m_comBoBox;
+        public GTextField m_txtTime;
+        public GTextField m_txtRewardCount;
+        public GTextField m_txtRank;
+        public GGroup m_grpResult;
         public const string URL = "ui://iyz778gkr9ri114";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ComNormal";
@@ -68,8 +71,6 @@ namespace UI.Poem
         {
             m_c1 = comp.GetController("c1");
             m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
-            m_btnNewest = (GButton)comp.GetChild("btnNewest");
             m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
@@ -78,13 +79,16 @@ namespace UI.Poem
             m_listRecommend = (GList)comp.GetChild("listRecommend");
             m_listFriend = (GList)comp.GetChild("listFriend");
             m_listRank = (GList)comp.GetChild("listRank");
+            m_comBoBox = (GComboBox)comp.GetChild("comBoBox");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtRewardCount = (GTextField)comp.GetChild("txtRewardCount");
+            m_txtRank = (GTextField)comp.GetChild("txtRank");
+            m_grpResult = (GGroup)comp.GetChild("grpResult");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_btnShop = null;
-            m_btnRecommend = null;
-            m_btnNewest = null;
             m_btnReward = null;
             m_btnTab0 = null;
             m_btnTab1 = null;
@@ -93,6 +97,11 @@ namespace UI.Poem
             m_listRecommend = null;
             m_listFriend = null;
             m_listRank = null;
+            m_comBoBox = null;
+            m_txtTime = null;
+            m_txtRewardCount = null;
+            m_txtRank = null;
+            m_grpResult = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComRoleHead
+    {
+        public GComponent target;
+        public GTextField m_txtLvl;
+        public const string URL = "ui://iyz778gkr9ri12m";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComRoleHead";
+        private static UI_ComRoleHead _proxy;
+
+        public static UI_ComRoleHead Create(GObject gObject = null)
+        {
+            var ui = new UI_ComRoleHead();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComRoleHead Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComRoleHead();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_txtLvl = (GTextField)comp.GetChild("txtLvl");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLvl = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Poem
+{
+    public partial class UI_ComboBox1_popup
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://iyz778gkr9ri12c";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComboBox1_popup";
+        private static UI_ComboBox1_popup _proxy;
+
+        public static UI_ComboBox1_popup Create(GObject gObject = null)
+        {
+            var ui = new UI_ComboBox1_popup();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComboBox1_popup Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComboBox1_popup();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,6 +7,7 @@ namespace UI.Poem
     public partial class UI_ListRankItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_txtRank;
         public GTextField m_txtName;
@@ -59,6 +60,7 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -67,6 +69,7 @@ namespace UI.Poem
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_txtRank = null;
             m_txtName = null;

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

@@ -8,15 +8,15 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnback;
         public GLoader m_loaPicture;
-        public GComponent m_comHead;
-        public GTextField m_txtlevel;
+        public GButton m_btnback;
+        public UI_ComRoleHead m_comHead;
         public GTextField m_txtName;
         public GButton m_btnAddFriend;
         public GButton m_btnDelete;
-        public GButton m_btnVote;
         public GButton m_btnCollect;
+        public GButton m_btnVote;
+        public GTextField m_txtTheme;
         public const string URL = "ui://iyz778gkr9ri116";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemGalleryPreviewUI";
@@ -65,28 +65,29 @@ 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");
-            m_txtlevel = (GTextField)comp.GetChild("txtlevel");
+            m_btnback = (GButton)comp.GetChild("btnback");
+            m_comHead = (UI_ComRoleHead)UI_ComRoleHead.Create(comp.GetChild("comHead"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAddFriend = (GButton)comp.GetChild("btnAddFriend");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
-            m_btnVote = (GButton)comp.GetChild("btnVote");
             m_btnCollect = (GButton)comp.GetChild("btnCollect");
+            m_btnVote = (GButton)comp.GetChild("btnVote");
+            m_txtTheme = (GTextField)comp.GetChild("txtTheme");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnback = null;
             m_loaPicture = null;
+            m_btnback = null;
+            m_comHead.Dispose();
             m_comHead = null;
-            m_txtlevel = null;
             m_txtName = null;
             m_btnAddFriend = null;
             m_btnDelete = null;
-            m_btnVote = null;
             m_btnCollect = null;
+            m_btnVote = null;
+            m_txtTheme = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -78,6 +78,10 @@ namespace GFGGame
                         {
                             data.Ntexture = new NTexture(texture);
                             list.Add(data);
+                            if (list.Count == response.StartIndex + response.WorksList.Count - 1)
+                            {
+
+                            }
                         }));
                     }
 
@@ -86,6 +90,161 @@ namespace GFGGame
             }
             return false;
         }
+
+        //请求投稿画廊作品
+        public static async ETTask<string[]> ReqUpLoadGalleryWorks()
+        {
+            S2C_RequestUpLoadGalleryWorks response = null;
+            response = (S2C_RequestUpLoadGalleryWorks)await MessageHelper.SendToServer(new C2S_RequestUpLoadGalleryWorks());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // PictureStorageHelper.PushToHWCloud(response.TempPictureUrl)
+                    return new string[] { response.TempPictureUrl, response.WorksId.ToString() };
+                    // return true;
+                }
+            }
+            ViewManager.Hide<ModalStatusView>();
+            return null;
+        }
+
+        //通知服务端上传成功
+        public static async ETTask<bool> ReqNoticeGalleryWorksUploaded(long worksId)
+        {
+            S2C_NoticeGalleryWorksUploaded response = null;
+            response = (S2C_NoticeGalleryWorksUploaded)await MessageHelper.SendToServer(new C2S_NoticeGalleryWorksUploaded() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            ViewManager.Hide<ModalStatusView>();
+            return false;
+        }
+
+        //删除我的作品
+        public static async ETTask<bool> ReqDeleteMyWorks(long worksId)
+        {
+            S2C_NoticeGalleryWorksUploaded response = null;
+            response = (S2C_NoticeGalleryWorksUploaded)await MessageHelper.SendToServer(new C2S_NoticeGalleryWorksUploaded() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //收藏指定画廊作品
+        public static async ETTask<bool> ReqCollecteGalleryWorks(long worksId)
+        {
+            S2C_CollecteGalleryWorks response = null;
+            response = (S2C_CollecteGalleryWorks)await MessageHelper.SendToServer(new C2S_CollecteGalleryWorks() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //取消收藏指定画廊作品
+        public static async ETTask<bool> ReqCancelCollecteGalleryWorks(long worksId)
+        {
+            S2C_CancelCollecteGalleryWorks response = null;
+            response = (S2C_CancelCollecteGalleryWorks)await MessageHelper.SendToServer(new C2S_CancelCollecteGalleryWorks() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //点赞指定画廊作品
+        public static async ETTask<bool> ReqVoteGalleryWorks(long worksId)
+        {
+            S2C_LikeGalleryWorks response = null;
+            response = (S2C_LikeGalleryWorks)await MessageHelper.SendToServer(new C2S_LikeGalleryWorks() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //取消点赞指定画廊作品
+        public static async ETTask<bool> ReqCancelVoteGalleryWorks(long worksId)
+        {
+            S2C_CancelLikeGalleryWorks response = null;
+            response = (S2C_CancelLikeGalleryWorks)await MessageHelper.SendToServer(new C2S_CancelLikeGalleryWorks() { WorksId = worksId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取画廊作品排行榜
+        public static async ETTask<bool> ReqRankList()
+        {
+            S2C_GetGalleryWorksRankList response = null;
+            response = (S2C_GetGalleryWorksRankList)await MessageHelper.SendToServer(new C2S_GetGalleryWorksRankList());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+
+                    List<PoemGalleryData> list = PoemGalleryDataManager.Instance.RankDatas;
+
+                    for (int i = 0; i < response.RankList.Count; i++)
+                    {
+
+                        PoemGalleryData data = new PoemGalleryData();
+                        data.WorkId = response.RankList[i].WorksId;
+                        data.AuthorId = response.RankList[i].AuthorId;
+                        data.AuthorName = response.RankList[i].AuthorName;
+                        data.VoteCount = response.RankList[i].BelikedCount;
+                        data.CollectCount = response.RankList[i].BeCollectedCount;
+                        data.VoteOrNot = response.RankList[i].LikeOrNot;
+                        data.CollectOrNot = response.RankList[i].CollectOrNot;
+                        data.CreateTime = response.RankList[i].CreateTime;
+                        data.ThemeOrder = response.RankList[i].ThemeOrder;
+                        data.ThemeId = response.RankList[i].ThemeId;
+                        data.PictureTempUrl = response.RankList[i].PictureTempUrl;
+                        Timers.inst.StartCoroutine(PictureStorageHelper.DownloadFile(data.PictureTempUrl, (Texture2D texture) =>
+                        {
+                            data.Ntexture = new NTexture(texture);
+                            list.Add(data);
+                            if (list.Count == response.RankList.Count)
+                            {
+
+                            }
+                        }));
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+
     }
 }
 

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

@@ -568,6 +568,8 @@ namespace GFGGame
             tex.ReadPixels(rect, 0, 0);//读取像素，屏幕左下角为0点
             tex.Apply();//保存像素信息
 
+            byte[] bytes = tex.EncodeToJPG();
+
             if (_ui.m_c1.selectedIndex == 0)
             {
                 ViewManager.Show<PhotographSaveView>(tex);
@@ -580,7 +582,13 @@ namespace GFGGame
                 .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
                 {
                     ViewManager.Show<ModalStatusView>("上传中...");
-                    bool result = true;// await PoemPhotoSProxy.ReqRemovedPhoto(_listDelete, _sourceType);
+                    string[] rsp = await PoemGallerySProxy.ReqUpLoadGalleryWorks();
+                    if (rsp == null) return;
+
+                    bool pushResult = await PictureStorageHelper.PushToHWCloud(rsp[0], bytes);
+                    if (!pushResult) return;
+
+                    bool result = await PoemGallerySProxy.ReqNoticeGalleryWorksUploaded(int.Parse(rsp[1]));
                     if (result)
                     {
                         ViewManager.Hide<ModalStatusView>();

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

@@ -142,7 +142,7 @@ namespace GFGGame
             swipeGesture = new SwipeGesture(_ui.target);
             swipeGesture.onAction.Add(OnSwipe);
             swipeGesture.actionDistance = swipeDistance;
-            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + 12, 0).Coroutine();
+            // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + 4, 0).Coroutine();
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;

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

@@ -29,8 +29,9 @@ namespace GFGGame
             _ui = UI_PoemGalleryUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
 
+            _ui.m_comNormal.m_comBoBox.items = new string[] { "推荐", "最新" };
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_btnRecover.onClick.Add(OnBtnRecoverClick);
             _ui.m_btnJoin.onClick.Add(OnBtnJoinClick);
@@ -44,9 +45,8 @@ namespace GFGGame
             _ui.m_comNormal.m_listFriend.SetVirtual();
             _ui.m_comNormal.m_listRank.itemRenderer = RenderListRankItem;
             _ui.m_comNormal.m_listRank.SetVirtual();
+
             _ui.m_comNormal.m_btnShop.onClick.Add(OnBtnShopClick);
-            _ui.m_comNormal.m_btnRecommend.onClick.Add(OnBtnRecommendClick);
-            _ui.m_comNormal.m_btnNewest.onClick.Add(OnBtnNewestClick);
             _ui.m_comNormal.m_btnReward.onClick.Add(OnBtnRewardClick);
             _ui.m_comNormal.m_c1.onChanged.Add(OnNormalTabChange);
 
@@ -59,6 +59,7 @@ namespace GFGGame
         {
             base.AddEventListener();
 
+            // EventAgent.AddEventListener(ConstMessage.GALLERY_DATA_CHANGE,)
         }
         protected override void OnShown()
         {
@@ -111,19 +112,19 @@ namespace GFGGame
         /// </summary>
         private void OnNormalTabChange()
         {
-            if (_ui.m_comNormal.m_c1.selectedIndex == 2)
+            if (_ui.m_comNormal.m_c1.selectedIndex == 2)//排行榜
             {
 
             }
             else
             {
-                if (_ui.m_comNormal.m_c1.selectedIndex == 0)
+                if (_ui.m_comNormal.m_c1.selectedIndex == 0)//推荐
                 {
                     // _infoType = GalleryType.Recommend;
                     // _galleryIds = PoemGalleryDataManager.Instance.RecommendInfos;
                     _ui.m_comNormal.m_listRecommend.numItems = 5;
                 }
-                else if (_ui.m_comNormal.m_c1.selectedIndex == 1)
+                else if (_ui.m_comNormal.m_c1.selectedIndex == 1)//好友
                 {
                     // _infoType = GalleryType.Friend;
                     // _galleryIds = PoemGalleryDataManager.Instance.FrinedInfos;
@@ -147,7 +148,7 @@ namespace GFGGame
             }
         }
 
-
+        // private void UpdateGallery
 
 
         /// <summary>

GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 42ed84841a859a34784224eeea71cddf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dda4fbc1a08ee76499f13f996c2ea9ee
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: