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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/CommonGame/components/BtnStyle000.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="204,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesExport/lm_an__xuanzhong_qifu.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="o9gh4l" fileName="imagesNew/lm_an__weixuan_qifu.png" xy="0,0" size="204,63">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="204,63" fontSize="34" color="#685539" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <gearColor controller="c1" pages="1" values="#685539,#000000" default="#744d16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="129,46">
+<component size="114,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
+  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
+    <remark page="0" value="默认"/>
+  </controller>
   <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="60,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="129,50" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+      <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
+    </text>
+    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="28,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComItemNew1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="qik1tlz" fileName="components/ComItemIconNew1.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="90,206" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,145" size="131,33" group="n28_qik1"/>
+    <text id="n15_ehs9" name="txtCount" xy="89,138" pivot="0.5,0" anchor="true" size="97,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="24,138" size="131,44"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -291,7 +291,7 @@
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
     <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
@@ -301,6 +301,11 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
+    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/"/>
+    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
+    <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
+    <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1865">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="376,324" pivot="0,0.5" anchor="true">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
+    <text id="n2_qik1" name="txtMonth" xy="47,254" pivot="1,1" size="148,94" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
+      <gearFontSize controller="c1" pages="0" values="72" default="50"/>
+    </text>
+    <text id="n4_qik1" name="txtSignCount" xy="346,325" pivot="0.5,0" size="43,54" fontSize="40" color="#643323" text="30"/>
+    <list id="n5_qik1" name="list" xy="60,455" size="967,1276" layout="flow_hz" lineGap="2" colGap="2" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,837" opaque="false">
+  <displayList>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
+    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n27_fqor" 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"/>
@@ -11,63 +10,12 @@
     <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <image id="n2_fqor" name="n2" src="fqor2" fileName="imagesTest/wpbb_xtxt.png" xy="54,312" group="n3_fqor"/>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,229"/>
-    <component id="n4_fqor" name="n4" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="43,347" group="n7_fqor">
-      <Button checked="true" title="每日签到" controller="c1" page="0"/>
+    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
+    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+      <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="n5" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="333,347" group="n7_fqor">
-      <Button title="每日补给" controller="c1" page="1"/>
+    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+      <Button title="每日补给"/>
     </component>
-    <component id="n6_fqor" name="n6" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="623,347" group="n7_fqor">
-      <Button title="分享好礼" controller="c1" page="2"/>
-    </component>
-    <group id="n7_fqor" name="n7" xy="43,347" size="870,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n8_fqor" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="115,569" pivot="0,0.5" anchor="true" group="n21_fqor">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <text id="n9_fqor" name="txtSignCount" xy="53,448" pivot="0.5,0" size="20,41" group="n21_fqor" fontSize="30" text="1"/>
-    <list id="n20_fqor" name="list" xy="53,660" size="974,1232" group="n21_fqor" layout="flow_hz" lineGap="30" colGap="60" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n21_fqor" name="n21" xy="53,448" size="974,1444" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <component id="n22_fqor" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="242,827" group="n26_fqor"/>
-    <component id="n25_fqor" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="554,828" group="n26_fqor"/>
-    <group id="n26_fqor" name="n26" xy="242,827" size="534,354" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,328" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,-112" size="1080,1697">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="479,207" size="122,0" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="81,200" pivot="0.5,0.5" anchor="true">
+<component size="80,140" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <text id="n12_fqor" name="txtDay" xy="41,0" pivot="0.5,0" anchor="true" size="40,42" group="n13_fqor" fontSize="30" align="center" text=""/>
-    <loader id="n14_fqor" name="loaIcon" xy="0,114" pivot="0.5,0.5" size="80,80" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
-    <text id="n15_fqor" name="txtCount" xy="26,157" pivot="1,0" size="53,42" group="n13_fqor" fontSize="30" align="right" autoClearText="true" text="000"/>
-    <group id="n13_fqor" name="n13" xy="0,0" size="80,199"/>
+    <image id="n18_qik1" name="n18" src="qik1g" fileName="images/qrhd_jd_fgx1.png" xy="33,76" group="n13_fqor"/>
+    <image id="n16_qik1" name="n16" src="qik1f" fileName="images/mrrw_jl_db.png" xy="0,0" group="n13_fqor"/>
+    <loader id="n14_fqor" name="loaIcon" xy="11,12" pivot="0.5,0.5" size="58,58" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
+    <image id="n17_qik1" name="n17" src="qik1d" fileName="images/mrqd_sz_db.png" xy="34,57" group="n13_fqor"/>
+    <text id="n15_fqor" name="txtCount" xy="35,46" pivot="0.5,0" size="45,39" group="n13_fqor" fontSize="28" color="#ffffff" align="center" autoClearText="true" text="000"/>
+    <text id="n12_fqor" name="txtDay" xy="39,103" pivot="0.5,0" anchor="true" size="35,44" group="n13_fqor" fontSize="32" color="#643323" align="center" text="30"/>
+    <image id="n19_qik1" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="-19,20" pivot="0.5,0" group="n13_fqor" scale="0.7,0.7"/>
+    <group id="n13_fqor" name="n13" xy="-19,0" size="119,147"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,422">
+<component size="378,643" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <text id="n25_fqor" name="txtTime" xy="91,5" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
-    <component id="n22_fqor" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,65" size="222,225"/>
-    <component id="n23_fqor" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="17,295">
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
       <Button title="补领"/>
     </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="46,372" pivot="0.5,0" controller="c1,1"/>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="178,122">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+<component size="155,200">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="35,0" size="117,28" group="n20_fqor" autoSize="true">
-      <gearIcon controller="c1" pages="0,2" values="|ui://t8nwuj7ifqorb" default="ui://t8nwuj7ifqorc"/>
+    <image id="n23_qik1" name="n23" src="qik1j" fileName="images/yqd_mr_db.png" xy="-2,0" group="n20_fqor"/>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" url="ui://t8nwuj7iqik1h" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
-    <loader id="n14_fqor" name="loaIcon" xy="24,29" pivot="0.5,0.5" size="92,92" group="n20_fqor" aspect="true" fill="scale"/>
-    <text id="n17_fqor" name="txtCount" xy="121,77" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <text id="n16_fqor" name="txtDay" xy="121,30" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <image id="n18_fqor" name="imgGot" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,60" size="144,32" group="n20_fqor"/>
-    <image id="n19_fqor" name="imgNotGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,56" size="178,40" group="n20_fqor"/>
-    <group id="n20_fqor" name="n20" xy="0,0" size="178,121"/>
+    <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
+    <text id="n16_fqor" name="txtDay" xy="33,-3" pivot="0.5,0" size="88,39" group="n20_fqor" fontSize="28" color="#8a4e4e" text="三十一"/>
+    <image id="n22_qik1" name="imgMask" src="qik1e" fileName="images/mrqd_zz.png" xy="-2,0" size="159,205" group="n20_fqor"/>
+    <image id="n18_fqor" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="17,64" group="n20_fqor"/>
+    <image id="n19_fqor" name="imgNotGet" src="qik1o" fileName="images/mrqd_kbq.png" xy="-8,45" group="n20_fqor"/>
+    <group id="n20_fqor" name="grpItem" xy="-8,-3" size="205,208" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="850,139" extention="ProgressBar">
+<component size="620,140" extention="ProgressBar">
   <displayList>
