相册

FGUIProject/assets/Bag/BagUI.xml

@@ -4,7 +4,7 @@
     <loader id="n13_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="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="79,90" group="n17_si5z">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n17_si5z">
@@ -13,7 +13,7 @@
     </component>
     <image id="n16_si5z" name="n16" src="si5zti3" fileName="images/wpbb_zi.png" xy="189,216" group="n17_si5z"/>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
-    <group id="n17_si5z" name="grpTop" xy="40,90" size="986,234"/>
+    <group id="n17_si5z" name="grpTop" xy="0,90" size="1080,234"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>

FGUIProject/assets/CommonGame/components/BtnBack.xml

@@ -0,0 +1,14 @@
+<?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"/>
+  <displayList>
+    <loader id="n4_uyux" name="loaBg" xy="-34,6" size="578,116" url="ui://eg2y0ldpuyuxtj8" 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"/>
+    <loader id="n5_uyux" name="loaTitle" xy="118,18" size="161,54" url="ui://eg2y0ldpuyuxtj6" autoSize="true"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaTitle" propertyId="1"/>
+</component>

FGUIProject/assets/CommonGame/components/Button13.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="98,132" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ly9g" src="ly9g1d" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
+    <loader id="n1_uyux" name="icon" xy="0,0" size="98,132" url="ui://eg2y0ldply9g1d" autoSize="true"/>
   </displayList>
+  <Button/>
+  <relation target="n1_uyux" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -226,6 +226,12 @@
     <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
     <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
+    <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
+    <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
+    <component id="uyuxtj5" name="BtnBack.xml" path="/components/" exported="true"/>
+    <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
+    <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
+    <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/PhotographSaveUI.xml

@@ -10,24 +10,26 @@
     <image id="n3_i3ix" name="imgBorder" src="xmtl4t" fileName="images/pz_jtkuang.png" xy="77,101">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </image>
-    <component id="n4_i3ix" name="btnSave" src="i3ix5a" fileName="components/Button12.xml" xy="545,1816">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <Button icon="ui://mbo439wbxmtl4x"/>
+    <component id="n8_i3ix" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="954,56">
+      <relation target="n3_i3ix" sidePair="right-right,top-top"/>
     </component>
-    <component id="n5_i3ix" name="btnShare" src="i3ix5a" fileName="components/Button12.xml" xy="667,1816" visible="false">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
+    <component id="n4_i3ix" name="btnSave" src="i3ix5a" fileName="components/Button12.xml" xy="629,1654" size="140,116" group="n9_uyux">
+      <Button icon="ui://mbo439wbuyuxdq"/>
+    </component>
+    <component id="n5_i3ix" name="btnShare" src="i3ix5a" fileName="components/Button12.xml" xy="751,1654" group="n9_uyux" visible="false">
       <Button icon="ui://mbo439wbxmtl4v"/>
     </component>
-    <component id="n6_i3ix" name="btnShareWX" src="i3ix5a" fileName="components/Button12.xml" xy="796,1816" visible="false">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
+    <component id="n6_i3ix" name="btnShareWX" src="i3ix5a" fileName="components/Button12.xml" xy="873,1654" group="n9_uyux" visible="false">
       <Button icon="ui://mbo439wbxmtl4w"/>
     </component>
-    <component id="n7_i3ix" name="btnShareWB" src="i3ix5a" fileName="components/Button12.xml" xy="925,1816" visible="false">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
+    <component id="n7_i3ix" name="btnShareWB" src="i3ix5a" fileName="components/Button12.xml" xy="995,1654" group="n9_uyux" visible="false">
       <Button icon="ui://mbo439wbxmtl4u"/>
     </component>
-    <component id="n8_i3ix" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="954,56">
-      <relation target="n3_i3ix" sidePair="right-right,top-top"/>
+    <component id="n11_uyux" name="btnSavePhoto" src="i3ix5a" fileName="components/Button12.xml" xy="807,1654" size="141,116" group="n9_uyux">
+      <Button icon="ui://mbo439wbuyuxdp"/>
     </component>
+    <group id="n9_uyux" name="n9" xy="629,1654" size="319,116" advanced="true" layout="hz" colGap="38" excludeInvisibles="true">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/DressUp/components/Button12.xml

@@ -5,4 +5,5 @@
     <loader id="n3_i3ix" name="icon" xy="0,0" size="84,84" url="ui://mbo439wbxmtl4x" autoSize="true"/>
   </displayList>
   <Button/>
+  <relation target="n3_i3ix" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -157,6 +157,8 @@
     <image id="94m1dm" name="hz_kuangk_4.png" path="/images/" exported="true"/>
     <image id="94m1dn" name="hz_kuangk_3.png" path="/images/" exported="true"/>
     <image id="94m1do" name="hz_kuangk_2.png" path="/images/" exported="true"/>
+    <image id="uyuxdp" name="pz_icon_6.png" path="/images/"/>
+    <image id="uyuxdq" name="pz_icon_5.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/poem/PoemPhotoPreviewUI.xml

@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <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="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n3_v482">
-      <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpsi5zti5"/>
+    <graph id="n14_uyux" name="grhBg" xy="0,0" size="1080,1920" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <image id="n15_uyux" name="n15" src="uyuxzn" fileName="photImages/xc_bkuangdi.png" xy="0,1775"/>
+    <list id="n4_v482" name="list" xy="40,158" size="1000,1604" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="10" defaultItem="ui://iyz778gkv482b">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n12_11rzz" name="btnLeft" src="uyux10d" fileName="components/Button8.xml" xy="106,913" pivot="0.5,0.5" anchor="true" rotation="180">
+      <Button icon="ui://eg2y0ldpuyuxtj3"/>
     </component>
