Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Card/CardFilterUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,938">
   <displayList>
-    <component id="n0_pq5x" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,938">
+    <component id="n0_pq5x" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,938">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n1_pq5x" name="n1" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="45,72" group="n4_pq5x">

FGUIProject/assets/Card/CardSkillUI.xml

@@ -2,7 +2,7 @@
 <component size="962,1032">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,-1" size="962,1032">
+    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-1" size="962,1032">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <image id="n4_rhha" name="n4" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="385,38" group="n6_rhha"/>

FGUIProject/assets/Card/CardUpUI.xml

@@ -2,7 +2,7 @@
 <component size="962,550">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n10_lc1j" name="n10" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,550"/>
+    <component id="n10_lc1j" name="n10" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,550"/>
     <image id="n11_lc1j" name="n11" src="lc1j8y" fileName="images/sj_xian.png" xy="26,79" group="n13_dhoa"/>
     <text id="n12_lc1j" name="txtTitle" xy="380,50" pivot="0.5,0" size="212,69" group="n13_dhoa" fontSize="52" color="#876e54" text="恭喜升级">
       <gearText controller="c1" pages="1" values="恭喜升星" default="恭喜升级"/>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeRuleUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,621">
   <displayList>
-    <component id="n0_qyr6" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="1,1" size="962,621"/>
+    <component id="n0_qyr6" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="1,1" size="962,621"/>
     <image id="n3_qyr6" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <text id="n1_qyr6" name="txtTitle" xy="335,44" size="292,64" fontSize="48" color="#9b7853" text="服装分解规则"/>
     <text id="n2_qyr6" name="txtRule" xy="71,158" size="804,46" fontSize="34" color="#aa865f" autoSize="height" text="分解多余的衣服可获得金币和分解材料1.2."/>

FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,998">
   <displayList>
-    <component id="n11_bd1c" name="n11" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,998"/>
+    <component id="n11_bd1c" name="n11" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,998"/>
     <text id="n12_bd1c" name="n12" xy="335,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
     <image id="n13_bd1c" name="n13" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <text id="n1_py5g" name="txtDiscribe" xy="80,179" size="254,56" fontSize="42" color="#9b7853" text="完成套装浆洗"/>

FGUIProject/assets/ClothingFoster/ClothingRewardUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1098">
   <displayList>
-    <component id="n3_bd1c" name="n3" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1098"/>
+    <component id="n3_bd1c" name="n3" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1098"/>
     <list id="n2_py5g" name="listReward" xy="43,162" size="875,899" overflow="scroll" lineGap="30" defaultItem="ui://uicwtr5bpy5gw" align="center">
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/ClothingropertyShowUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,621">
   <displayList>
-    <component id="n2_bd1c" name="n2" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,621"/>
+    <component id="n2_bd1c" name="n2" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,621"/>
     <text id="n3_bd1c" name="n3" xy="335,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
     <image id="n4_bd1c" name="n4" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <list id="n1_py5g" name="listPropertyShow" xy="3,166" size="956,409" layout="flow_vt" lineGap="20" colGap="30" defaultItem="ui://uicwtr5bpy5gv" align="center">

FGUIProject/assets/Common/AlertUI.xml

@@ -4,7 +4,7 @@
     <graph id="n6_a8jv" name="graphBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" xy="59,766" size="962,388" pkg="mgs5yrnj">
+    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" xy="59,766" size="962,388">
       <relation target="n5_l55o" sidePair="height-height"/>
     </component>
     <text id="n5_l55o" name="txtContent" xy="170,853" size="740,49" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="解锁后的照片可随意删除"/>

FGUIProject/assets/Common/components/ComBg.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,1157" overflow="hidden">
+  <displayList>
+    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="imgnew/tc_tydikua_1.png" xy="0,6"/>
+    <image id="n21_si5z" name="n21" src="si5ztie" fileName="imgnew/tc_tydikua_3.png" xy="0,0">
+      <relation target="" sidePair="top-top"/>
+    </image>
+    <image id="n22_si5z" name="n22" src="si5ztif" fileName="imgnew/tc_tydikua_52.png" xy="0,1143">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Common/package.xml

@@ -46,6 +46,10 @@
     <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
     <image id="v95qtjv" name="anniuty5.png" path="/imagesExport/"/>
     <image id="r9ritje" name="anniuty_1.png" path="/imagesExport/" exported="true"/>
+    <component id="si5ztih" name="ComBg.xml" path="/components/" exported="true"/>
+    <image id="r9ritjk" name="tc_tydikua_1.png" path="/components/" scale="9grid" scale9grid="240,281,480,562"/>
+    <image id="si5ztie" name="tc_tydikua_3.png" path="/components/"/>
+    <image id="si5ztif" name="tc_tydikua_52.png" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,717">
   <displayList>
-    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,717">
+    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,717">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <text id="n2_pjip" name="txtTitle" xy="118,56" size="726,66" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>

FGUIProject/assets/CommonGame/BuyConfirmUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,536">
   <displayList>
-    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,536"/>
     <text id="n3_ds62" name="txtNeed" xy="344,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
     <text id="n4_ds62" name="txtNum" xy="299,299" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买？">
       <relation target="n1_ds62" sidePair="bottom-top"/>

FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,536">
   <displayList>
-    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,536"/>
     <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" xy="747,131"/>
     <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="85,267" group="n21_ai2z"/>
     <loader id="n4_hinb" name="icon" xy="117,66" size="200,200" group="n21_ai2z" aspect="true"/>

FGUIProject/assets/CommonGame/BuyTipsUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,536">
   <displayList>
-    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,536"/>
     <text id="n3_ds62" name="txtNeed" xy="260,124" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
     <text id="n4_ds62" name="txtCost" xy="260,222" size="456,56" fontSize="42" color="#876e54" text="是否花费700鲛绡购买？"/>
     <loader id="n5_ds62" name="loaNeed" xy="559,114" size="74,74" aspect="true" url="ui://eg2y0ldply9g8m" fill="scaleFree">

FGUIProject/assets/CommonGame/DressUpItemTips.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,656">
   <displayList>
-    <component id="n0_d4iw" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,656"/>
+    <component id="n0_d4iw" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,656"/>
     <text id="n1_d4iw" name="txtName" xy="317,43" size="340,64" fontSize="48" color="#9b7853" align="center" autoClearText="true" text="物品名字几个字">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1137" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,1137" pkg="mgs5yrnj">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,1137" pkg="mk0fwx0x">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
     <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,15" group="n17_ohbx"/>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,970">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992" pkg="mgs5yrnj">
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992" pkg="mk0fwx0x">
       <relation target="" sidePair="height-height"/>
     </component>
     <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>

FGUIProject/assets/CommonGame/RewardPreviewUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,631">
   <displayList>
-    <component id="n1_kzte" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,631"/>
+    <component id="n1_kzte" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,631"/>
     <image id="n2_kzte" name="n2" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="230,32"/>
     <text id="n3_kzte" name="txtName" xy="326,32" pivot="0.5,0" size="284,74" fontSize="56" color="#8f6e30" text="活跃度奖励"/>
     <list id="n4_kzte" name="list" xy="17,200" size="902,225" layout="row" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://eg2y0ldpj48o98" align="center">

FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,783">
   <displayList>
-    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,783">
+    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,783">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="243,32"/>

FGUIProject/assets/CreateRole/CreateRoleUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,476" bgColor="#000000">
   <displayList>
-    <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,476"/>
+    <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,476"/>
     <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="114,112"/>
     <component id="n5_xt5s" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,304">
       <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>

FGUIProject/assets/DressUp/DressFilterUI.xml

@@ -2,7 +2,7 @@
 <component size="962,1092">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1092"/>
     <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="97,68" size="644,66"/>
     <text id="n16_ih75" name="txtInput" xy="147,74" size="437,49" fontSize="36" color="#b6a688" autoSize="none" text="" input="true" prompt="请输入搜索关键词"/>
     <component id="n2_ih75" name="btnSearch" src="ih753h" fileName="components/Button1.xml" xy="769,57"/>

FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,700">
   <displayList>
-    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,700"/>
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,700"/>
     <list id="n2_ohun" name="list" xy="129,203" size="717,223" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
     </list>

FGUIProject/assets/Field/FieldFightInfoUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,915">
   <displayList>
-    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,915"/>
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,915"/>
     <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="341,408"/>
     <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="58,500"/>
     <component id="n0_s20j" name="btnStop" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,726">

FGUIProject/assets/Field/FieldTaskUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="900,993" overflow="hidden">
   <displayList>
-    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="-31,0" size="962,993"/>
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="-31,0" size="962,993"/>
     <list id="n0_s20j" name="list" xy="111,218" size="740,701" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
       <item/>
       <item/>

FGUIProject/assets/Login/LoginInputUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,732">
   <displayList>
-    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,732"/>
+    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,732"/>
     <component id="n4_q08x" name="btnRegister" src="q08xj" fileName="components/ButtonRegister.xml" xy="803,668"/>
     <image id="n19_ozsv" name="n19" src="ozsv4z" fileName="images/dl_ziti_1.png" xy="0,-130"/>
     <image id="n17_ozsv" name="n17" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="90,124"/>

FGUIProject/assets/Login/RegisterUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1092">
   <displayList>
-    <component id="n29_ozsv" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <component id="n29_ozsv" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1092"/>
     <component id="n30_ozsv" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="292,853" size="380,105">
       <Button title="提交注册" titleColor="#ffffff" titleFontSize="42"/>
     </component>

FGUIProject/assets/Login/RegisterUIBackup.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1092">
   <displayList>
-    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1092"/>
     <component id="n4_q08x" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,967">
       <Button title="提交注册" titleColor="#ffffff" titleFontSize="42"/>
     </component>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -2,7 +2,7 @@
 <component size="962,1158">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1167"/>
+    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1167"/>
     <text id="n2_ga16" name="txtTitle" xy="118,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
     <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,145"/>
     <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="190,181" group="n10_dhoa"/>

FGUIProject/assets/Mail/MailContentUI.xml

@@ -2,7 +2,7 @@
 <component size="962,1225">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,93" size="962,1130"/>