-    <image id="n0_fqor" name="n0" src="fqor6" fileName="images/pro_bk_in.png" xy="-36,0">
+    <image id="n0_fqor" name="n0" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_fqor" name="bar" src="fqor5" fileName="images/pro_activate.png" xy="0,4" fillMethod="hz"/>
-    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="0,25" group="n7_fqor"/>
-    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="121,25" group="n7_fqor"/>
-    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="242,25" group="n7_fqor"/>
-    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="363,25" group="n7_fqor"/>
-    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="484,25" group="n7_fqor"/>
-    <group id="n7_fqor" name="n7" xy="-40,-75" size="565,200" advanced="true"/>
+    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,100" fillMethod="hz"/>
+    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
+    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
+    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
+    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
+    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -2,16 +2,35 @@
 <packageDescription id="t8nwuj7i">
   <resources>
     <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
-    <image id="fqor1" name="wpbb_zi.png" path="/imagesTest/"/>
-    <image id="fqor2" name="wpbb_xtxt.png" path="/imagesTest/"/>
-    <image id="fqor5" name="pro_activate.png" path="/imagesTest/"/>
-    <image id="fqor6" name="pro_bk_in.png" path="/imagesTest/"/>
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
     <component id="fqora" name="ComSupply.xml" path="/components/"/>
-    <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
-    <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
+    <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
+    <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
+    <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
+    <image id="qik1g" name="qrhd_jd_fgx1.png" path="/images/"/>
+    <image id="qik1h" name="wz_hjksb.png" path="/images/"/>
+    <image id="qik1i" name="wz_yqd.png" path="/images/"/>
+    <image id="qik1j" name="yqd_mr_db.png" path="/images/"/>
+    <image id="qik1k" name="yz_yhd.png" path="/images/"/>
+    <image id="qik1l" name="mrqd_db.png" path="/images/" scale="9grid" scale9grid="270,453,540,1372"/>
+    <image id="qik1m" name="mrqd_jdt_db.png" path="/images/"/>
+    <image id="qik1n" name="mrqd_jdt_yellow.png" path="/images/"/>
+    <image id="qik1o" name="mrqd_kbq.png" path="/images/"/>
+    <component id="qik1q" name="DailySignUI.xml" path="/" exported="true"/>
+    <image id="qik1r" name="txz_lvl_db.png" path="/images/"/>
+    <image id="qik1s" name="wz_jksb.png" path="/images/"/>
+    <component id="qik1t" name="DailySupplyUI.xml" path="/" exported="true"/>
+    <component id="qik1u" name="Button1.xml" path="/components/"/>
+    <image id="qik1v" name="wz_mrbj_ms.png" path="/images/"/>
+    <image id="qik1w" name="mrbj_shu.png" path="/images/"/>
+    <image id="qik1x" name="mrbj_sj_db.png" path="/images/"/>
+    <image id="qik1y" name="mrbj_sz_db.png" path="/images/"/>
+    <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
+    <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
+    <image id="qik111" name="wz_mrbj.png" path="/images/"/>
+    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -4,9 +4,7 @@
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
-    <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
+    <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">
       <item/>
       <item/>
       <item/>
@@ -17,5 +15,7 @@
     <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
+    <component id="n61_qik1" name="btnLeft" src="qik1tbz" fileName="components/Button8.xml" xy="20,1130" pivot="0.5,0.5" scale="-1,1"/>
+    <component id="n62_qik1" name="btnRight" src="qik1tbz" fileName="components/Button8.xml" xy="965,1130" pivot="0.5,0.5"/>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <image id="n1_qik1" name="n1" src="hhx917" fileName="imagesNew/MonthCard_baseboard.png" xy="50,494">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="hhx918" fileName="imagesNew/MonthCard_bg.png" xy="90,552"/>
+    <component id="n41_qik1" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n3_qik1" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="919,564" size="52,52">
+      <Button icon="ui://p9mtgheofqortar"/>
+    </component>
+    <loader id="n33_qik1" name="loaCard" xy="190,612" size="592,340" url="ui://p9mtgheohhx91a" autoSize="true"/>
+    <text id="n4_qik1" name="txtTime" xy="759,570" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
+    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="127,1004" size="826,240"/>
+    <component id="n32_qik1" name="btnBuy" src="qik1tc2" fileName="components/Button10.xml" xy="415,864"/>
+    <text id="n6_qik1" name="txtTips" xy="149,954" pivot="0.5,0" size="781,36" fontSize="26" color="#8c8580" vars="true" text="购买/续费可获得{value=300}会员积分（剩余天数超过{day=300}天后无法继续续费）"/>
+    <text id="n7_qik1" name="n7" xy="296,1025" size="182,42" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
+    <loader id="n11_qik1" name="loaMoney" xy="513,1026" size="40,40" group="n15_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n13_qik1" name="n13" xy="554,1026" size="19,42" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n14_qik1" name="txtMoneyCount" xy="572,1025" size="47,42" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n15_qik1" name="n15" xy="513,1025" size="106,43" group="n10_qik1" advanced="true"/>
+    <text id="n20_qik1" name="n20" xy="654,1026" size="63,42" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="特权"/>
+    <text id="n17_qik1" name="n17" xy="717,1026" size="19,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n18_qik1" name="txtPrivilegeCount" xy="736,1025" size="47,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n19_qik1" name="n19" xy="654,1025" size="129,43" group="n10_qik1" advanced="true"/>
+    <group id="n10_qik1" name="n10" xy="296,1025" size="487,43" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <text id="n21_qik1" name="n21" xy="349,1080" size="241,42" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="金卡期间每天获得"/>
+    <loader id="n22_qik1" name="loaDailyMoney" xy="625,1081" size="40,40" group="n25_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n23_qik1" name="n23" xy="666,1081" size="19,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n24_qik1" name="txtDailyMoneyCount" xy="684,1080" size="47,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n25_qik1" name="n25" xy="625,1080" size="106,42" group="n30_qik1" advanced="true"/>
+    <group id="n30_qik1" name="n30" xy="349,1080" size="382,42" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <component id="n31_qik1" name="btnGet" src="qik1tc1" fileName="components/Button9.xml" xy="428,1145"/>
+    <image id="n34_qik1" name="n34" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="103,1281" pivot="0.5,0.5" group="n37_qik1" scale="-1,1"/>
+    <text id="n35_qik1" name="txtGiftBag" xy="474,1268" pivot="0.5,0" size="132,44" group="n37_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="特权礼包"/>
+    <image id="n36_qik1" name="n36" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="625,1281" pivot="0.5,0.5" group="n37_qik1"/>
+    <group id="n37_qik1" name="n37" xy="103,1268" size="874,44" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n38_qik1" name="list" xy="71,1338" size="920,510" layout="flow_hz" overflow="scroll" lineGap="20" colGap="10" defaultItem="ui://p9mtgheo10not1t">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n40_qik1" name="n40" src="qik1tc3" fileName="imagesNew/sc_yk_dbzz.png" xy="94,1742">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n39_qik1" name="n39" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Button1.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="298,152" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
-  <displayList>
-    <image id="n0_nz0t" name="n0" src="d4iwc" fileName="images/sc_yj_anniu_xz.png" xy="0,0" pkg="vlgobc15">
-      <gearDisplay controller="button" pages="1"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_nz0t" name="n1" xy="114,54" size="76,49" fontSize="36" color="#fff4cc" text="充值"/>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