-    <image id="n2_v482" name="n2" src="v4821" fileName="images/wpbb_zi.png" xy="189,216" group="n3_v482"/>
-    <group id="n3_v482" name="n3" xy="40,196" size="254,95"/>
-    <list id="n4_v482" name="list" xy="58,350" size="989,1416" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="10" defaultItem="ui://iyz778gkv482b"/>
-    <component id="n12_11rzz" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="87,1084" pivot="0.5,0.5" anchor="true" rotation="180"/>
-    <component id="n13_11rzz" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="1013,1084" pivot="0.5,0.5" anchor="true"/>
-    <component id="n6_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="70,1795" size="100,69"/>
-    <component id="n7_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="835,1817" size="100,54"/>
-    <component id="n9_v482" name="btnShare" src="v482c" fileName="components/Button4.xml" xy="987,1798" size="67,87"/>
-    <text id="n8_v482" name="txtTime" xy="355,1821" pivot="0.5,0" size="298,44" fontSize="32" align="center" text="2022-1-8 17:14:30"/>
+    <component id="n13_11rzz" name="btnRight" src="uyux10d" fileName="components/Button8.xml" xy="971,913" pivot="0.5,0.5" anchor="true">
+      <Button icon="ui://eg2y0ldpuyuxtj3"/>
+    </component>
+    <component id="n6_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="57,1813"/>
+    <component id="n7_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="865,1813"/>
+    <component id="n9_v482" name="btnShare" src="v482c" fileName="components/Button4.xml" xy="964,1813"/>
+    <text id="n8_v482" name="txtTime" xy="346,1821" pivot="0.5,0" size="387,56" fontSize="42" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemPhotoShareUI.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+    <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,1920" fill="scaleMatchHeight">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196">
+    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,17">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpsi5zti5"/>
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+    </component>
+    <component id="n2_v482" name="btnSave" src="v482e" fileName="components/Button5.xml" xy="699,1756"/>
+    <component id="n3_v482" name="btnShare" src="v482e" fileName="components/Button5.xml" xy="879,1756">
+      <Button icon="ui://iyz778gkuyuxzk"/>
     </component>
-    <component id="n2_v482" name="btnSave" src="v482e" fileName="components/Button5.xml" xy="833,1649" size="174,81"/>
-    <component id="n3_v482" name="btnShare" src="v482e" fileName="components/Button5.xml" xy="834,1762" size="174,81"/>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <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="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n3_v482">
-      <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpsi5zti5"/>
-    </component>
-    <image id="n2_v482" name="n2" src="v4821" fileName="images/wpbb_zi.png" xy="189,216" group="n3_v482"/>
-    <group id="n3_v482" name="n3" xy="40,196" size="254,95"/>
-    <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="components/Button6.xml" xy="345,311" size="151,63">
-      <Button checked="true" controller="c1" page="0"/>
+    <image id="n13_uyux" name="n13" src="uyuxzx" fileName="photImages/xc_xzdik.png" xy="265,173" group="n14_uyux"/>
+    <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="components/Button6.xml" xy="263,171" group="n14_uyux">
+      <Button checked="true" icon="ui://iyz778gkuyux108" selectedIcon="ui://iyz778gkuyuxzv" controller="c1" page="0"/>
     </component>
-    <component id="n12_11rzz" name="btnTab1" src="11rzzf" fileName="components/Button6.xml" xy="548,311" size="151,63">
-      <Button controller="c1" page="1"/>
+    <component id="n12_11rzz" name="btnTab1" src="11rzzf" fileName="components/Button6.xml" xy="536,171" group="n14_uyux">
+      <Button icon="ui://iyz778gkuyux109" selectedIcon="ui://iyz778gkuyuxzw" controller="c1" page="1"/>
     </component>
-    <list id="n8_v482" name="list" xy="91,444" size="952,1316" layout="flow_hz" overflow="scroll" defaultItem="ui://iyz778gkv4828" align="center">
+    <group id="n14_uyux" name="n14" xy="263,171" size="553,82"/>
+    <list id="n8_v482" name="list" xy="0,294" size="1080,1478" layout="flow_hz" overflow="scroll" lineGap="16" colGap="7" defaultItem="ui://iyz778gkv4828" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -26,7 +24,23 @@
       <item/>
       <item/>
     </list>
-    <text id="n9_v482" name="txtCount" xy="491,1801" size="83,44" fontSize="32" align="center" text="0/50"/>
-    <component id="n10_v482" name="btnDelete" src="v4829" fileName="components/Button3.xml" xy="614,1800" size="100,47"/>
+    <image id="n16_uyux" name="n16" src="uyuxzn" fileName="photImages/xc_bkuangdi.png" xy="0,1775" group="n17_uyux"/>
+    <component id="n19_uyux" name="btnConfirmDelete" src="uyux103" fileName="components/Button7.xml" xy="362,1811" group="n17_uyux">
+      <gearDisplay controller="c2" pages="1"/>
+    </component>
+    <component id="n10_v482" name="btnDelete" src="v4829" fileName="components/Button3.xml" xy="590,1807" group="n17_uyux">
+      <gearDisplay controller="c2" pages="0"/>
+    </component>
+    <text id="n9_v482" name="txtCount" xy="412,1820" pivot="0.5,0" size="116,62" group="n17_uyux" fontSize="46" color="#b5926a" align="center" text="0/50">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <group id="n17_uyux" name="n17" xy="0,1775" size="1080,145" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,17" controller="c1,1">
+      <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+      <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/poem/PoemUI.xml