+    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,93" size="962,1130"/>
     <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,0"/>
     <image id="n2_ehs9" name="n2" src="ehs98" fileName="images/yx_btzi_2.png" xy="16,-26"/>
     <image id="n3_ehs9" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,231"/>

FGUIProject/assets/Mail/MailUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1225">
   <displayList>
-    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,93" size="962,1130"/>
+    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,93" size="962,1130"/>
     <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="20,0"/>
     <image id="n2_ehs9" name="n2" src="ehs92" fileName="images/yx_btzi_1.png" xy="3,-26"/>
     <list id="n7_ehs9" name="list" xy="46,164" size="874,859" overflow="scroll" lineGap="27" defaultItem="ui://y44a413eehs9d">

FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -2,7 +2,7 @@
 <component size="962,695">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_10not" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,695"/>
+    <component id="n0_10not" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,695"/>
     <image id="n18_iftf" name="n18" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="243,32"/>
     <text id="n1_10not" name="txtName" xy="367,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
     <loader id="n2_10not" name="loaIcon" xy="44,159" pivot="0.5,0.5" size="250,250" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>

FGUIProject/assets/RechargeStore/ItemExchangeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,695">
   <displayList>
-    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,695"/>
+    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,695"/>
     <text id="n5_hinb" name="txtName" xy="426,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
     <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="64,148" group="n21_ai2z"/>
     <loader id="n4_hinb" name="icon" xy="73,158" size="200,200" group="n21_ai2z" aspect="true"/>

FGUIProject/assets/RoleInfo/PersonalSkillUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1087">
   <displayList>
-    <component id="n4_r9ri" name="n4" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1087"/>
+    <component id="n4_r9ri" name="n4" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1087"/>
     <list id="n0_r9ri" name="list" xy="59,212" size="843,785" lineGap="90" defaultItem="ui://374k3dwvr9ri5" autoClearItems="true">
       <item/>
       <item/>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,574">
   <displayList>
-    <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,574"/>
+    <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,574"/>
     <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="113,364"/>
     <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="553,364"/>

FGUIProject/assets/poem/componentsGallery/ComGetReward.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,703">
   <displayList>
-    <component id="n7_r9ri" name="n7" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,703"/>
+    <component id="n7_r9ri" name="n7" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,703"/>
     <text id="n3_r9ri" name="n3" xy="329,60" size="232,61" group="n4_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#8a7253" text="上期排名："/>
     <text id="n8_r9ri" name="txtRank" xy="569,60" size="64,61" group="n4_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#cf7e78" text="666"/>
     <group id="n4_r9ri" name="n4" xy="329,60" size="304,61" advanced="true">

FGUIProject/assets/poem/componentsGallery/ListRankItem.xml

@@ -2,7 +2,7 @@
 <component size="996,1269" overflow="hidden">
   <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <loader id="n3_r9ri" name="loaIcon" xy="1,0" pivot="0.5,0.5" size="994,1174" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth">
+    <loader id="n3_r9ri" name="loaIcon" xy="1,0" pivot="0.5,0.5" size="994,1420" url="ui://iyz778gkr9ri132" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="height-height"/>
     </loader>
     <image id="n11_r9ri" name="n11" src="r9ri120" fileName="imagesGallery/hl_phb_b_1.png" xy="34,4">
@@ -36,7 +36,7 @@
     <text id="n7_r9ri" name="txtRank" xy="78,47" pivot="0.5,0" size="36,71" font="ui://eg2y0ldpwonotj9" fontSize="54" color="#fdf4e6" strokeColor="#d4b06b" strokeSize="2" text="2">
       <gearDisplay controller="c1" pages="3"/>
     </text>
-    <text id="n4_r9ri" name="txtName" xy="37,1193" size="211,41" group="n14_r9ri" fontSize="30" color="#ac806f" text="名字名字名字啊"/>
+    <text id="n4_r9ri" name="txtName" xy="37,1193" size="182,41" group="n14_r9ri" fontSize="30" color="#ac806f" text="名字名字名字啊"/>
     <component id="n5_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="740,1201" size="32,30" group="n14_r9ri">
       <Button title="5000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>

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

@@ -213,19 +213,35 @@ namespace GFGGame
 
         public string GetThemeTime()
         {
+            // int week = GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1 == 0 ? 7 : GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1;
             long monday00 = TimeUtil.GetCurWeekTime(1);//本周一0点
             long monday = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);//本周结算时间
             long startTime = 0;
             long endTime = 0;
+
             if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
                 startTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);
-                endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1);
+                if (GlobalCfgArray.globalCfg.galleryClearingWeekTime == 1)
+                {
+                    endTime = TimeUtil.GetLastWeekTime(7);
+                }
+                else
+                {
+                    endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1);
+                }
             }
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                if (GlobalCfgArray.globalCfg.galleryClearingWeekTime == 1)
+                {
+                    endTime = TimeUtil.GetCurWeekTime(7);
+                }
+                else
+                {
+                    endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                }
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -91,7 +91,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_NAME, UpdateRoleName);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateList);
         }
         private void UpdateRoleName()
         {