FGUIProject/assets/Store/components/Button10.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="248,74" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n10_qik1" name="n10" src="hhx91d" fileName="imagesNew/bt_buy.png" xy="0,5"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="33,16" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="28,35" pivot="0.5,0" group="n7_l500">
+      <relation target="n5_l500" sidePair="width-width"/>
+    </image>
+    <group id="n7_l500" name="grpOriginalPrice" xy="28,16" size="60,44" group="n8_l500" advanced="true"/>
+    <text id="n4_l500" name="txtPrice" xy="90,10" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <text id="n9_l500" name="title" xy="135,9" size="84,54" group="n8_l500" fontSize="40" color="#5a3e16" align="center" text="购买"/>
+    <group id="n8_l500" name="n8" xy="28,9" size="191,55" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Store/components/Button2.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="258,70" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <loader id="n4_iftf" name="loaMascot" xy="3,-231" size="252,232" url="ui://p9mtgheoiftftac"/>
-    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://p9mtgheodmsi17" autoSize="true"/>
-  </displayList>
-  <Button mode="Radio"/>
-  <customProperty target="loaMascot" propertyId="1"/>
-</component>

FGUIProject/assets/Store/components/Button3.xml

@@ -8,14 +8,14 @@
     <image id="n2_fqor" name="n2" src="fqortaq" fileName="imagesNew/sc_tab_xuanzhong.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <loader id="n1_fqor" name="icon" xy="11,11" pivot="0.5,0.5" size="106,106" url="ui://p9mtgheofqortan" autoSize="true"/>
+    <loader id="n1_fqor" name="icon" xy="11,5" pivot="0.5,0.5" size="106,106" url="ui://p9mtgheofqortan" autoSize="true"/>
     <text id="n3_fqor" name="txt0" xy="-9,56" pivot="0.5,0" size="48,59" font="ui://eg2y0ldpa0cftks" fontSize="44" color="#be8c52" align="center" text="充">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
     <text id="n4_fqor" name="txt1" xy="31,89" pivot="0.5,0" size="36,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#be8c52" align="center" text="值">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
-    <text id="n5_l500" name="txt2" xy="9,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
+    <text id="n5_l500" name="txt2" xy="7,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
   </displayList>

FGUIProject/assets/Store/components/Button6.xml

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

FGUIProject/assets/Store/components/Button7.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="184,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,5,disable" selected="2"/>
+  <displayList>
+    <image id="n2_qik1" name="n2" src="hhx9o" fileName="imagesNew/bt_lock.png" xy="0,1">
+      <gearDisplay controller="button" pages="5"/>
+    </image>
+    <image id="n0_qik1" name="n0" src="hhx9m" fileName="imagesNew/bt_get.png" xy="0,1">
+      <gearDisplay controller="button" pages="0,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="184,56" fontSize="36" color="#7e6e56" align="center" vAlign="middle" autoSize="none" singleLine="true" text="已领取">
+      <gearColor controller="button" pages="0,5" values="#5a3e16,#000000|#7e6e56,#000000" default="#5a3e16,#000000"/>
+      <gearText controller="button" pages="5" values="已领取" default="领取"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Store/components/Button8.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,94" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qik1" src="hhx9l" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="94,94" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Button9.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="224,74" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="hhx91e" fileName="imagesNew/bt_get1.png" xy="0,3">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="224,74" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Store/components/ComTab.xml

@@ -2,26 +2,26 @@
 <component size="857,129" overflow="scroll" scroll="horizontal">
   <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
-    <component id="n9_fqor" name="n9" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
+    <component id="n9_fqor" name="btn0" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
     </component>
-    <component id="n10_fqor" name="n10" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
+    <component id="n10_fqor" name="btn1" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortak" selectedIcon="ui://p9mtgheofqortaj" controller="c1" page="2"/>
       <property target="txt0" propertyId="0" value="月"/>
       <property target="txt1" propertyId="0" value="卡"/>
     </component>
-    <component id="n11_fqor" name="n11" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
+    <component id="n11_fqor" name="btn2" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="3"/>
       <property target="txt0" propertyId="0" value="礼"/>
       <property target="txt1" propertyId="0" value="包"/>
     </component>
-    <component id="n12_fqor" name="n12" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
-      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="4"/>
+    <component id="n12_fqor" name="btn3" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheoqik1tc5" selectedIcon="ui://p9mtgheoqik1tc6" controller="c1" page="4"/>
       <property target="txt0" propertyId="0" value="兑"/>
       <property target="txt1" propertyId="0" value="换"/>
     </component>
-    <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
-      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="5"/>
+    <component id="n13_fqor" name="btn4" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheoqik1tc7" selectedIcon="ui://p9mtgheoqik1tc4" controller="c1" page="5"/>
       <property target="txt0" propertyId="0" value="花"/>
       <property target="txt1" propertyId="0" value="令"/>
       <property target="txt2" propertyId="0" value="飞"/>