@@ -4,12 +4,10 @@
     <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="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="40,196" group="n3_v482">
+    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="34,17">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpsi5zti5"/>
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <image id="n2_v482" name="n2" src="v4821" fileName="images/wpbb_zi.png" xy="189,216" group="n3_v482"/>
-    <group id="n3_v482" name="n3" xy="40,196" size="254,95"/>
-    <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="652,523"/>
+    <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="90,400"/>
   </displayList>
 </component>

FGUIProject/assets/poem/components/Button1.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="77,76" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_v482" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_v482" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_v482" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_uyux" name="n3" src="uyuxzs" fileName="photImages/xc_suo_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n4_uyux" name="n4" src="uyuxzt" fileName="photImages/xc_suo_2.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/poem/components/Button2.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="77,76" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_v482" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_v482" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_v482" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_uyux" name="n3" src="uyuxzp" fileName="photImages/xc_dz_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n4_uyux" name="n4" src="uyuxzq" fileName="photImages/xc_dz_2.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/poem/components/Button3.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="86,87" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_v482" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_v482" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_v482" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_uyux" name="n3" src="uyuxzu" fileName="photImages/xc_xcxc.png" xy="0,0"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/poem/components/Button4.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="76,77" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_v482" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_v482" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_v482" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <image id="n3_uyux" name="n3" src="uyuxzz" fileName="photImages/xc_zfzf.png" xy="0,0"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/poem/components/Button5.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="140,116" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n0_v482" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_v482" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_v482" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <loader id="n4_uyux" name="icon" xy="0,0" size="140,116" url="ui://iyz778gkuyuxzl" autoSize="true"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/poem/components/Button6.xml

@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
-  <Button mode="Radio"/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="280,82" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
   <displayList>
-    <graph id="n0_11rzz" name="n0" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n1_11rzz" name="n1" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
-    <graph id="n2_11rzz" name="n2" xy="0,0" size="100,20" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </graph>
+    <loader id="n3_uyux" name="icon" xy="140,41" pivot="0.5,0.5" anchor="true" size="280,82" url="ui://iyz778gkuyuxzv" autoSize="true"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/poem/components/Button7.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="355,78" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_uyux" name="n0" src="uyuxzy" fileName="photImages/xc_kuangscsc.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_uyux" name="txtTitle" xy="129,8" pivot="0.5,0.5" size="95,62" fontSize="46" color="#f8f1e6" text="删除"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/poem/components/Button8.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="90,90" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_uyux" src="uyux10b" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/poem/components/ComEctype.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="84,403">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="899,253">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n4_n3xh" name="icon" xy="0,0" size="84,403" url="ui://iyz778gkv4823" autoSize="true"/>
-    <image id="n3_n3xh" name="img" src="v4824" fileName="images/ejzjm_gbzt.png" xy="0,4">
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="899,253" url="ui://iyz778gkuyuxzj" autoSize="true"/>
+    <image id="n3_n3xh" name="img" src="uyux10c" fileName="photImages/xc_xcan.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n5_uyux" name="n5" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="414,108">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

FGUIProject/assets/poem/components/ComIcon.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="465,655" mask="n13_uyux">
+  <displayList>
+    <loader id="n4_v482" name="loaIcon" xy="0,0" pivot="0.5,0.5" size="465,655" url="ui://iyz778gkuyux102" fill="scaleMatchWidth"/>
+    <image id="n13_uyux" name="n13" src="uyux107" fileName="photImages/xc_xzxd.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/components/ComPhoto.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="994,1600" overflow="hidden" mask="n7_uyux" reversedMask="true">
+  <displayList>
+    <loader id="n5_v482" name="loaPhoto" xy="-3,-2" size="1000,1605" url="ui://iyz778gkuyux102" fill="scaleMatchWidth"/>
+    <image id="n7_uyux" name="n7" src="uyux100" fileName="photImages/xc_dakuang.png" xy="-3,-2" size="1000,1607"/>
+  </displayList>
+</component>

FGUIProject/assets/poem/components/ListPhotoItem.xml

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="324,530">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="493,740">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_v482" name="loaIcon" xy="0,0" size="324,467"/>
-    <component id="n5_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="2,394" size="100,69"/>
-    <component id="n6_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="219,414" size="100,54"/>
-    <text id="n7_v482" name="txtTime" xy="10,486" pivot="0.5,0" size="298,44" fontSize="32" align="center" text="2022-1-8 17:14:30"/>
-    <image id="n8_11rzz" name="n8" src="11rzzg" fileName="images/kp_anniudik.png" xy="273,12" size="40,40">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n9_11rzz" name="n9" src="11rzzh" fileName="images/kp_anniudik_1.png" xy="273,12" size="40,40">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n11_11rzz" name="n11" src="11rzzi" fileName="images/kp_kuang_4.png" xy="-4,-6" size="334,491">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
-    </image>
+    <component id="n4_v482" name="comIcon" src="uyux101" fileName="components/ComIcon.xml" xy="14,8"/>
+    <image id="n12_uyux" name="n12" src="uyuxzr" fileName="photImages/xc_kuangdi.png" xy="0,0"/>
+    <component id="n5_v482" name="btnLock" src="v4826" fileName="components/Button1.xml" xy="262,549"/>
+    <component id="n6_v482" name="btnUp" src="v4827" fileName="components/Button2.xml" xy="356,549"/>
+    <text id="n7_v482" name="txtTime" xy="79,691" pivot="0.5,0" size="335,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
+    <image id="n15_uyux" name="imgSelect" src="uyux107" fileName="photImages/xc_xzxd.png" xy="14,12"/>
   </displayList>
 </component>

FGUIProject/assets/poem/components/ListPhotoPreviewItem.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="910,1274">
+<component size="1000,1065">
   <displayList>
-    <loader id="n5_v482" name="loaPhoto" xy="0,0" size="910,1274"/>
+    <component id="n5_v482" name="loaPhoto" src="uyux105" fileName="components/ComPhoto.xml" xy="3,2"/>
+    <image id="n8_uyux" name="n8" src="uyux100" fileName="photImages/xc_dakuang.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/poem/package.xml

@@ -2,9 +2,7 @@
 <packageDescription id="iyz778gk">
   <resources>
     <component id="v4820" name="PoemUI.xml" path="/" exported="true"/>
-    <image id="v4821" name="wpbb_zi.png" path="/images/"/>
     <component id="v4822" name="ComEctype.xml" path="/components/"/>
-    <image id="v4823" name="ejzjm_1.png" path="/images/"/>
     <image id="v4824" name="ejzjm_gbzt.png" path="/images/"/>
     <component id="v4825" name="PoemPhotoUI.xml" path="/" exported="true"/>
     <component id="v4826" name="Button1.xml" path="/components/"/>
@@ -17,9 +15,33 @@
     <component id="v482d" name="PoemPhotoShareUI.xml" path="/" exported="true"/>
     <component id="v482e" name="Button5.xml" path="/components/"/>
     <component id="11rzzf" name="Button6.xml" path="/components/"/>
-    <image id="11rzzg" name="kp_anniudik.png" path="/images/"/>
-    <image id="11rzzh" name="kp_anniudik_1.png" path="/images/"/>
-    <image id="11rzzi" name="kp_kuang_4.png" path="/images/" exported="true" scale="9grid" scale9grid="60,110,120,220"/>
+    <image id="uyuxzj" name="xc_xc.png" path="/images/"/>
+    <image id="uyuxzk" name="xcpz_icon_2.png" path="/photImages/"/>
+    <image id="uyuxzl" name="xcpz_icon_1.png" path="/photImages/"/>
+    <image id="uyuxzn" name="xc_bkuangdi.png" path="/photImages/"/>
+    <image id="uyuxzp" name="xc_dz_1.png" path="/photImages/"/>
+    <image id="uyuxzq" name="xc_dz_2.png" path="/photImages/"/>
+    <image id="uyuxzr" name="xc_kuangdi.png" path="/photImages/"/>
+    <image id="uyuxzs" name="xc_suo_1.png" path="/photImages/"/>
+    <image id="uyuxzt" name="xc_suo_2.png" path="/photImages/"/>
+    <image id="uyuxzu" name="xc_xcxc.png" path="/photImages/"/>
+    <image id="uyuxzv" name="xc_xzanniu_1.png" path="/photImages/"/>
+    <image id="uyuxzw" name="xc_xzanniu_2.png" path="/photImages/"/>
+    <image id="uyuxzx" name="xc_xzdik.png" path="/photImages/"/>
+    <image id="uyuxzy" name="xc_kuangscsc.png" path="/photImages/"/>
+    <image id="uyuxzz" name="xc_zfzf.png" path="/photImages/"/>
+    <image id="uyux100" name="xc_dakuang.png" path="/photImages/"/>
+    <component id="uyux101" name="ComIcon.xml" path="/components/"/>
+    <image id="uyux102" name="test1.jpg" path="/photImages/"/>
+    <component id="uyux103" name="Button7.xml" path="/components/"/>
+    <component id="uyux105" name="ComPhoto.xml" path="/components/"/>
+    <image id="uyux107" name="xc_xzxd.png" path="/photImages/"/>
+    <image id="uyux108" name="xc_grxc.png" path="/photImages/"/>
+    <image id="uyux109" name="xc_qsws.png" path="/photImages/"/>
+    <image id="uyux10a" name="xc_xczi.png" path="/photImages/"/>
+    <image id="uyux10b" name="xc_xzxzz.png" path="/photImages/"/>
+    <image id="uyux10c" name="xc_xcan.png" path="/photImages/"/>
+    <component id="uyux10d" name="Button8.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -79,5 +79,7 @@ namespace GFGGame
         public const string FRIEND_APPLY_CHANGE = "FRIEND_APPLY_CHANGE";//好友申请列表变化
 
         public const string ITEM_READ = "ITEM_READ";//物品已读回复
+
+        public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE";//相册数据变化
     }
 }

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

@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
+using ET;
 using FairyGUI;
 using UI.DressUp;
 using UnityEngine;
@@ -304,5 +307,40 @@ namespace GFGGame
             });
 
         }