FGUIProject/assets/Store/components/Component1.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="890,70">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <component id="n17_10not" name="btn0" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
-      <Button checked="true" icon="ui://p9mtgheodmsi17" selectedIcon="ui://p9mtgheodmsi16" controller="c1" page="0"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftaa"/>
-    </component>
-    <component id="n18_10not" name="btn1" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
-      <Button icon="ui://p9mtgheodmsi19" selectedIcon="ui://p9mtgheodmsi18" controller="c1" page="1"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftab"/>
-    </component>
-    <component id="n19_10not" name="btn2" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
-      <Button icon="ui://p9mtgheodmsi1b" selectedIcon="ui://p9mtgheodmsi1a" controller="c1" page="2"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftac"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Store/components/ListVipItem.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1050" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n35_qik1" name="n35" src="hhx9t" fileName="imagesNew/tz_baseboard.png" xy="116,29" group="n58_qik1"/>
+    <graph id="n37_qik1" name="holder" xy="348,461" size="1,1" group="n58_qik1" touchable="false">
+      <gearDisplay controller="button" pages="1"/>
+    </graph>
+    <component id="n38_qik1" name="btnShow" src="qik1tbv" fileName="components/Button6.xml" xy="101,0" group="n58_qik1"/>
+    <image id="n39_qik1" name="n39" src="hhx9u" fileName="imagesNew/tz_name_baseboard.png" xy="80,60" group="n45_qik1"/>
+    <text id="n40_qik1" name="txtName0" xy="100,70" pivot="0.5,0" size="56,69" group="n45_qik1" fontSize="52" color="#915e15" text="梦"/>
+    <text id="n41_qik1" name="txtName1" xy="119,120" pivot="0.5,0" size="38,46" group="n45_qik1" fontSize="34" color="#915e15" text="影"/>
+    <text id="n42_qik1" name="txtName2" xy="103,151" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="画"/>
+    <text id="n43_qik1" name="txtName3" xy="120,176" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="婵"/>
+    <text id="n44_qik1" name="txtName4" xy="116,203" pivot="0.5,0" size="41,122" group="n45_qik1" fontSize="36" color="#915e15" align="center" leading="-12" autoSize="none" text="婵娟"/>
+    <group id="n45_qik1" name="n45" xy="80,60" size="96,265" group="n58_qik1"/>
+    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,113" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
+    <text id="n48_qik1" name="txtGiftBag" xy="649,100" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
+    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,113" pivot="0.5,0.5" group="n49_qik1"/>
+    <group id="n49_qik1" name="n49" xy="582,100" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n50_qik1" name="listGiftBag" xy="574,161" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,445" group="n58_qik1"/>
+    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,565" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
+    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,552" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
+    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,565" pivot="0.5,0.5" group="n54_qik1"/>
+    <group id="n54_qik1" name="n54" xy="582,552" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n55_qik1" name="listWeekGiftBag" xy="574,619" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,906" group="n58_qik1"/>
+    <group id="n58_qik1" name="n58" xy="80,0" size="1095,1037"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Store/package.xml

@@ -2,9 +2,6 @@
 <packageDescription id="p9mtgheo">
   <resources>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
-    <component id="nz0t14" name="Button1.xml" path="/components/"/>
-    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
-    <component id="10not1s" name="Component1.xml" path="/components/"/>
     <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <component id="fqortb1" name="Button3.xml" path="/components/"/>
@@ -63,7 +60,7 @@
     <image id="fqortb6" name="sc_beijing_hua.png" path="/imagesNew/"/>
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
-    <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
+    <component id="10not1v" name="GiftBagBuyUI.xml" path="/"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -84,17 +81,15 @@
     <image id="hhx9g" name="VipLevel_Progress_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="22,4,44,8"/>
     <image id="hhx9h" name="font_VipLevel_8.png" path="/font/"/>
     <image id="hhx9i" name="font_VipLevel_9.png" path="/font/"/>
-    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="hhx9k" name="wp_baseboard-ornament.png" path="/imagesNew/"/>
     <image id="hhx9l" name="bt_cut.png" path="/imagesNew/"/>
     <image id="hhx9m" name="bt_get.png" path="/imagesNew/"/>
     <image id="hhx9n" name="bt_getted.png" path="/imagesNew/"/>
     <image id="hhx9o" name="bt_lock.png" path="/imagesNew/"/>
     <image id="hhx9p" name="bt_preview.png" path="/imagesNew/"/>
-    <image id="hhx9q" name="bt_to.png" path="/imagesNew/"/>
     <image id="hhx9r" name="ornament_title.png" path="/imagesNew/"/>
     <image id="hhx9s" name="red.png" path="/imagesNew/"/>
-    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/"/>
+    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="214,468,428,101"/>
     <image id="hhx9u" name="tz_name_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9v" name="font_save_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9w" name="GiftBag_baseboard.png" path="/imagesNew/"/>
@@ -108,10 +103,10 @@
     <image id="hhx914" name="font_save_7.png" path="/font/"/>
     <image id="hhx915" name="font_save_8.png" path="/font/"/>
     <image id="hhx916" name="font_save_9.png" path="/font/"/>
-    <image id="hhx917" name="MonthCard_baseboard.png" path="/imagesNew/"/>
+    <image id="hhx917" name="MonthCard_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="243,346,486,692"/>
     <image id="hhx918" name="MonthCard_bg.png" path="/imagesNew/"/>
-    <image id="hhx919" name="MonthCard_Devide_baseboard.png" path="/imagesNew/"/>
-    <image id="hhx91a" name="MonthCard_Icon.png" path="/imagesNew/"/>
+    <image id="hhx919" name="MonthCard_Devide_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="25,25,50,50"/>
+    <image id="hhx91a" name="MonthCard_Icon.png" path="/imagesNew/" exported="true"/>
     <image id="hhx91b" name="MonthCard_unopen.png" path="/imagesNew/"/>
     <image id="hhx91c" name="ornamental_title.png" path="/imagesNew/"/>
     <image id="hhx91d" name="bt_buy.png" path="/imagesNew/"/>
@@ -140,6 +135,19 @@
     <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
     <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