+
+
+        /// <summary>
+        /// 将照片保存到本地
+        /// </summary>
+        public void SavePicturoToLocal(byte[] bytes, string fileName)
+        {
+            string path = Application.persistentDataPath + "/Pictures/WanshiJing/";
+            //判断目录是否存在，不存在则会创建目录
+            if (!Directory.Exists(path))
+            {
+                try
+                {
+                    Directory.CreateDirectory(path);
+                }
+                catch (Exception exception)
+                {
+                    throw new Exception("创建文件夹失败, error:" + exception.Message);
+
+                }
+            }
+            var filePath = path + fileName;
+            // byte[] bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
+            File.WriteAllBytes(filePath, bytes);
+            UpdateSystemPhoto(filePath);
+        }
+        //调用iOS或Android原生方法保存图片后更新相册.
+        private void UpdateSystemPhoto(string filePath)
+        {
+#if UNITY_ANDROID
+            AndroidJavaObject androidJavaObject = new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
+            androidJavaObject.Call("scanFile", filePath, "已保存至相册"); //这里我们可以设置保存成功弹窗内容
+#endif
+        }
+
     }
 }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using ET;
 using UnityEngine;
@@ -9,37 +10,132 @@ namespace GFGGame
     {
 
         /// <summary>
-        /// 将照片保存到本地
+        /// 个人相册
         /// </summary>
-        public void SavePicturoToLocal(Texture2D tex)
+        /// <typeparam name="PoemPhotoData"></typeparam>
+        /// <returns></returns>
+        public List<PoemPhotoData> PersonalPhotoInfos = new List<PoemPhotoData>();
+
+        /// <summary>
+        /// 万水千山相册
+        /// </summary>
+        /// <typeparam name="PoemPhotoData"></typeparam>
+        /// <returns></returns>
+        public List<PoemPhotoData> WsqsPhotoInfos = new List<PoemPhotoData>();
+
+        public void Clear()
+        {
+            PersonalPhotoInfos.Clear();
+            WsqsPhotoInfos.Clear();
+        }
+        public void Add(PoemPhotoData photoData, int sourceType)
+        {
+            List<PoemPhotoData> poemPhotoDatas = null;
+            if (sourceType == (int)PictureSourceType.PersonalAlbum)
+            {
+                // PersonalPhotoInfos.Add(photoData);
+                // PersonalPhotoInfos = SortInfos(PersonalPhotoInfos);
+                poemPhotoDatas = PersonalPhotoInfos;
+            }
+            else if (sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                // WsqsPhotoInfos.Add(photoData);
+                // WsqsPhotoInfos = SortInfos(WsqsPhotoInfos);
+                poemPhotoDatas = WsqsPhotoInfos;
+            }
+            poemPhotoDatas.Add(photoData);
+            poemPhotoDatas = SortInfos(poemPhotoDatas);
+        }
+        public void Remove(List<long> pictureIds, int sourceType)
         {
-            string path = Application.persistentDataPath + "/Pictures/WanshiJing/";
-            //判断目录是否存在，不存在则会创建目录
-            if (!Directory.Exists(path))
+            List<PoemPhotoData> poemPhotoDatas = null;
+            if (sourceType == (int)PictureSourceType.PersonalAlbum)
             {
-                try
+
+                poemPhotoDatas = PersonalPhotoInfos;
+            }
+            else if (sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                poemPhotoDatas = WsqsPhotoInfos;
+            }
+
+            for (int i = 0; i < pictureIds.Count; i++)
+            {
+                for (int j = 0; j < poemPhotoDatas.Count; j++)
                 {
-                    Directory.CreateDirectory(path);
+                    if (pictureIds[i] == poemPhotoDatas[j].PictureId)
+                    {
+                        poemPhotoDatas.RemoveAt(j);
+                        break;
+                    }
                 }
-                catch (Exception exception)
+            }
+            poemPhotoDatas = SortInfos(poemPhotoDatas);
+        }
+
+        public void ChangeLockingState(long pictureId, bool state, int sourceType)
+        {
+            List<PoemPhotoData> poemPhotoDatas = null;
+            if (sourceType == (int)PictureSourceType.PersonalAlbum)
+            {
+
+                poemPhotoDatas = PersonalPhotoInfos;
+            }
+            else if (sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                poemPhotoDatas = WsqsPhotoInfos;
+            }
+            for (int i = 0; i < poemPhotoDatas.Count; i++)
+            {
+                if (poemPhotoDatas[i].PictureId == pictureId)
                 {
-                    throw new Exception("创建文件夹失败, error:" + exception.Message);
+                    poemPhotoDatas[i].LockingStatus = state;
+                    break;
+                }
+            }
+            poemPhotoDatas = SortInfos(poemPhotoDatas);
+
+        }
+
+
+        public void ChangeToppingState(long pictureId, bool state, int sourceType)
+        {
+            List<PoemPhotoData> poemPhotoDatas = null;
+            if (sourceType == (int)PictureSourceType.PersonalAlbum)
+            {
 
+                poemPhotoDatas = PersonalPhotoInfos;
+            }
+            else if (sourceType == (int)PictureSourceType.WanShuiQianShan)
+            {
+                poemPhotoDatas = WsqsPhotoInfos;
+            }
+            for (int i = 0; i < poemPhotoDatas.Count; i++)
+            {
+                if (poemPhotoDatas[i].PictureId == pictureId)
+                {
+                    poemPhotoDatas[i].ToppingStatus = state;
+                    break;
                 }
             }
-            string fileName = "wsj" + TimeHelper.ServerNowSecs + ".jpg";
-            var filePath = path + fileName;
-            byte[] bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
-            File.WriteAllBytes(filePath, bytes);
-            UpdateSystemPhoto(filePath);
+            poemPhotoDatas = SortInfos(poemPhotoDatas);
+
         }
-        //调用iOS或Android原生方法保存图片后更新相册.
-        private void UpdateSystemPhoto(string filePath)
+        private List<PoemPhotoData> SortInfos(List<PoemPhotoData> photoInfos)
         {
-#if UNITY_ANDROID
-            AndroidJavaObject androidJavaObject = new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
-            androidJavaObject.Call("scanFile", filePath, "已保存至相册"); //这里我们可以设置保存成功弹窗内容
-#endif
+            photoInfos.Sort((PoemPhotoData a, PoemPhotoData b) =>
+            {
+                if (a.ToppingStatus) return 1;
+                if (b.ToppingStatus) return -1;
+
+                if (a.CreationTime < b.CreationTime) return 1;
+                if (a.CreationTime > b.CreationTime) return -1;
+
+                return 0;
+            });
+
+            return photoInfos;
         }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Data/VO/PoemPhotoData.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class PoemPhotoData
+    {
+        /// <summary>
+        /// 图片id
+        /// </summary>
+        public long PictureId;
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public long CreationTime;
+
+        /// <summary>
+        /// 置顶时间
+        /// </summary>
+        public long ToppingTime;
+
+        /// <summary>
+        /// 置顶状态
+        /// </summary>
+        public bool ToppingStatus;
+
+        /// <summary>
+        /// 锁定状态
+        /// </summary>
+        public bool LockingStatus;
+
+        /// <summary>
+        /// 图片名
+        /// </summary>
+        public string PictureName;
+
+        /// <summary>
+        /// 照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
+        /// </summary>
+        public string PictureTempUrl;
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/VO/PoemPhotoData.cs.meta

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnBack.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographSaveUI.cs

@@ -9,11 +9,12 @@ namespace UI.DressUp
         public GComponent target;
         public GImage m_imgRes;
         public GImage m_imgBorder;
+        public GButton m_btnClose;
         public GButton m_btnSave;
         public GButton m_btnShare;
         public GButton m_btnShareWX;
         public GButton m_btnShareWB;
-        public GButton m_btnClose;
+        public GButton m_btnSavePhoto;
         public const string URL = "ui://mbo439wbi3ix58";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PhotographSaveUI";
@@ -63,21 +64,23 @@ namespace UI.DressUp
         {
             m_imgRes = (GImage)comp.GetChild("imgRes");
             m_imgBorder = (GImage)comp.GetChild("imgBorder");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnSave = (GButton)comp.GetChild("btnSave");
             m_btnShare = (GButton)comp.GetChild("btnShare");
             m_btnShareWX = (GButton)comp.GetChild("btnShareWX");
             m_btnShareWB = (GButton)comp.GetChild("btnShareWB");
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_btnSavePhoto = (GButton)comp.GetChild("btnSavePhoto");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_imgRes = null;
             m_imgBorder = null;
+            m_btnClose = null;
             m_btnSave = null;
             m_btnShare = null;
             m_btnShareWX = null;
             m_btnShareWB = null;
-            m_btnClose = null;
+            m_btnSavePhoto = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button1.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_Button1
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://iyz778gkv4826";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button2.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_Button2
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://iyz778gkv4827";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_Button7.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_Button7
+    {
+        public GButton target;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://iyz778gkuyux103";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "Button7";
+        private static UI_Button7 _proxy;
+
+        public static UI_Button7 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button7();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button7 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button7();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComIcon.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_ComIcon
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://iyz778gkuyux101";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComIcon";
+        private static UI_ComIcon _proxy;
+
+        public static UI_ComIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon();
+            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_ComIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon();
+            }
+            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_ComIcon.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPhoto.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_ComPhoto
+    {
+        public GComponent target;
+        public GLoader m_loaPhoto;
+        public const string URL = "ui://iyz778gkuyux105";
+        public const string PACKAGE_NAME = "Poem";
+        public const string RES_NAME = "ComPhoto";
+        private static UI_ComPhoto _proxy;
+
+        public static UI_ComPhoto Create(GObject gObject = null)
+        {
+            var ui = new UI_ComPhoto();
+            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_ComPhoto Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComPhoto();
+            }
+            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_loaPhoto = (GLoader)comp.GetChild("loaPhoto");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaPhoto = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -9,10 +9,11 @@ namespace UI.Poem
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public GLoader m_loaIcon;
-        public GButton m_btnLock;
-        public GButton m_btnUp;
+        public UI_ComIcon m_comIcon;
+        public UI_Button1 m_btnLock;
+        public UI_Button2 m_btnUp;
         public GTextField m_txtTime;
+        public GImage m_imgSelect;
         public const string URL = "ui://iyz778gkv4828";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ListPhotoItem";
@@ -62,19 +63,24 @@ namespace UI.Poem
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_btnLock = (GButton)comp.GetChild("btnLock");
-            m_btnUp = (GButton)comp.GetChild("btnUp");
+            m_comIcon = (UI_ComIcon)UI_ComIcon.Create(comp.GetChild("comIcon"));
+            m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
+            m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_imgSelect = (GImage)comp.GetChild("imgSelect");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_c2 = null;
-            m_loaIcon = null;
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_btnLock.Dispose();
             m_btnLock = null;
+            m_btnUp.Dispose();
             m_btnUp = null;
             m_txtTime = null;
+            m_imgSelect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,7 +7,7 @@ namespace UI.Poem
     public partial class UI_ListPhotoPreviewItem
     {
         public GComponent target;
-        public GLoader m_loaPhoto;
+        public UI_ComPhoto m_loaPhoto;
         public const string URL = "ui://iyz778gkv482b";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "ListPhotoPreviewItem";
@@ -55,10 +55,11 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
-            m_loaPhoto = (GLoader)comp.GetChild("loaPhoto");
+            m_loaPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("loaPhoto"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaPhoto.Dispose();
             m_loaPhoto = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,13 +7,12 @@ namespace UI.Poem
     public partial class UI_PoemPhotoPreviewUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GGraph m_grhBg;
         public GList m_list;
         public GButton m_btnLeft;
         public GButton m_btnRight;
-        public GButton m_btnLock;
-        public GButton m_btnUp;
+        public UI_Button1 m_btnLock;
+        public UI_Button2 m_btnUp;
         public GButton m_btnShare;
         public GTextField m_txtTime;
         public const string URL = "ui://iyz778gkv482a";
@@ -63,24 +62,24 @@ namespace UI.Poem
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_grhBg = (GGraph)comp.GetChild("grhBg");
             m_list = (GList)comp.GetChild("list");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
-            m_btnLock = (GButton)comp.GetChild("btnLock");
-            m_btnUp = (GButton)comp.GetChild("btnUp");
+            m_btnLock = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLock"));
+            m_btnUp = (UI_Button2)UI_Button2.Create(comp.GetChild("btnUp"));
             m_btnShare = (GButton)comp.GetChild("btnShare");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_btnback = null;
+            m_grhBg = null;
             m_list = null;
             m_btnLeft = null;
             m_btnRight = null;
+            m_btnLock.Dispose();
             m_btnLock = null;
+            m_btnUp.Dispose();
             m_btnUp = null;
             m_btnShare = null;
             m_txtTime = null;

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

@@ -8,13 +8,15 @@ namespace UI.Poem
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GLoader m_loaBg;
-        public GButton m_btnback;
         public GButton m_btnTab0;
         public GButton m_btnTab1;
         public GList m_list;
-        public GTextField m_txtCount;
+        public UI_Button7 m_btnConfirmDelete;
         public GButton m_btnDelete;
+        public GTextField m_txtCount;
+        public GButton m_btnback;
         public const string URL = "ui://iyz778gkv4825";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemPhotoUI";
@@ -63,24 +65,29 @@ namespace UI.Poem
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
             m_list = (GList)comp.GetChild("list");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnConfirmDelete = (UI_Button7)UI_Button7.Create(comp.GetChild("btnConfirmDelete"));
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnback = (GButton)comp.GetChild("btnback");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_loaBg = null;
-            m_btnback = null;
             m_btnTab0 = null;
             m_btnTab1 = null;
             m_list = null;
-            m_txtCount = null;
+            m_btnConfirmDelete.Dispose();
+            m_btnConfirmDelete = null;
             m_btnDelete = null;
+            m_txtCount = null;
+            m_btnback = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using ET;
+using GFGGame;
+
+
+namespace GFGGame
+{
+    public static class PoemPhotoSProxy
+    {
+        //获取玩家所有相册数据协议
+        public static async ETTask<bool> ReqAllPhotoInfos()
+        {
+            S2C_GetAllAlbumInfo response = null;
+            response = (S2C_GetAllAlbumInfo)await MessageHelper.SendToServer(new C2S_GetAllAlbumInfo());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取图片的临时上传地址协议
+        public static async ETTask<string[]> ReqTempPictureUrl(string pictureName)
+        {
+            S2C_GetTempPictureUrl response = null;
+            response = (S2C_GetTempPictureUrl)await MessageHelper.SendToServer(new C2S_GetTempPictureUrl() { PictureName = pictureName });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return new string[] { response.TempPictureUrl, response.PictureObjectPath };
+                }
+            }
+            return null;
+        }
+
+        //将图片上传到华为云
+        public static string PushToHWCloud(string signUrl, byte[] buffer)
+        {
+            // 使用PUT请求上传对象
+            HttpWebRequest webRequest = WebRequest.Create(signUrl) as HttpWebRequest;
+            webRequest.Method = "PUT";
+
+            webRequest.SendChunked = true;
+            webRequest.AllowWriteStreamBuffering = false;
+            using (Stream requestStream = webRequest.GetRequestStream())
+            {
+                requestStream.Write(buffer, 0, buffer.Length);
+            }
+
+
+            HttpWebResponse webResponse = null;
+            try
+            {
+                webResponse = webRequest.GetResponse() as HttpWebResponse;
+                return webResponse.StatusCode.ToString();
+            }
+            catch (WebException ex)
+            {
+                webResponse = ex.Response as HttpWebResponse;
+                return "";
+            }
+        }
+        //保存成功后，添加图片至相册
+        public static async ETTask<bool> ReqAddTophoto(string pictureObjectPath, int sourceType)
+        {
+            S2C_AddPicture response = null;
+            response = (S2C_AddPicture)await MessageHelper.SendToServer(new C2S_AddPicture() { PictureObjectPath = pictureObjectPath, SourceType = sourceType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PoemPhotoData photoData = new PoemPhotoData();
+                    photoData.PictureId = response.PictureInfo.PictureId;
+                    photoData.CreationTime = response.PictureInfo.CreationTime;
+                    photoData.ToppingTime = response.PictureInfo.ToppingTime;
+                    photoData.ToppingStatus = response.PictureInfo.ToppingStatus;
+                    photoData.LockingStatus = response.PictureInfo.LockingStatus;
+                    photoData.PictureName = response.PictureInfo.PictureName;
+                    photoData.PictureTempUrl = response.PictureInfo.PictureTempUrl;
+                    PoemPhotoDataManager.Instance.Add(photoData, sourceType);
+                    EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+        //批量删除玩家相册
+        public static async ETTask<bool> ReqRemovedPhoto(List<long> pictureIds, int sourceType)
+        {
+            S2C_RemovedPictures response = null;
+            response = (S2C_RemovedPictures)await MessageHelper.SendToServer(new C2S_RemovedPictures() { PictureIds = pictureIds });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PoemPhotoDataManager.Instance.Remove(response.PictureIds, sourceType);
+                    EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //修改图片锁定状态
+        public static async ETTask<bool> ReqChangeLockingState(long pictureId, bool state, int sourceType)
+        {
+            S2C_UpPictureLockingStatus response = null;
+            response = (S2C_UpPictureLockingStatus)await MessageHelper.SendToServer(new C2S_UpPictureLockingStatus() { PictureId = pictureId, Status = state });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PoemPhotoDataManager.Instance.ChangeLockingState(pictureId, state, sourceType);
+                    EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //修改图片置顶状态
+        public static async ETTask<bool> ReqChangeToppingState(long pictureId, bool state, int sourceType)
+        {
+            S2C_UpPictureToppingStatus response = null;
+            response = (S2C_UpPictureToppingStatus)await MessageHelper.SendToServer(new C2S_UpPictureToppingStatus() { PictureId = pictureId, Status = state });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+
+                    PoemPhotoDataManager.Instance.ChangeLockingState(pictureId, state, sourceType);
+                    EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+}

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

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

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

@@ -22,6 +22,7 @@ namespace GFGGame
 
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnSave.onClick.Add(this.OnClickBtnSave);
+            _ui.m_btnSavePhoto.onClick.Add(this.OnClickBtnSavePhoto);
         }
 
         protected override void OnShown()
@@ -54,8 +55,28 @@ namespace GFGGame
         private void OnClickBtnSave()
         {
             Texture2D tex = this.viewData as Texture2D;
+            byte[] bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
+            string fileName = "wsj" + TimeHelper.ServerNowSecs + ".jpg";
+
+            PhotographDataManager.Instance.SavePicturoToLocal(bytes, fileName);
+        }
+
+        private async void OnClickBtnSavePhoto()
+        {
+            Texture2D tex = this.viewData as Texture2D;
+            byte[] bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
+            string fileName = "wsj" + TimeHelper.ServerNowSecs + ".jpg";
+
+
+            string[] rsp = await PoemPhotoSProxy.ReqTempPictureUrl(fileName);
+            if (rsp == null) return;
+
+            string code = PoemPhotoSProxy.PushToHWCloud(rsp[0], bytes);
+            if (string.IsNullOrEmpty(code)) return;
+
+            PoemPhotoSProxy.ReqAddTophoto(rsp[1], (int)PictureSourceType.PersonalAlbum).Coroutine();
+
 
-            PoemPhotoDataManager.Instance.SavePicturoToLocal(tex);
         }
     }
 }

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

@@ -27,16 +27,15 @@ namespace GFGGame
             _ui = UI_PoemPhotoPreviewUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_grhBg.onClick.Add(OnBtnBackClick);
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
-            _ui.m_btnLock.onClick.Add(OnBtnLockClick);
-            _ui.m_btnUp.onClick.Add(OnBtnUpClick);
+            _ui.m_btnLock.target.onClick.Add(OnBtnLockClick);
+            _ui.m_btnUp.target.onClick.Add(OnBtnUpClick);
             _ui.m_btnShare.onClick.Add(OnBtnShareClick);
 
         }

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

@@ -91,21 +91,21 @@ namespace GFGGame
             int id = 0;
             item.m_c1.selectedIndex = _deleting ? 1 : 0;
             item.m_c2.selectedIndex = !_deleting || _listDelete.IndexOf(id) < 0 ? 0 : 1;
-            if (item.m_btnLock.data == null)
+            if (item.m_btnLock.target.data == null)
             {
-                item.m_btnLock.onClick.Add(OnBtnLockClick);
+                item.m_btnLock.target.onClick.Add(OnBtnLockClick);
             }
-            item.m_btnLock.data = id;
-            if (item.m_btnUp.data == null)
+            item.m_btnLock.target.data = id;
+            if (item.m_btnUp.target.data == null)
             {
-                item.m_btnUp.onClick.Add(OnBtnUpClick);
+                item.m_btnUp.target.onClick.Add(OnBtnUpClick);
             }
-            item.m_btnUp.data = id;
-            if (item.m_loaIcon.data == null)
+            item.m_btnUp.target.data = id;
+            if (item.m_comIcon.m_loaIcon.data == null)
             {
-                item.m_loaIcon.onClick.Add(OnLoaIconClick);
+                item.m_comIcon.m_loaIcon.onClick.Add(OnLoaIconClick);
             }
-            item.m_loaIcon.data = id;
+            item.m_comIcon.m_loaIcon.data = id;
             item.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }

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

@@ -27,7 +27,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_1");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_comphoto.target.onClick.Add(OnComPhotoClick);
@@ -41,6 +41,7 @@ namespace GFGGame
         {
             base.OnShown();
 
+            _ui.m_comphoto.m_c1.selectedIndex = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name) ? 1 : 0;
         }
 
         protected override void OnHide()