+    <component id="qik1tbv" name="Button6.xml" path="/components/"/>
+    <component id="qik1tbw" name="Button7.xml" path="/components/"/>
+    <image id="qik1tbx" name="bt_to.png" path="/imagesNew/"/>
+    <component id="qik1tby" name="ListVipItem.xml" path="/components/"/>
+    <component id="qik1tbz" name="Button8.xml" path="/components/"/>
+    <component id="qik1tc0" name="StoreMonthUI.xml" path="/" exported="true"/>
+    <component id="qik1tc1" name="Button9.xml" path="/components/"/>
+    <component id="qik1tc2" name="Button10.xml" path="/components/"/>
+    <image id="qik1tc3" name="sc_yk_dbzz.png" path="/imagesNew/"/>
+    <image id="qik1tc4" name="sc_tab_feihualing_xuanzhong.png" path="/imagesNew/"/>
+    <image id="qik1tc5" name="sc_tab_duihuan.png" path="/imagesNew/"/>
+    <image id="qik1tc6" name="sc_tab_duihuan_xuanzhong.png" path="/imagesNew/"/>
+    <image id="qik1tc7" name="sc_tab_feihualing.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -5,7 +5,7 @@ namespace GFGGame
         public const int STORE_CHARGE = 0;//充值
         public const int STORE_CHARGE_ADDUP = 1;//累计充值
         public const int STORE_MONTH_GLOAD_CARD = 0;//金卡
-        public const int STORE_MONTH_BLACK_CARD = 0;//黑金卡
+        public const int STORE_MONTH_BLACK_CARD = 1;//黑金卡
         public const int STORE_GIFT_BAG_ACTIVITY = 0;//活动
         public const int STORE_GIFT_BAG_TIME_LIMIT = 1;//限时活动
         public const int STORE_GIFT_BAG_GREATEST = 2;//精选

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -301,5 +302,19 @@ namespace GFGGame
             int costNeed = fosterCfg.costNum;
             return itemHas >= itemNeed && costHas >= costNeed;
         }
+
+        //商店-会员中心
+        public bool GetChargeAddUpReward()
+        {
+            VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
+
+            for (int i = 1; i < vipCfgs.Length; i++)
+            {
+                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
+                bool isWeekGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus), vipCfgs[i].id);
+                if ((!isGet || isWeekGet) && RoleDataManager.vipLv >= vipCfgs[i].id) return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -370,7 +370,7 @@ namespace GFGGame
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
-                    lockValue = isDown ? Math.Min(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
+                    lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(lockValue);
 

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

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_style;
         public GLoader m_loaIcon;
         public GTextField m_txtNeed;
         public const string URL = "ui://eg2y0ldpn3xha1";
@@ -58,12 +59,14 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_style = comp.GetController("style");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_style = null;
             m_loaIcon = null;
             m_txtNeed = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemIconNew1
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpqik1tlz";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemIconNew1";
+        private static UI_ComItemIconNew1 _proxy;
+
+        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemIconNew1();
+            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_ComItemIconNew1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemIconNew1();
+            }
+            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");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2b93631e0f2f8ce47a5cfcde3f6418fc
+guid: 16d2b13e4f388e443a4aa699fa6fea84
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemNew1
+    {
+        public GComponent target;
+        public UI_ComItemIconNew1 m_comItemIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtCount;
+        public const string URL = "ui://eg2y0ldpqik1tly";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemNew1";
+        private static UI_ComItemNew1 _proxy;
+
+        public static UI_ComItemNew1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemNew1();
+            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_ComItemNew1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemNew1();
+            }
+            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_comItemIcon = (UI_ComItemIconNew1)UI_ComItemIconNew1.Create(comp.GetChild("comItemIcon"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtName = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus.cs

@@ -7,9 +7,10 @@ namespace UI.DailyWelfare
     public partial class UI_ComProBonus
     {
         public GComponent target;
-        public GTextField m_txtDay;
         public GLoader m_loaIcon;
         public GTextField m_txtCount;
+        public GTextField m_txtDay;
+        public GImage m_imgGot;
         public const string URL = "ui://t8nwuj7ifqor8";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComProBonus";
@@ -57,15 +58,17 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_txtDay = (GTextField)comp.GetChild("txtDay");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtDay = null;
             m_loaIcon = null;
             m_txtCount = null;
+            m_txtDay = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComSupply.cs

@@ -7,10 +7,11 @@ namespace UI.DailyWelfare
     public partial class UI_ComSupply
     {
         public GComponent target;
+        public Controller m_c1;
         public GTextField m_txtTime;
-        public GComponent m_comItem;
         public GButton m_btnGet;
         public GComponent m_comCost;
+        public GTextField m_txtCount;
         public const string URL = "ui://t8nwuj7ifqora";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComSupply";
@@ -58,17 +59,19 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_comItem = (GComponent)comp.GetChild("comItem");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_comCost = (GComponent)comp.GetChild("comCost");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_txtTime = null;
-            m_comItem = null;
             m_btnGet = null;
             m_comCost = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySignUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_ProgressBar1 m_proSign;
+        public GTextField m_txtMonth;
+        public GTextField m_txtSignCount;
+        public GList m_list;
+        public GButton m_btnClose;
+        public const string URL = "ui://t8nwuj7iqik1q";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySignUI";
+        private static UI_DailySignUI _proxy;
+
+        public static UI_DailySignUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySignUI();
+            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_DailySignUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySignUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_txtMonth = (GTextField)comp.GetChild("txtMonth");
+            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
+            m_list = (GList)comp.GetChild("list");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_proSign.Dispose();
+            m_proSign = null;
+            m_txtMonth = null;
+            m_txtSignCount = null;
+            m_list = null;
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs

@@ -0,0 +1,79 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySupplyUI
+    {
+        public GComponent target;
+        public UI_ComSupply m_comSupply0;
+        public UI_ComSupply m_comSupply1;
+        public GTextField m_txtGiftBag;
+        public const string URL = "ui://t8nwuj7iqik1t";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySupplyUI";
+        private static UI_DailySupplyUI _proxy;
+
+        public static UI_DailySupplyUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySupplyUI();
+            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_DailySupplyUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySupplyUI();
+            }
+            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_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
+            m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comSupply0.Dispose();
+            m_comSupply0 = null;
+            m_comSupply1.Dispose();
+            m_comSupply1 = null;
+            m_txtGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySupplyUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailyWelfareUI.cs

@@ -7,15 +7,11 @@ namespace UI.DailyWelfare
     public partial class UI_DailyWelfareUI
     {
         public GComponent target;
-        public Controller m_c1;
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnback;
-        public UI_ProgressBar1 m_proSign;
-        public GTextField m_txtSignCount;
-        public GList m_list;
-        public UI_ComSupply m_comSupply0;
-        public UI_ComSupply m_comSupply1;
+        public GButton m_btnSign;
+        public GButton m_btnSupply;
         public const string URL = "ui://t8nwuj7ifqor0";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailyWelfareUI";
@@ -63,30 +59,19 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
-            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
-            m_list = (GList)comp.GetChild("list");
-            m_comSupply0 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply0"));
-            m_comSupply1 = (UI_ComSupply)UI_ComSupply.Create(comp.GetChild("comSupply1"));
+            m_btnSign = (GButton)comp.GetChild("btnSign");
+            m_btnSupply = (GButton)comp.GetChild("btnSupply");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_loaBg = null;
             m_comValueBar = null;
             m_btnback = null;
-            m_proSign.Dispose();
-            m_proSign = null;
-            m_txtSignCount = null;
-            m_list = null;
-            m_comSupply0.Dispose();
-            m_comSupply0 = null;
-            m_comSupply1.Dispose();
-            m_comSupply1 = null;
+            m_btnSign = null;
+            m_btnSupply = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs

@@ -9,11 +9,12 @@ namespace UI.DailyWelfare
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaDoubleTag;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
+        public GComponent m_comItem;
         public GTextField m_txtDay;
+        public GImage m_imgMask;
         public GImage m_imgGot;
         public GImage m_imgNotGet;
+        public GGroup m_grpItem;
         public const string URL = "ui://t8nwuj7ifqor9";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ListSignItem";
@@ -63,21 +64,23 @@ namespace UI.DailyWelfare
         {
             m_c1 = comp.GetController("c1");
             m_loaDoubleTag = (GLoader)comp.GetChild("loaDoubleTag");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comItem = (GComponent)comp.GetChild("comItem");
             m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_imgMask = (GImage)comp.GetChild("imgMask");
             m_imgGot = (GImage)comp.GetChild("imgGot");
             m_imgNotGet = (GImage)comp.GetChild("imgNotGet");
+            m_grpItem = (GGroup)comp.GetChild("grpItem");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaDoubleTag = null;
-            m_loaIcon = null;
-            m_txtCount = null;
+            m_comItem = null;
             m_txtDay = null;
+            m_imgMask = null;
             m_imgGot = null;
             m_imgNotGet = null;
+            m_grpItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button10.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button10
+    {
+        public GButton target;
+        public GTextField m_txtOriginalPrice;
+        public GGroup m_grpOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://p9mtgheoqik1tc2";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button10";
+        private static UI_Button10 _proxy;
+
+        public static UI_Button10 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button10();
+            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_Button10 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button10();
+            }
+            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_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtOriginalPrice = null;
+            m_grpOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button10.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComTab.cs

@@ -8,6 +8,11 @@ namespace UI.Store
     {
         public GComponent target;
         public Controller m_c1;
+        public UI_Button3 m_btn0;
+        public UI_Button3 m_btn1;
+        public UI_Button3 m_btn2;
+        public UI_Button3 m_btn3;
+        public UI_Button3 m_btn4;
         public const string URL = "ui://p9mtgheofqortb5";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComTab";
@@ -56,10 +61,25 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btn0 = (UI_Button3)UI_Button3.Create(comp.GetChild("btn0"));
+            m_btn1 = (UI_Button3)UI_Button3.Create(comp.GetChild("btn1"));
+            m_btn2 = (UI_Button3)UI_Button3.Create(comp.GetChild("btn2"));
+            m_btn3 = (UI_Button3)UI_Button3.Create(comp.GetChild("btn3"));
+            m_btn4 = (UI_Button3)UI_Button3.Create(comp.GetChild("btn4"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btn0.Dispose();
+            m_btn0 = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btn2.Dispose();
+            m_btn2 = null;
+            m_btn3.Dispose();
+            m_btn3 = null;
+            m_btn4.Dispose();
+            m_btn4 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagBuyUI.cs

@@ -1,116 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Store
-{
-    public partial class UI_GiftBagBuyUI
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GComponent m_bg;
-        public GTextField m_txtName;
-        public GLoader m_loaIcon;
-        public GTextField m_txtLimit;
-        public GList m_list;
-        public GTextField m_txtEndTime;
-        public GGroup m_grpEndTime;
-        public GButton m_btnBuy;
-        public GTextField m_txtLock;
-        public GLoader m_loaPriceIcon;
-        public GTextField m_txtIcon;
-        public GGroup m_grpIcon;
-        public GTextField m_txtOriginalPrice;
-        public GTextField m_txtPrice;
-        public GGroup m_grpOriginalPrice;
-        public const string URL = "ui://p9mtgheo10not1v";
-        public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "GiftBagBuyUI";
-        private static UI_GiftBagBuyUI _proxy;
-
-        public static UI_GiftBagBuyUI Create(GObject gObject = null)
-        {
-            var ui = new UI_GiftBagBuyUI();
-            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_GiftBagBuyUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_GiftBagBuyUI();
-            }
-            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_c1 = comp.GetController("c1");
-            m_bg = (GComponent)comp.GetChild("bg");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_list = (GList)comp.GetChild("list");
-            m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
-            m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
-            m_loaPriceIcon = (GLoader)comp.GetChild("loaPriceIcon");
-            m_txtIcon = (GTextField)comp.GetChild("txtIcon");
-            m_grpIcon = (GGroup)comp.GetChild("grpIcon");
-            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
-            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_bg = null;
-            m_txtName = null;
-            m_loaIcon = null;
-            m_txtLimit = null;
-            m_list = null;
-            m_txtEndTime = null;
-            m_grpEndTime = null;
-            m_btnBuy = null;
-            m_txtLock = null;
-            m_loaPriceIcon = null;
-            m_txtIcon = null;
-            m_grpIcon = null;
-            m_txtOriginalPrice = null;
-            m_txtPrice = null;
-            m_grpOriginalPrice = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListVipItem
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GButton m_btnShow;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
+        public GTextField m_txtGiftBag;
+        public GList m_listGiftBag;
+        public GButton m_btnGetGiftBag;
+        public GTextField m_txtWeekGiftBag;
+        public GList m_listWeekGiftBag;
+        public GButton m_btnGetWeekGiftBag;
+        public const string URL = "ui://p9mtgheoqik1tby";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListVipItem";
+        private static UI_ListVipItem _proxy;
+
+        public static UI_ListVipItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListVipItem();
+            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_ListVipItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListVipItem();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_listGiftBag = (GList)comp.GetChild("listGiftBag");
+            m_btnGetGiftBag = (GButton)comp.GetChild("btnGetGiftBag");
+            m_txtWeekGiftBag = (GTextField)comp.GetChild("txtWeekGiftBag");
+            m_listWeekGiftBag = (GList)comp.GetChild("listWeekGiftBag");
+            m_btnGetWeekGiftBag = (GButton)comp.GetChild("btnGetWeekGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_btnShow = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
+            m_txtGiftBag = null;
+            m_listGiftBag = null;
+            m_btnGetGiftBag = null;
+            m_txtWeekGiftBag = null;
+            m_listWeekGiftBag = null;
+            m_btnGetWeekGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListVipItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreChargeAddUpUI.cs

@@ -10,6 +10,8 @@ namespace UI.Store
         public GComponent m_valueBar;
         public UI_ComVipLv m_comVipLv;
         public GList m_list;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
         public const string URL = "ui://p9mtgheol500tbf";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreChargeAddUpUI";
@@ -60,6 +62,8 @@ namespace UI.Store
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
             m_list = (GList)comp.GetChild("list");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -67,6 +71,8 @@ namespace UI.Store
             m_comVipLv.Dispose();
             m_comVipLv = null;
             m_list = null;
+            m_btnLeft = null;
+            m_btnRight = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -0,0 +1,111 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreMonthUI
+    {
+        public GComponent target;
+        public GComponent m_valueBar;
+        public GButton m_btnRule;
+        public GLoader m_loaCard;
+        public GTextField m_txtTime;
+        public UI_Button10 m_btnBuy;
+        public GTextField m_txtTips;
+        public GLoader m_loaMoney;
+        public GTextField m_txtMoneyCount;
+        public GTextField m_txtPrivilegeCount;
+        public GLoader m_loaDailyMoney;
+        public GTextField m_txtDailyMoneyCount;
+        public GButton m_btnGet;
+        public GTextField m_txtGiftBag;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheoqik1tc0";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreMonthUI";
+        private static UI_StoreMonthUI _proxy;
+
+        public static UI_StoreMonthUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreMonthUI();
+            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_StoreMonthUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreMonthUI();
+            }
+            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_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_loaCard = (GLoader)comp.GetChild("loaCard");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnBuy = (UI_Button10)UI_Button10.Create(comp.GetChild("btnBuy"));
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_loaMoney = (GLoader)comp.GetChild("loaMoney");
+            m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
+            m_txtPrivilegeCount = (GTextField)comp.GetChild("txtPrivilegeCount");
+            m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
+            m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_valueBar = null;
+            m_btnRule = null;
+            m_loaCard = null;
+            m_txtTime = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            m_txtTips = null;
+            m_loaMoney = null;
+            m_txtMoneyCount = null;
+            m_txtPrivilegeCount = null;
+            m_loaDailyMoney = null;
+            m_txtDailyMoneyCount = null;
+            m_btnGet = null;
+            m_txtGiftBag = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs.meta

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

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

@@ -22,7 +22,7 @@ namespace GFGGame
             }
             return false;
         }
-        public static async ETTask<bool> ReqShopBuy(int buyId, long buyCount)
+        public static async ETTask<bool> ReqShopBuy(int buyId, long buyCount = 1)
         {
             S2C_ShopBuy response = null;
             response = (S2C_ShopBuy)await MessageHelper.SendToServer(new C2S_ShopBuy() { BuyId = buyId, Times = (int)buyCount });
@@ -54,5 +54,68 @@ namespace GFGGame
             }
             return false;
         }
+
+        /**********************************************会员中心**********************************************/
+        //领取VIP等级礼包
+        public static async ETTask<bool> ReqGetVipGiftBag(int vipLv)
+        {
+            S2C_GetVipLevelGift response = null;
+            response = (S2C_GetVipLevelGift)await MessageHelper.SendToServer(new C2S_GetVipLevelGift() { VipLevel = vipLv });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取VIP周礼包
+        public static async ETTask<bool> ReqGetVipWeekGiftBag(int vipLv)
+        {
+            S2C_GetVipWeekGift response = null;
+            response = (S2C_GetVipWeekGift)await MessageHelper.SendToServer(new C2S_GetVipWeekGift() { VipLevel = vipLv });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /*********************************************************月卡***************************************************/
+
+        //领取每日返还珍珠
+        public static async ETTask<bool> ReqGetMonthCardReward(int monthCardType)
+        {
+            S2C_GetMonthCardReward response = null;
+            response = (S2C_GetMonthCardReward)await MessageHelper.SendToServer(new C2S_GetMonthCardReward() { MonthCardType = monthCardType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取专属单品
+        public static async ETTask<bool> ReqGetMonthCardItem(int monthCardType)
+        {
+            S2C_GetMonthCardItem response = null;
+            response = (S2C_GetMonthCardItem)await MessageHelper.SendToServer(new C2S_GetMonthCardItem());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/NumberUtil.cs

@@ -42,6 +42,43 @@ namespace GFGGame
             }
             return "未知";
         }
+        public static string GetOldChiniseNumberText(int num)
+        {
+            int numInUnit = 0;
+            int numInTen = 0;
+            string strInUnit = "";
+            string strInTen = "";
+            if (num == 0)
+            {
+                return "零";
+            }
+            if (num <= 10)
+            {
+                return GameConst.CHINESE_NUMBER_OLD[num - 1];
+            }
+            else if (num < 20)
+            {
+                numInUnit = num - 10;
+                strInUnit = GameConst.CHINESE_NUMBER_OLD[numInUnit - 1];
+                return "拾" + strInUnit;
+            }
+            else if (num < 100)
+            {
+                numInTen = Mathf.FloorToInt(num / 10);
+                strInTen = GameConst.CHINESE_NUMBER_OLD[numInTen - 1];
+                numInUnit = num % 10;
+                if (numInUnit == 0)
+                {
+                    return strInTen + "拾";
+                }
+                else
+                {
+                    strInUnit = GameConst.CHINESE_NUMBER_OLD[numInUnit - 1];
+                    return strInTen + "拾" + strInUnit;
+                }
+            }
+            return "未知";
+        }
         public static string GetChiniseNumberWeekText(int num)
         {
             if (num >= 0 && num < GameConst.CHINESE_NUMBER.Length)

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -252,7 +252,7 @@ namespace GFGGame
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
                 // item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
-                item.m_txtDanRank.text = string.Format("段位排名：{0}", arenaData.Grade);
+                item.m_txtDanRank.text = string.Format("段位排名：{0}", arenaData.RankInGrade);
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
@@ -275,7 +275,7 @@ namespace GFGGame
             UI_ListRankItem.ProxyEnd();
         }
 
-        private void UpdateOtherItem(ArenaTargetData arenaData, GObject obj, int index, bool isSelf = false)
+        private void UpdateOtherItem(ArenaTargetData arenaData, GObject obj, int rank, bool isSelf = false)
         {
             UI_ListRankItem3 item = UI_ListRankItem3.Proxy(obj);
 
@@ -292,7 +292,7 @@ namespace GFGGame
             }
             else
             {
-                item.m_txtRank.text = index > 100 ? "--" : index.ToString();
+                item.m_txtRank.text = rank > 100 ? "--" : rank.ToString();
                 item.m_txtName.text = arenaData.RoleInfo.roleName;
                 item.m_txtDanRank.text = arenaData.RankInGrade.ToString();
 

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -315,7 +315,7 @@ namespace GFGGame
         private void UpdateNormal()
         {
             ItemUtil.UpdateTag(_ui.m_comTag, _dataManager.Tag);
-            ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes, true, "#FBF6ED");
             _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
             _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
             _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
@@ -347,7 +347,7 @@ namespace GFGGame
             {
                 _ui.m_txtRefreshCount.visible = false;
                 _ui.m_comCostCurrent.target.visible = true;
-                ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes, true, "#FBF6ED");
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -1,5 +1,7 @@
 using ET;
 using FairyGUI;
+using UnityEngine;
+
 namespace GFGGame
 {
     public class ItemView
@@ -65,7 +67,7 @@ namespace GFGGame
                 Log.Error($"使用了一个不存在的物品 {_itemData.id}！");
                 return;
             }
-            _loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            _loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(_loaRarity, _itemData.id, false);
             // _imgGot.visible = false;
             _txtName.visible = false;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -0,0 +1,208 @@
+
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailySignView : BaseWindow
+    {
+        private UI_DailySignUI _ui;
+
+        private int _signCount;
+        private int _month;
+        private int _day;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_DailySignUI.PACKAGE_NAME;
+            _ui = UI_DailySignUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_list.itemRenderer = ListItemRender;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSignView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
+            {
+                if (DateTime.Now.Day == 1)
+                {
+                    if (DateTime.Now.Month == 1)
+                    {
+                        _month = 12;
+                    }
+                    else
+                    {
+                        _month = DateTime.Now.Month - 1;
+                    }
+                    List<DailySignBonusCfg> cfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
+                    _day = cfgs[cfgs.Count - 1].day;
+                }
+                else
+                {
+                    _day = DateTime.Now.Day - 1;
+                }
+            }
+            else
+            {
+                _month = DateTime.Now.Month;
+                _day = DateTime.Now.Day;
+            }
+            _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
+            UpdateSignView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateSignView);
+        }
+
+        private void UpdateSignView()
+        {
+            _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
+            _ui.m_txtSignCount.text = _signCount.ToString();
+            List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.target.max = signBonusCfgs.Count;
+            _ui.m_proSign.target.value = _signCount;
+            List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            for (int i = 0; i < signCfgs.Count; i++)
+            {
+                GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
+                comProBonus.x = ((float)signCfgs[i].day / (float)signBonusCfgs.Count) * _ui.m_proSign.target.width;
+                UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
+                item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
+                item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
+                item.m_txtDay.text = signCfgs[i].day.ToString();
+                if (item.target.data == null)
+                {
+                    item.target.onClick.Add(OnBtnGetProBonus);
+                }
+                item.target.data = signCfgs[i];
+                bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfgs[i].day);
+                item.m_imgGot.visible = isGot;
+                bool canGet = _signCount >= signCfgs[i].day && !isGot;
+                RedDotController.Instance.SetComRedDot(item.target, canGet);
+                UI_ComProBonus.ProxyEnd();
+            }
+            _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+        }
+        private async void OnBtnGetProBonus(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            DailySignCfg signCfg = obj.data as DailySignCfg;
+            if (_signCount < signCfg.day || MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfg.day))
+            {
+                GoodsItemTipsController.ShowItemTips(signCfg.bonusArr[0][0]);
+            }
+            else
+            {
+                bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.day);
+                if (result)
+                {
+                    UpdateSignView();
+                }
+            }
+        }
+
+        private void ListItemRender(int index, GObject obj)
+        {
+
+            UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
+            if (index == 29)
+            {
+                item.target.touchable = false;
+                item.target.visible = false;
+                return;
+            }
+            int _index = index >= 29 ? index - 1 : index;
+            DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
+            bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), bonusCfg.day);
+
+            item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
+            item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day);//  bonusCfg.day.ToString();
+            if (item.m_comItem.data == null)
+            {
+                item.m_comItem.data = new ItemView(item.m_comItem);
+            }
+            ItemData itemData = ItemUtil.createItemData(bonusCfg.bonusArr[0]);
+            (item.m_comItem.data as ItemView).SetData(itemData);
+            (item.m_comItem.data as ItemView).ShowTips = false;
+            (item.m_comItem.data as ItemView).ChangeTxtCountStyle();
+
+            item.m_imgMask.visible = isGot || bonusCfg.day < _day && !isGot;
+            item.m_imgGot.visible = isGot;
+            item.m_imgNotGet.visible = bonusCfg.day < _day && !isGot;
+            RedDotController.Instance.SetComRedDot(item.target, bonusCfg.day == _day && !isGot);
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnGetSignBonus);
+            }
+            item.target.data = bonusCfg.day;
+            UI_ListSignItem.ProxyEnd();
+        }
+        private async void OnGetSignBonus(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int day = (int)obj.data;
+            bool result = false;
+            if (day > _day) return;
+            if (day < _day)
+            {
+                int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];
+                AlertUI.Show(string.Format("是否确定花费{0}{1}补签？", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name)).
+               SetLeftButton(true, "否").
+                SetRightButton(true, "是", async (object param) =>
+                {
+                    if (ItemDataManager.GetItemNum(cost[0]) < cost[1])
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                        return;
+                    }
+                    result = await DailyWelfareSProxy.ReqReSign(day);
+                });
+            }
+            else
+            {
+                result = await DailyWelfareSProxy.ReqSign(day);
+            }
+            if (result)
+            {
+                _ui.m_list.numItems = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month).Count;
+            }
+        }
+    }
+}