Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" designImage="ui://kupdwln7nyhm0">
+  <displayList>
+    <loader id="n24_jttb" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <component id="n0_nyhm" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,78"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108"/>
+    <text id="n2_nyhm" name="TimeStr" xy="461,107" size="156,44" fontSize="32" color="#fffaec" autoSize="none" text=""/>
+    <component id="n4_nyhm" name="n4" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
+    <component id="n6_rle1" name="ExpProcess" src="nyhmf" fileName="components/ExpProcess.xml" xy="74,190">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n9_rle1" name="n9" src="nyhmd" fileName="images/qrhd_jf_db.png" xy="29,267"/>
+    <image id="n7_rle1" name="n7" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-2,195" size="96,96"/>
+    <text id="n8_rle1" name="Score" xy="12,224" size="69,39" fontSize="28" color="#574326" align="center" vAlign="middle" autoSize="none" text="9999"/>
+    <text id="n10_rle1" name="n10" xy="29,274" size="40,161" fontSize="32" color="#574326" align="center" leading="-5" autoSize="none" text="当前积分"/>
+    <list id="n11_rle1" name="DayList" xy="43,909" size="994,61" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://kupdwln7rle1h" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n12_jttb" name="TaskList" xy="12,983" size="1064,937" overflow="scroll" defaultItem="ui://eg2y0ldplh8v5">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <loader id="n14_jttb" name="StartIndex" xy="96,810" size="166,93" url="ui://kupdwln7nyhmc"/>
+    <loader id="n22_jttb" name="EndIndex" xy="79,152" size="159,98" url="ui://kupdwln7nyhmc"/>
+  </displayList>
+</component>

FGUIProject/assets/ActivityDay7/components/ButtonDay.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="174,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_rle1" name="n0" src="nyhma" fileName="images/choose_cardtab_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_rle1" name="text" xy="39,8" size="108,44" fontSize="32" color="#954848" autoSize="none" text="第一天"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/ActivityDay7/components/ExpProcess.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="44,676" extention="ProgressBar">
+  <displayList>
+    <image id="n0_nyhm" name="n0" src="nyhmb" fileName="images/qrhd_jdt_db.png" xy="0,0" size="38,676">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+  </displayList>
+  <ProgressBar reverse="true"/>
+</component>

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="159,98">
+  <displayList>
+    <image id="n5_jttb" name="n5" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="53,0"/>
+    <loader id="n6_jttb" name="loaIcon" xy="74,19" size="58,61" url="ui://eg2y0ldply9g8n"/>
+    <image id="n9_jttb" name="n9" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="0,42"/>
+    <image id="n7_jttb" name="n7" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="112,64"/>
+    <text id="n8_jttb" name="Num" xy="112,56" size="47,42" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n10_jttb" name="Score" xy="6,41" size="55,42" fontSize="30" color="#fffbeb" autoSize="none" text="100"/>
+  </displayList>
+</component>

FGUIProject/assets/ActivityDay7/package.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="kupdwln7">
+  <resources>
+    <image id="nyhm0" name="七日活动.png" path="/Designs/"/>
+    <component id="nyhm1" name="ActivityDay7UI.xml" path="/" exported="true"/>
+    <image id="nyhm2" name="qrhd_jd_fgx.png" path="/images/"/>
+    <image id="nyhm3" name="qrhd_zd.png" path="/images/"/>
+    <image id="nyhm4" name="qrhd_wp_db_1.png" path="/images/"/>
+    <image id="nyhm5" name="sj_db.png" path="/images/"/>
+    <image id="nyhm7" name="qrhd_jdt.png" path="/images/"/>
+    <image id="nyhm8" name="qrhd_db.png" path="/images/"/>
+    <image id="nyhm9" name="qrhd_sz_db.png" path="/images/"/>
+    <image id="nyhma" name="choose_cardtab_1.png" path="/images/"/>
+    <image id="nyhmb" name="qrhd_jdt_db.png" path="/images/"/>
+    <image id="nyhmc" name="qrhd_wp_db.png" path="/images/"/>
+    <image id="nyhmd" name="qrhd_jf_db.png" path="/images/"/>
+    <image id="nyhme" name="qrhd_jdt_sz_db.png" path="/images/"/>
+    <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
+    <component id="nyhmg" name="ExpProcessItem.xml" path="/components/" exported="true"/>
+    <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
+</packageDescription>

FGUIProject/assets/CommonGame/components/ButtonRed.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="61,61" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nyhm" name="n0" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" xy="0,0" size="59,62">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrencyWithHas.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,42">
   <displayList>
-    <text id="n2_ojlz" name="n2" xy="7,1" size="65,42" group="n12_nasr" fontSize="30" color="#ebdfcb" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="82,-9" size="60,60" group="n12_nasr" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n11_r9ri" name="txtCount" xy="152,1" size="121,41" group="n12_nasr" fontSize="30" color="#fdeed4" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
-    <group id="n12_nasr" name="n12" xy="7,-9" size="266,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <text id="n2_ojlz" name="n2" xy="16,1" size="65,42" group="n12_nasr" fontSize="30" color="#9f815f" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="91,-9" size="60,60" group="n12_nasr" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n11_r9ri" name="txtCount" xy="161,1" size="103,41" group="n12_nasr" fontSize="30" color="#9f815f" vAlign="middle" ubb="true" autoClearText="true" text="999/999"/>
+    <group id="n12_nasr" name="n12" xy="16,-9" size="248,60" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/Task/components/RewardIconYellow.xml → FGUIProject/assets/CommonGame/components/RewardIconYellow.xml

@@ -2,11 +2,11 @@
 <component size="123,123">
   <controller name="c1" pages="0,NotGet,1,Get" selected="0"/>
   <displayList>
-    <image id="n0_nd17" name="n0" src="uxxstmb" fileName="images/wpk_db_1.png" xy="0,0"/>
+    <image id="n0_nd17" name="n0" src="l500tlv" fileName="imagesNew/wpk_db_1.png" xy="0,0"/>
     <loader id="n3_vixc" name="loaIcon" xy="61,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
-    <image id="n1_nd17" name="n1" src="uxxstmy" fileName="images/wpk_sz_db.png" xy="5,85"/>
+    <image id="n1_nd17" name="n1" src="l500tlw" fileName="imagesNew/wpk_sz_db.png" xy="5,85"/>
     <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
-    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="72,-8">
+    <image id="n4_itts" name="n4" src="uxxstn3" fileName="imagesNew/txz_tb_ylq.png" xy="72,-8">
       <gearDisplay controller="c1" pages="1"/>
     </image>
   </displayList>

FGUIProject/assets/Task/components/TaskListItem.xml → FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1037,224">
-  <controller name="c1" pages="1,,2,,3," selected="0">
+  <controller name="c1" pages="1,,2,,3," selected="2">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <controller name="c2" pages="0,CanGo,1,NotGo" selected="0"/>
+  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="1"/>
   <displayList>
-    <image id="n13_ids4" name="n13" src="uxxstmj" fileName="images/mrrw_db.png" xy="-4,8"/>
-    <image id="n12_ids4" name="n12" src="uxxstmq" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
+    <image id="n13_ids4" name="n13" src="uxxstmj" fileName="imagesNew/mrrw_db.png" xy="-4,8"/>
+    <image id="n12_ids4" name="n12" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
     <text id="n14_ids4" name="txtCount" xy="390,20" size="80,44" fontSize="32" color="#915e15" text="1/100"/>
-    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,82" size="189,58">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
     <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/ComeBt.xml" xy="804,81" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="前往" icon="ui://5mpsibzznd17tlv"/>
+      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
     </component>
-    <component id="n18_ids4" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
+    <text id="n19_jttb" name="n19" xy="883,22" size="126,43" fontSize="28" color="#8e4b2a" autoSize="none" text="积分+20">
+      <gearDisplay controller="c3" pages="1"/>
+    </text>
+    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
+    <text id="n21_jttb" name="n21" xy="870,91" size="88,39" group="n22_jttb" fontSize="28" color="#683c28" text="已领取"/>
+    <group id="n22_jttb" name="n22" xy="788,86" size="233,51" advanced="true">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="领取" icon="ui://eg2y0ldpo9gh4l"/>
-    </component>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
     <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
-    <image id="n2_qik1" name="n2" src="qik1tc9" fileName="componentsBg/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
+    <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>
     <group id="n5_qik1" name="n5" xy="220,92" size="668,54" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">

FGUIProject/assets/CommonGame/package.xml

@@ -289,7 +289,6 @@
     <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <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" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
@@ -306,14 +305,24 @@
     <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"/>
+    <component id="nyhmtly" name="ButtonRed.xml" path="/components/" exported="true"/>
+    <image id="uxxstm7" name="txz_lvl_db.png" path="/imagesNew/" exported="true"/>
+    <component id="lh8v5" name="TaskListItem.xml" path="/components/" exported="true"/>
+    <component id="9qpb4h" name="ComeBt.xml" path="/components/" exported="true"/>
+    <component id="nd1743" name="RewardIconYellow.xml" path="/components/" exported="true"/>
+    <image id="uxxstmq" name="mrrw_bq_qb.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstmj" name="mrrw_db.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
+    <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm6" name="qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
     <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
-    <image id="qik1tc9" name="lm_dt_zsx1.png" path="/componentsBg/"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>

FGUIProject/assets/DressUp/components/ComboBoxSuit_item.xml

@@ -2,7 +2,7 @@
 <component size="322,60" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n1_q08x" name="title" xy="103,0" size="116,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="我的套装">
+    <text id="n1_q08x" name="title" xy="103,0" pivot="0.5,0" size="116,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="我的套装">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     <image id="n0_q08x" name="n0" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="21,53" color="#e1cca3">

FGUIProject/assets/LuckyBox/LuckyBoxActiveUI.xml

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

FGUIProject/assets/LuckyBox/package.xml

@@ -36,7 +36,7 @@
     <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/" atlas="alone_npot"/>
     <component id="njmn2n" name="ComBox_2.xml" path="/combox/" exported="true"/>
     <component id="njmn2o" name="ComBox_3.xml" path="/combox/" exported="true"/>
-    <component id="njmn2p" name="ComBox_1.xml" path="/combox/" exported="true"/>
+    <component id="njmn2p" name="ComBox.xml" path="/combox/" exported="true"/>
     <component id="wono2q" name="LuckyBoxUI.xml" path="/" exported="true"/>
     <image id="v95q2r" name="hd_kkbt_1.png" path="/images/"/>
     <image id="v95q2t" name="cj_glglgl.png" path="/images/"/>
@@ -62,6 +62,7 @@
     <image id="v95q3b" name="hdkp_dj.png" path="/images/"/>
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
     <image id="mzf8tac" name="cj_zizi_3.png" path="/images/"/>
+    <component id="mbf1tad" name="LuckyBoxActiveUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -15,9 +15,9 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1" icon="ui://mfvz4q8kt31nj8"/>
     </component>
-    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-23,175"/>
+    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-25,169"/>
     <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175"/>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true" size="836,31">
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
       <ProgressBar value="100" max="100"/>
     </component>
     <component id="n54_psph" name="comTargetCard" src="psphiz" fileName="components/ComTargetCard.xml" xy="1180,540" pivot="0.5,0.5" anchor="true" size="174,250" aspect="true"/>

FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -7,7 +7,8 @@
       <gearDisplay controller="button" pages="1"/>
     </image>
     <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
-    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="154,45" pkg="eg2y0ldp"/>
+    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="154,45"/>
+    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="26,100"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -7,7 +7,8 @@
     <image id="n5_r9ri" name="n5" src="r9rik" fileName="images/grxx_txxzlx.png" xy="2,2">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18" pkg="eg2y0ldp"/>
+    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="140,18"/>
+    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="11,89"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <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="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">

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <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">

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -10,8 +10,8 @@
       <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="727,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"/>
+    <text id="n43_qik1" name="txtTPrivilege" xy="768,566" pivot="1,0" size="131,44" fontSize="32" color="#915e15" ubb="true" vars="true" text="[color=#C53619]{value=29}[/color]项特权"/>
+    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="121,1004" size="839,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,41" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
@@ -30,6 +30,7 @@
     <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"/>
+    <text id="n4_qik1" name="txtTime" xy="784,1190" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
     <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="特权礼包"/>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -4,9 +4,11 @@
   <displayList>
     <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,574"/>
     <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
-    <text id="n30_n3xh" name="txtTitle" xy="432,30" pivot="0.5,0" size="98,64" fontSize="48" color="#9b7853" text="提示"/>
-    <text id="n29_n3xh" name="txtTips" xy="312,150" pivot="0.5,0" size="337,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
-    <text id="n31_n3xh" name="txtNum" xy="337,220" pivot="0.5,0" size="287,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
+    <text id="n30_n3xh" name="txtTitle" xy="431,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
+    <text id="n29_n3xh" name="txtTips" xy="299,150" pivot="0.5,0" size="363,52" fontSize="38" color="#917961" text="  以下途径可增加次数"/>
+    <text id="n31_n3xh" name="txtNum0" xy="289,220" pivot="0.5,0" size="383,44" group="n37_qik1" fontSize="32" color="#917961" text=" 1.金卡+X次，黑金卡+X次"/>
+    <text id="n36_qik1" name="txtNum1" xy="267,269" pivot="0.5,0" size="428,44" group="n37_qik1" fontSize="32" color="#917961" text="2.道具兑换(今日已兑换0/10次)"/>
+    <group id="n37_qik1" name="n37" xy="267,220" size="428,93" advanced="true" layout="vt" lineGap="5" excludeInvisibles="true"/>
     <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="335,364" group="n33_f2bf"/>
     <component id="n7_hinb" name="btnExchange" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="310,420" group="n33_f2bf">
       <Button title="兑换"/>

FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstms" fileName="images/lm_biaotizi_13.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="立即获得以下奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Task/OpenBattlePassUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstmv" fileName="images/lm_biaotizi_12.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="解锁特别制造奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -8,10 +8,10 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://5mpsibzznd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -8,12 +8,12 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="前往" icon="ui://5mpsibzzittstn4"/>
+      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
     </component>
     <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
       <gearDisplay controller="c1" pages="1"/>
@@ -28,7 +28,7 @@
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://5mpsibzznd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
-    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54"/>
+    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54" pkg="eg2y0ldp"/>
     <text id="n4_e3m1" name="n4" xy="-55,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-54,-15" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>

FGUIProject/assets/Task/components/ExpProcess2.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_nd17" name="ExpBar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,1" size="346,19"/>
-    <image id="n2_nd17" name="n2" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-99,-50"/>
+    <image id="n2_nd17" name="n2" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-99,-50" pkg="eg2y0ldp"/>
     <text id="n3_nd17" name="n3" xy="-51,-23" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n4_nd17" name="Level" xy="-50,-11" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
     <text id="n5_nd17" name="NumProcess" xy="49,-43" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>

FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -6,7 +6,7 @@
     <loader id="n3_vixc" name="loaIcon" xy="64,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
     <image id="n1_nd17" name="n1" src="uxxstm5" fileName="images/wpk_sz_db2.png" xy="5,85"/>
     <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
-    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1">
+    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="1"/>
     </image>
   </displayList>

FGUIProject/assets/Task/package.xml

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5mpsibzz">
   <resources>
-    <component id="lh8v5" name="TaskListItem.xml" path="/components/"/>
     <component id="fqor2n" name="TaskUI.xml" path="/" exported="true"/>
     <component id="fqor2p" name="CombTaskUI.xml" path="/" exported="true"/>
     <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
     <component id="nd173t" name="ExpProcess2.xml" path="/components/"/>
     <component id="nd173u" name="BattlePassRewardItem.xml" path="/components/"/>
     <component id="nd1742" name="RewardIconBlue.xml" path="/components/"/>
-    <component id="nd1743" name="RewardIconYellow.xml" path="/components/"/>
     <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
     <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
     <component id="ids44e" name="TabButton.xml" path="/components/"/>
-    <component id="9qpb4h" name="ComeBt.xml" path="/components/"/>
     <component id="9qpb4j" name="LinessRewardProcessItemBt.xml" path="/components/"/>
     <component id="or80tlw" name="BattlePassReward.xml" path="/components/"/>
     <component id="or80tlx" name="OpenBattlePassUI.xml" path="/" exported="true"/>
@@ -21,11 +18,9 @@
     <image id="uxxstm4" name="wz_kqjlzz.png" path="/images/"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/images/"/>
     <image id="uxxstm6" name="an_jia.png" path="/images/"/>
-    <image id="uxxstm7" name="txz_lvl_db.png" path="/images/"/>
     <image id="uxxstm8" name="yeqian_db.png" path="/images/"/>
     <image id="uxxstm9" name="db_jiajian.png" path="/images/"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/images/"/>
-    <image id="uxxstmb" name="wpk_db_1.png" path="/images/"/>
     <image id="uxxstmc" name="txz_jlzz_db_jlzz.png" path="/images/"/>
     <image id="uxxstmd" name="jyt_pink.png" path="/images/"/>
     <image id="uxxstme" name="txz_nr_db.png" path="/images/"/>
@@ -33,14 +28,12 @@
     <image id="uxxstmg" name="jyt_liang.png" path="/images/"/>
     <image id="uxxstmh" name="jdt_bg.png" path="/images/"/>
     <image id="uxxstmi" name="jyt_yellow.png" path="/images/"/>
-    <image id="uxxstmj" name="mrrw_db.png" path="/images/"/>
     <image id="uxxstmk" name="yeqian_xz.png" path="/images/"/>
     <image id="uxxstml" name="bt_db_jlzz.png" path="/images/"/>
     <image id="uxxstmm" name="wpk_zz.png" path="/images/"/>
     <image id="uxxstmn" name="txz_jlzz_tbdj_db.png" path="/images/"/>
     <image id="uxxstmo" name="jdt_bk.png" path="/images/"/>
     <image id="uxxstmp" name="txz_jlzz_db_pt.png" path="/images/"/>
-    <image id="uxxstmq" name="mrrw_bq_qb.png" path="/images/"/>
     <image id="uxxstmr" name="jlzz_djbg.png" path="/images/"/>
     <image id="uxxstms" name="lm_biaotizi_13.png" path="/images/"/>
     <image id="uxxstmt" name="jyt_fgx.png" path="/images/"/>
@@ -48,13 +41,10 @@
     <image id="uxxstmv" name="lm_biaotizi_12.png" path="/images/"/>
     <image id="uxxstmw" name="jyt_dk_2.png" path="/images/"/>
     <image id="uxxstmx" name="jdt_pink_2.png" path="/images/"/>
-    <image id="uxxstmy" name="wpk_sz_db.png" path="/images/"/>
     <image id="uxxstmz" name="an_jian.png" path="/images/"/>
     <image id="uxxstn0" name="cz_an_pink.png" path="/images/"/>
     <image id="uxxstn1" name="bt_db_dj.png" path="/images/"/>
     <image id="uxxstn2" name="jyt_dk.png" path="/images/"/>
-    <image id="uxxstn3" name="txz_tb_ylq.png" path="/images/"/>
-    <image id="ittstn4" name="lm_an_jujue_1.png" path="/images/"/>
     <image id="ittstn5" name="mrqd_3.png" path="/images/"/>
     <image id="ittstn6" name="mrqd_anniu_4.png" path="/images/"/>
     <image id="ittstn7" name="mrqd_anniu_5.png" path="/images/"/>

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

@@ -4,14 +4,10 @@ using ET;
 
 namespace GFGGame
 {
-    public class CustomSuitDataManager
+    public class CustomSuitDataManager : Singleton<CustomSuitDataManager>
     {
         private static int _currentIndex;
         public static int currentIndex { get; set; }
-        private const int _defaultPosCount = 3;
-        private static MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
-
-        // private string[] posItems = new string[_defaultPosCount + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[1]];
 
         private static Dictionary<int, CustomSuitData> _dataDic = new Dictionary<int, CustomSuitData>();
         public static void SaveSuit(int index, DressUpData dressUpData)
@@ -56,13 +52,13 @@ namespace GFGGame
             return GetSuitList(currentIndex);
         }
 
-        public static void SaveCurrentSuit(int index)
+        public static void SaveCurrentSuit(int index, bool showTips = true)
         {
             if (currentIndex != index)
             {
                 currentIndex = index;
             }
-            CustomSuitSProxy.UpdateCustomSuit(index, MyDressUpHelper.dressUpObj.DressUpDataClone()).Coroutine();
+            CustomSuitSProxy.UpdateCustomSuit(index, MyDressUpHelper.dressUpObj.DressUpDataClone(), showTips).Coroutine();
         }
 
         public static void InitServerData(List<CustomSuitProto> list)
@@ -85,19 +81,53 @@ namespace GFGGame
             }
         }
 
-        //检测是否是月卡位置,0默认位置
-        public static bool CheckIsCardPos(int cardType, int pos)
+        public static string[] GetSuitPosItems()
+        {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
+            string[] posItems = new string[GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
+            for (int i = 0; i < posItems.Length; i++)
+            {
+                if (GetPosType(i) == 0)
+                {
+                    posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                }
+                else if (GetPosType(i) == MonthCardType.Gold)
+                {
+                    if (RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+                    {
+                        posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                    }
+                    else
+                    {
+                        posItems[i] = "金卡开启";
+                    }
+                }
+                else if (GetPosType(i) == MonthCardType.BlackGold)
+                {
+                    if (RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+                    {
+                        posItems[i] = string.Format("我的套装{0}", NumberUtil.GetChiniseNumberText(i + 1));
+                    }
+                    else
+                    {
+                        posItems[i] = "黑金卡开启";
+                    }
+                }
+            }
+            return posItems;
+        }
+
+
+        //获取指定位置月卡类型
+        public static int GetPosType(int pos)
         {
-            // if (pos < _defaultPosCount) return false;
+            if (pos < GlobalCfgArray.globalCfg.freeSuitNum) return 0;
 
-            // for (int i = _defaultPosCount; i < posItems.Length; i++)
-            // {
-            //     if (cardType == MonthCardType.Gold && pos <)
-            //     {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
+            if (pos < GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0]) return MonthCardType.Gold;
+            if (pos >= GlobalCfgArray.globalCfg.freeSuitNum + privilegeCfg.value1Arr[0]) return MonthCardType.BlackGold;
 
-            //     }
-            // }
-            return false;
+            return 0;
         }
     }
 }

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

@@ -8,9 +8,9 @@ namespace GFGGame
     public class LuckyBoxDataManager : SingletonBase<LuckyBoxDataManager>
     {
 
-        public const int BOX_ID_1 = 1;
-        public const int BOX_ID_2 = 2;
-        public const int BOX_ID_3 = 3;
+        // public const int BOX_ID_1 = 1;
+        public const int BOX_ID_2 = 2;//常驻奖池2
+        public const int BOX_ID_3 = 3;//常驻奖池2
 
         public const int ONCE_TIME = 1;
         public const int TEN_TIME = 10;
@@ -19,7 +19,7 @@ namespace GFGGame
         private Dictionary<int, ItemData> _firstRewardsList = new Dictionary<int, ItemData>();//首次获得的奖励
         private Dictionary<int, List<LuckyBoxBonusData>> _dicShowList = new Dictionary<int, List<LuckyBoxBonusData>>();
 
-        public int[] luckyBoxIds = new int[] { 1, 2, 3 };//奖池列表
+        public List<int> luckyBoxIds = new List<int>();//奖池列表
         public long startTime = 1668873600000;
         public long endTime = 1672156799000;
 

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

@@ -107,14 +107,16 @@ namespace GFGGame
         //移除未上架商品
         public List<ShopCfg> RemoveNotOpenCfg(List<ShopCfg> shop)
         {
+            List<ShopCfg> shopCfgs = new List<ShopCfg>();
             for (int i = shop.Count - 1; i >= 0; i--)
             {
                 if (!string.IsNullOrEmpty(shop[i].startTime) && !TimeUtil.IsBeforeCurTime(shop[i].startTime) || !string.IsNullOrEmpty(shop[i].endTime) && !TimeUtil.IsLaterCurTime(shop[i].endTime))
                 {
-                    shop.RemoveAt(i);
+                    continue;
                 }
+                shopCfgs.Add(shop[i]);
             }
-            return shop;
+            return shopCfgs;
         }
         //商品排序
         public List<ShopCfg> SortShopGoodsCfgs(List<ShopCfg> shopCfgs)
@@ -176,7 +178,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;
                 }
                 return ArenaDataManager.Instance.Grade >= lockValue;
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 467019021bce641ea87b60c3e4733592
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ActivityDay7UI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_TimeStr;
+        public GProgressBar m_ExpProcess;
+        public GTextField m_Score;
+        public GList m_DayList;
+        public GList m_TaskList;
+        public GLoader m_StartIndex;
+        public GLoader m_EndIndex;
+        public const string URL = "ui://kupdwln7nyhm1";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ActivityDay7UI";
+        private static UI_ActivityDay7UI _proxy;
+
+        public static UI_ActivityDay7UI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityDay7UI();
+            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_ActivityDay7UI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityDay7UI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_TimeStr = (GTextField)comp.GetChild("TimeStr");
+            m_ExpProcess = (GProgressBar)comp.GetChild("ExpProcess");
+            m_Score = (GTextField)comp.GetChild("Score");
+            m_DayList = (GList)comp.GetChild("DayList");
+            m_TaskList = (GList)comp.GetChild("TaskList");
+            m_StartIndex = (GLoader)comp.GetChild("StartIndex");
+            m_EndIndex = (GLoader)comp.GetChild("EndIndex");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_TimeStr = null;
+            m_ExpProcess = null;
+            m_Score = null;
+            m_DayList = null;
+            m_TaskList = null;
+            m_StartIndex = null;
+            m_EndIndex = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ButtonDay
+    {
+        public GButton target;
+        public GTextField m_text;
+        public const string URL = "ui://kupdwln7rle1h";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ButtonDay";
+        private static UI_ButtonDay _proxy;
+
+        public static UI_ButtonDay Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonDay();
+            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_ButtonDay Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonDay();
+            }
+            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_text = (GTextField)comp.GetChild("text");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_text = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityDay7
+{
+    public partial class UI_ExpProcessItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_Num;
+        public GTextField m_Score;
+        public const string URL = "ui://kupdwln7nyhmg";
+        public const string PACKAGE_NAME = "ActivityDay7";
+        public const string RES_NAME = "ExpProcessItem";
+        private static UI_ExpProcessItem _proxy;
+
+        public static UI_ExpProcessItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ExpProcessItem();
+            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_ExpProcessItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ExpProcessItem();
+            }
+            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_Num = (GTextField)comp.GetChild("Num");
+            m_Score = (GTextField)comp.GetChild("Score");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_Num = null;
+            m_Score = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs.meta

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

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

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

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d83de497ce18a7e4c940f6dbfe1f2955
+guid: 45c34602b5cd145d6986388695fc4c4d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_RewardIconYellow
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_num;
+        public const string URL = "ui://eg2y0ldpnd1743";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "RewardIconYellow";
+        private static UI_RewardIconYellow _proxy;
+
+        public static UI_RewardIconYellow Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardIconYellow();
+            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_RewardIconYellow Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardIconYellow();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_num = (GTextField)comp.GetChild("num");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_num = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_TaskListItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public Controller m_c3;
+        public GTextField m_txtDesc;
+        public GTextField m_txtCount;
+        public GList m_listTaskReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ComeBt;
+        public const string URL = "ui://eg2y0ldplh8v5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "TaskListItem";
+        private static UI_TaskListItem _proxy;
+
+        public static UI_TaskListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskListItem();
+            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_TaskListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskListItem();
+            }
+            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_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_c3 = null;
+            m_txtDesc = null;
+            m_txtCount = null;
+            m_listTaskReward = null;
+            m_GetRewardBt = null;
+            m_ComeBt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadBorderItem.cs

@@ -10,6 +10,7 @@ namespace UI.RoleInfo
         public GLoader m_loaIcon;
         public GLoader m_loaBorder;
         public GImage m_imgNew;
+        public GImage m_imgUnGet;
         public const string URL = "ui://374k3dwvv95qg3";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadBorderItem";
@@ -60,12 +61,14 @@ namespace UI.RoleInfo
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_loaBorder = null;
             m_imgNew = null;
+            m_imgUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadItem.cs

@@ -9,6 +9,7 @@ namespace UI.RoleInfo
         public GButton target;
         public GLoader m_loaIcon;
         public GImage m_imgNew;
+        public GImage m_imgUnGet;
         public const string URL = "ui://374k3dwvr9ri9";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadItem";
@@ -58,11 +59,13 @@ namespace UI.RoleInfo
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_imgNew = null;
+            m_imgUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,7 @@ namespace UI.Store
         public GComponent m_valueBar;
         public GButton m_btnRule;
         public GLoader m_loaCard;
-        public GTextField m_txtTime;
+        public GTextField m_txtTPrivilege;
         public UI_Button10 m_btnBuy;
         public GTextField m_txtTips;
         public GLoader m_loaMoney;
@@ -18,6 +18,7 @@ namespace UI.Store
         public GTextField m_txtPrivilegeCount;
         public GLoader m_loaDailyMoney;
         public GTextField m_txtDailyMoneyCount;
+        public GTextField m_txtTime;
         public GButton m_btnGet;
         public GTextField m_txtGiftBag;
         public GList m_list;
@@ -72,7 +73,7 @@ namespace UI.Store
             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_txtTPrivilege = (GTextField)comp.GetChild("txtTPrivilege");
             m_btnBuy = (UI_Button10)UI_Button10.Create(comp.GetChild("btnBuy"));
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_loaMoney = (GLoader)comp.GetChild("loaMoney");
@@ -80,6 +81,7 @@ namespace UI.Store
             m_txtPrivilegeCount = (GTextField)comp.GetChild("txtPrivilegeCount");
             m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
             m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
             m_list = (GList)comp.GetChild("list");
@@ -90,7 +92,7 @@ namespace UI.Store
             m_valueBar = null;
             m_btnRule = null;
             m_loaCard = null;
-            m_txtTime = null;
+            m_txtTPrivilege = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtTips = null;
@@ -99,6 +101,7 @@ namespace UI.Store
             m_txtPrivilegeCount = null;
             m_loaDailyMoney = null;
             m_txtDailyMoneyCount = null;
+            m_txtTime = null;
             m_btnGet = null;
             m_txtGiftBag = null;
             m_list = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs

@@ -11,7 +11,8 @@ namespace UI.Studio
         public GComponent m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
-        public GTextField m_txtNum;
+        public GTextField m_txtNum0;
+        public GTextField m_txtNum1;
         public GComponent m_comCostItem;
         public GButton m_btnExchange;
         public GComponent m_comCostCurrent;
@@ -67,7 +68,8 @@ namespace UI.Studio
             m_loaBg = (GComponent)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtNum0 = (GTextField)comp.GetChild("txtNum0");
+            m_txtNum1 = (GTextField)comp.GetChild("txtNum1");
             m_comCostItem = (GComponent)comp.GetChild("comCostItem");
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
@@ -79,7 +81,8 @@ namespace UI.Studio
             m_loaBg = null;
             m_txtTitle = null;
             m_txtTips = null;
-            m_txtNum = null;
+            m_txtNum0 = null;
+            m_txtNum1 = null;
             m_comCostItem = null;
             m_btnExchange = null;
             m_comCostCurrent = null;

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

@@ -9,7 +9,7 @@ namespace GFGGame
 {
     public class CustomSuitSProxy
     {
-        public static async ETTask UpdateCustomSuit(int index, DressUpData dressUpData)
+        public static async ETTask UpdateCustomSuit(int index, DressUpData dressUpData, bool showTipe = true)
         {
             CustomSuitProto suitProto = new CustomSuitProto();
             suitProto.Pos = index;
@@ -29,7 +29,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     CustomSuitDataManager.SaveSuit(index, dressUpData);
-                    PromptController.Instance.ShowFloatTextPrompt("保存成功", MessageType.SUCCESS);
+                    if (showTipe) PromptController.Instance.ShowFloatTextPrompt("保存成功", MessageType.SUCCESS);
 
                 }
             }

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

@@ -27,6 +27,10 @@ namespace GFGGame
                     //自定义套装
                     CustomSuitDataManager.InitServerData(response.CustomSuits);
                     CustomSuitDataManager.currentIndex = response.CustomSuitPos;
+                    if (!RoleDataManager.CheckIsMonthCardOpenByType(CustomSuitDataManager.GetPosType(CustomSuitDataManager.currentIndex)))
+                    {
+                        CustomSuitDataManager.currentIndex = 0;
+                    }
                     for (int i = 0; i < response.NewItems.Count; i++)
                     {
                         ItemCfg cfg = ItemCfgArray.Instance.GetCfg(response.NewItems[i]);
@@ -96,7 +100,7 @@ namespace GFGGame
         {
             M2C_GiftBoxSelConsumption response = null;
             response = (M2C_GiftBoxSelConsumption)await MessageHelper.SendToServer(new C2M_GiftBoxSelConsumption()
-                { ItemId = itemID, GiftBoxSelChildItems = giftBoxSelChildItems });
+            { ItemId = itemID, GiftBoxSelChildItems = giftBoxSelChildItems });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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

@@ -22,5 +22,19 @@ namespace GFGGame
             }
             return false;
         }
+        //请求轮换抽奖活动信息
+        public static async ETTask<int> ReqGetLuckyBoxRotatingInfo()
+        {
+            S2C_GetLuckyBoxRotatingInfo response = null;
+            response = (S2C_GetLuckyBoxRotatingInfo)await MessageHelper.SendToServer(new C2S_GetLuckyBoxRotatingInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return response.RotatingId;
+                }
+            }
+            return 0;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6bc1202d53eb457497223983617655ba
+timeCreated: 1684997625

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -0,0 +1,130 @@
+using FairyGUI;
+using UI.ActivityDay7;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class ActivityDay7View : BaseWindow
+    {
+        private UI_ActivityDay7UI _ui;
+
+        //7日活动配置
+        private Activity7DaysCfg[] cfgDataArray;
+
+        //7日活动积分配置
+        private Activity7DaysCfg[] activity7DaysCfgs;
+
+        //选中的天数index 天数=index+1
+        private int onClickIndex = 0;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityDay7UI.PACKAGE_NAME;
+            _ui = UI_ActivityDay7UI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            bringToFontOnClick = false;
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_DayList.itemRenderer = DayListRenderer;
+            _ui.m_TaskList.itemRenderer = TaskListRenderer;
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityDay7View).FullName);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            SetScoreList();
+            SetDayList();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        //DayListRenderer
+        private void DayListRenderer(int index, GObject obj)
+        {
+            var item = UI_ButtonDay.Proxy(obj);
+            if (item.target.data == null)
+            {
+                var cfg = cfgDataArray[index];
+                item.m_text.text = $"第{cfg.id}天";
+                item.target.data = index;
+                item.target.onClick.Add(OnClickDay);
+            }
+            //设置按钮状态
+            item.target.selected = index == onClickIndex;
+            UI_ButtonDay.ProxyEnd();
+        }
+
+        //选中天数
+        private void OnClickDay(EventContext context)
+        {
+            onClickIndex = (int)context.data;
+            _ui.m_TaskList.numItems = cfgDataArray.Length;
+            //TODO 刷新天数任务列表
+        }
+
+        //TaskListRenderer
+        private void TaskListRenderer(int index, GObject obj)
+        {
+            var item = UI_TaskListItem.Proxy(obj);
+
+            UI_TaskListItem.ProxyEnd();
+        }
+
+        //设置积分列表
+        private void SetScoreList()
+        {
+            //7日活动配置
+            activity7DaysCfgs = Activity7DaysCfgArray.Instance.dataArray;
+            var maxCfg = activity7DaysCfgs[activity7DaysCfgs.Length - 1];
+            var maxScore = maxCfg.score;
+            var pos = _ui.m_StartIndex.position;
+            var endY = _ui.m_EndIndex.position.y;
+            //循环设置UI
+            foreach (var cfg in activity7DaysCfgs)
+            {
+                var cfgScore = cfg.score;
+                var item = UI_ExpProcessItem.Create();
+                var target = item.target;
+                _ui.target.AddChild(target);
+                // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x，z不变，y根据比例设置 
+                var y = pos.y - (pos.y - endY) * cfgScore / maxScore;
+                target.SetPosition(pos.x, y, pos.z);
+                item.m_Score.text = cfgScore.ToString();
+                var cfgBonusArr = cfg.bonusArr;
+                var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
+                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_Num.text = cfgBonusArr[0][1].ToString();
+                UI_ExpProcess.ProxyEnd();
+            }
+        }
+
+
+        //设置天数列表
+        private void SetDayList()
+        {
+            //7日活动配置
+            cfgDataArray = Activity7DaysCfgArray.Instance.dataArray;
+            _ui.m_DayList.numItems = cfgDataArray.Length;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2622fcb4feac49f885978c8db5a6ea3f
+timeCreated: 1684997636

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

@@ -50,32 +50,8 @@ namespace GFGGame
         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;
-            }
+            _month = TimeUtil.GetCurMonth();
+            _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
             UpdateSignView();
         }

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

@@ -57,35 +57,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
-
-            // _valueBarController.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;
-            }
+            _month = TimeUtil.GetCurMonth();
+            _day = TimeUtil.GetCurDay();
             UpdateSupplyView();
         }
 
@@ -127,7 +100,7 @@ namespace GFGGame
             item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
             item.m_txtCount.text = supplyCfg.bonusArr[0][1].ToString();
 
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0]);
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0], false, "#FFF6ED");
             item.m_comCost.visible = false;
 
             if (MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id))

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

@@ -33,7 +33,7 @@ namespace GFGGame
         private int _rarityIndex = SORT_BY_HIGH_RARITY;
         private UI_TypeItem listTypeItem_FreedomDress;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
-
+        private int currentIndex = 0;
         private int _stepIndex = -1;
         private List<CustomSuitData> _dressMemory = new List<CustomSuitData>();
         public override void Dispose()
@@ -75,20 +75,7 @@ namespace GFGGame
             _ui.m_btnPhoto.visible = true;
             _ui.m_btnAction.visible = false;
 
-            // MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege3);
-            // string[] items = new string[3 + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
-            // for (int i = 0; i < items.Length; i++)
-            // {
-            //     if (i <= 3)
-            //     {
-
-            //     }else if(i<=(3+privilegeCfg.value1Arr[0])){
-
-
-            //     }else if()
-            // }
-
-            _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
+            // _ui.m_comboBox.items = new string[] { "我的套装一", "我的套装二", "我的套装三", "我的套装四", "我的套装五", "我的套装六" };
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
 
             InitLists();
@@ -148,10 +135,11 @@ namespace GFGGame
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-            _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
-            MyDressUpHelper.PutOnSuitSavedByPos(CustomSuitDataManager.currentIndex);
-            // UpdateStepBtn();
-            // AddMemoryDressup();
+
+            currentIndex = CustomSuitDataManager.currentIndex;
+            _ui.m_comboBox.items = CustomSuitDataManager.GetSuitPosItems();
+            _ui.m_comboBox.selectedIndex = currentIndex;
+            MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -216,6 +204,20 @@ namespace GFGGame
         }
         private void OnComboBoxChanged()
         {
+            if (_ui.m_comboBox.selectedIndex == currentIndex) return;
+            if (CustomSuitDataManager.GetPosType(_ui.m_comboBox.selectedIndex) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+            {
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GLOAD_CARD });
+                _ui.m_comboBox.selectedIndex = currentIndex;
+                return;
+            }
+            if (CustomSuitDataManager.GetPosType(_ui.m_comboBox.selectedIndex) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD });
+                _ui.m_comboBox.selectedIndex = currentIndex;
+                return;
+            }
+            currentIndex = _ui.m_comboBox.selectedIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(_ui.m_comboBox.selectedIndex);
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -94,7 +94,8 @@ namespace GFGGame
             _ui.m_effEnd.visible = false;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
-            _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.currentBoxId - 1; Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
+            _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.currentBoxId - 1;
+            //Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("cj_tp_" + LuckyBoxDataManager.Instance.currentBoxId);
 
             ResetStartView();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
         private DressUpObjUI _dressUpObjUIChangXi;
 
         private bool isActiveBoxOpen = false;
+        private int _activeBoxId = 0;
         private int _bgIndex = 0;
         private int _curIndex = 0;
 
@@ -96,10 +97,14 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnListBgScroll);
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnListBgScroll);
         }
-        protected override void OnShown()
+        protected override async void OnShown()
         {
             base.OnShown();
 
+            LuckyBoxDataManager.Instance.luckyBoxIds.Clear();
+            LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_2);
+            LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_3);
+
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
             if (this.viewData != null)
             {
@@ -113,20 +118,26 @@ namespace GFGGame
                     boxId = (int)this.viewData;
                 }
             }
+
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
-            isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
-            if (isActiveBoxOpen)
+            _activeBoxId = 0;
+            int result = await LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo();
+            if (result > 0)
             {
+                RotatingLuckyBoxCfg rotatingLuckyBox = RotatingLuckyBoxCfgArray.Instance.GetCfg(result);
+                _activeBoxId = rotatingLuckyBox.luckyBoxId;
+                LuckyBoxDataManager.Instance.endTime = TimeUtil.GetTimestamp(rotatingLuckyBox.endTime);
+                LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
                 Timers.inst.Add(1, 0, CheckTime);
             }
 
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
 
-            _curIndex = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, boxId);
-            _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Length;
+            _curIndex = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(boxId);
+            _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Count;
             _ui.m_listBg.ScrollToView(_curIndex);
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
 
@@ -137,8 +148,15 @@ namespace GFGGame
         }
         private string GetListItemResource(int index)
         {
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-            return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
+            if (index == 0 && _activeBoxId > 0)
+            {
+                return "UI://LuckyBox/ComBox";
+            }
+            else
+            {
+                int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
+                return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
+            }
         }
         private void RenderListBgItem(int index, GObject obj)
         {
@@ -149,8 +167,8 @@ namespace GFGGame
             loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[0]);
             GButton btnPreview = (obj as GComponent).GetChild("btnPreview").asButton;
             btnPreview.GetController("c1").selectedIndex = boxId;
-            GButton btnExchange = (obj as GComponent).GetChild("btnExchange").asButton;
-            btnExchange.GetController("c1").selectedIndex = boxId;
+            // GButton btnExchange = (obj as GComponent).GetChild("btnExchange").asButton;
+            // btnExchange.GetController("c1").selectedIndex = boxId;
             GTextField txtOwned = (obj as GComponent).GetChild("txtOwned").asTextField;
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             txtOwned.SetVar("v1", "" + count).FlushVars();
@@ -182,11 +200,11 @@ namespace GFGGame
             }
             btnBuyTen.data = boxId;
 
-            if (btnExchange.data == null)
-            {
-                btnExchange.onClick.Add(OnClickBtnExChange);
-            }
-            btnExchange.data = boxId;
+            // if (btnExchange.data == null)
+            // {
+            //     btnExchange.onClick.Add(OnClickBtnExChange);
+            // }
+            // btnExchange.data = boxId;
             if (btnPreview.data == null)
             {
                 btnPreview.onClick.Add(OnClickBtnPreview);
@@ -195,33 +213,39 @@ namespace GFGGame
 
             obj.data = boxId;
 
-            if (boxId == 1)
+            if (boxId == _activeBoxId)
             {
                 long endTime = LuckyBoxDataManager.Instance.endTime;
                 long curTime = TimeHelper.ServerNow();
                 TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
                 (obj as GComponent).GetChild("txtTime").asTextField.text = string.Format("剩余{0}{1}", num, str);
+
                 GGraph holder = (obj as GComponent).GetChild("holder").asGraph;
-                GGraph holder1 = (obj as GComponent).GetChild("holder1").asGraph;
+                holder.visible = false;
+                if (cfg.suitShowArr.Length > 0)
+                {
+                    //羲和
+                    holder.SetXY(cfg.suitShowArr[0][1], cfg.suitShowArr[0][2]);
+                    _dressUpObjUIXiHe.ResetSceneObj(100, false, false, null, false);
+                    _dressUpObjUIXiHe.dressUpObj.PutOnSuitCfg(cfg.suitShowArr[0][0], true, null, false, false);
+                    _dressUpObjUIXiHe.UpdateWrapper(holder);
+                }
 
-                //羲和
-                _dressUpObjUIXiHe.ResetSceneObj(100, false, false, null, false);
-                _dressUpObjUIXiHe.dressUpObj.PutOnSuitCfg(201013, true, null, false, false);
-                _dressUpObjUIXiHe.UpdateWrapper(holder);
 
-                //常曦
-                _dressUpObjUIChangXi.ResetSceneObj(100, false, false, null, false);
-                _dressUpObjUIChangXi.dressUpObj.PutOnSuitCfg(201006, true, null, false, false);
-                _dressUpObjUIChangXi.UpdateWrapper(holder1);
+                GGraph holder1 = (obj as GComponent).GetChild("holder1").asGraph;
+                holder1.visible = false;
+                if (cfg.suitShowArr.Length > 1)
+                {
+                    //羲和
+                    holder.SetXY(cfg.suitShowArr[1][1], cfg.suitShowArr[1][2]);
+                    //常曦
+                    _dressUpObjUIChangXi.ResetSceneObj(100, false, false, null, false);
+                    _dressUpObjUIChangXi.dressUpObj.PutOnSuitCfg(cfg.suitShowArr[1][0], true, null, false, false);
+                    _dressUpObjUIChangXi.UpdateWrapper(holder1);
+                }
             }
         }
 
-        // private void UpdateTime(object param)
-        // {
-        //     GTextField txtTime = _ui.m_listBg.GetChildAt(0).asCom.GetChild("txtTime").asTextField;
-        //     txtTime.text = TimeUtil.FormattingTime(LuckyBoxDataManager.Instance.startTime, LuckyBoxDataManager.Instance.startTime);
-        // }
-
         private void UpdateBg(object param)
         {
             string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
@@ -262,19 +286,11 @@ namespace GFGGame
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
 
-            // if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1)
-            // {
-            //     Timers.inst.Add(1, 0, CheckTime);
-            // }
-            // else
-            // {
-            //     Timers.inst.Remove(CheckTime);
-            // }
         }
 
         private void CheckTime(object param = null)
         {
-            if (LuckyBoxDataManager.Instance.currentBoxId != LuckyBoxDataManager.BOX_ID_1) return;
+            if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
             long endTime = LuckyBoxDataManager.Instance.endTime;
             long curTime = TimeHelper.ServerNow();
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
@@ -303,14 +319,14 @@ namespace GFGGame
 
             }
         }
-        private void OnClickBtnExChange(EventContext context)
-        {
-            GObject obj = context.sender as GObject;
-            int boxId = (int)obj.data;
-            int storeId = boxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
-            ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-            this.Hide();
-        }
+        // private void OnClickBtnExChange(EventContext context)
+        // {
+        //     GObject obj = context.sender as GObject;
+        //     int boxId = (int)obj.data;
+        //     int storeId = boxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
+        //     ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
+        //     this.Hide();
+        // }
         private void OnClickBtnPreview(EventContext context)
         {
             GObject obj = context.sender as GObject;

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

@@ -572,7 +572,8 @@ namespace GFGGame
         }
         private void OnClickBtnRenWu()
         {
-            ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            // ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
             // ViewManager.Show<DailyTaskView>();
         }

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

@@ -249,7 +249,7 @@ namespace GFGGame
         private void OnBtnShopClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas });
         }
 
         /// <summary>

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

@@ -1,5 +1,5 @@
 using UI.RoleInfo;
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
 using FairyGUI;
 using UI.CommonGame;
 
@@ -8,6 +8,8 @@ namespace GFGGame
     public class ChangeHeadView : BaseWindow
     {
         private UI_ChangeHead _ui;
+        private List<ItemCfg> _headCfgs = new List<ItemCfg>();
+        private List<ItemCfg> _headBorderCfgs = new List<ItemCfg>();
         private int _selectHeadId = 0;
         private int _selectHeadBorderId = 0;
 
@@ -47,6 +49,10 @@ namespace GFGGame
             base.OnShown();
             RoleInfoManager.Instance.SortHeadDatas();
             RoleInfoManager.Instance.SortHeadBorderDatas();
+            _headCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEAD));
+            _headCfgs = SoreItemCfgDatas(_headCfgs);
+            _headBorderCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEADBORDER));
+            _headBorderCfgs = SoreItemCfgDatas(_headBorderCfgs);
             OnTabChange();
             // _ui.m_list.selectedIndex = 0;
             // _ui.m_listBorder.selectedIndex = 0;
@@ -56,11 +62,18 @@ namespace GFGGame
         {
             base.OnHide();
             _ui.m_c1.selectedIndex = 0;
+            _headCfgs.Clear();
+            _headBorderCfgs.Clear();
         }
         private async void OnBtnSureClick()
         {
             if (_ui.m_c1.selectedIndex == 0)
             {
+                if (ItemDataManager.GetItemNum(_selectHeadId) <= 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("暂未获得");
+                    return;
+                }
                 bool result = await RoleInfoSProxy.ReqModifyRoleHead(_selectHeadId);
                 if (result)
                 {
@@ -69,6 +82,11 @@ namespace GFGGame
             }
             else
             {
+                if (ItemDataManager.GetItemNum(_selectHeadBorderId) <= 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("暂未获得");
+                    return;
+                }
                 bool result = await RoleInfoSProxy.ReqModifyRoleHeadBorder(_selectHeadBorderId);
                 if (result)
                 {
@@ -79,11 +97,11 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            int headId = RoleInfoManager.Instance.headDatas[index];
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(headId);
+            int headId = _headCfgs[index].id;
             UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
-            item.m_loaIcon.url = ResPathUtil.GetHeadPath(cfg.res);
+            item.m_loaIcon.url = ResPathUtil.GetHeadPath(_headCfgs[index].res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHead(headId);
+            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headId) <= 0;
             if (RoleInfoManager.Instance.isNewHead(headId))
             {
                 ItemProxy.ReqSetItemRead(headId).Coroutine();
@@ -98,12 +116,13 @@ namespace GFGGame
         private void RenderListBorderItem(int index, GObject obj)
         {
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
-            int headBorderId = RoleInfoManager.Instance.headBorderDatas[index];
-            ItemCfg borderCfg = ItemCfgArray.Instance.GetCfg(headBorderId);
+            ItemCfg borderCfg = _headBorderCfgs[index];
+            int headBorderId = borderCfg.id;
             UI_ListHeadBorderItem item = UI_ListHeadBorderItem.Proxy(obj);
             item.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
             item.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(borderCfg.res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHeadBorder(headBorderId);
+            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headBorderId) <= 0;
             if (RoleInfoManager.Instance.isNewHeadBorder(headBorderId))
             {
                 ItemProxy.ReqSetItemRead(headBorderId).Coroutine();
@@ -120,6 +139,7 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             _selectHeadId = (int)obj.data;
+
             UpdateView();
         }
 
@@ -127,6 +147,7 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             _selectHeadBorderId = (int)obj.data;
+
             UpdateView();
         }
 
@@ -136,11 +157,11 @@ namespace GFGGame
             _selectHeadBorderId = RoleDataManager.headBorderId;
             if (_ui.m_c1.selectedIndex == 0)
             {
-                _ui.m_list.numItems = RoleInfoManager.Instance.headDatas.Count;
+                _ui.m_list.numItems = _headCfgs.Count;
             }
             else
             {
-                _ui.m_listBorder.numItems = RoleInfoManager.Instance.headBorderDatas.Count; ;
+                _ui.m_listBorder.numItems = _headBorderCfgs.Count;
             }
             UpdateView();
         }
@@ -161,5 +182,18 @@ namespace GFGGame
                 _ui.m_txtDesc.text = headBorderCfg.desc;
             }
         }
+        private List<ItemCfg> SoreItemCfgDatas(List<ItemCfg> list)
+        {
+            list.Sort((ItemCfg a, ItemCfg b) =>
+            {
+                long hasA = ItemDataManager.GetItemNum(a.id);
+                long hasB = ItemDataManager.GetItemNum(b.id);
+                if (hasA > 0 && hasB <= 0) return -1;
+                if (hasB > 0 && hasA <= 0) return 1;
+
+                return a.id - b.id;
+            });
+            return list;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -43,24 +43,8 @@ namespace GFGGame
         {
             base.OnShown();
 
-
-            if (TimeHelper.ClientNow() < TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.refreshTime))
-            {
-                if (DateTime.Now.Month == 1)
-                {
-                    _month = 12;
-                }
-                else
-                {
-                    _month = DateTime.Now.Month - 1;
-                }
-            }
-            else
-            {
-                _month = DateTime.Now.Month;
-            }
-            MonthlyCardCfg cardCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.BlackGold);
-            _ui.m_list.numItems = cardCfg.clothesIdArr.Length;
+            _month = TimeUtil.GetCurMonth();
+            _ui.m_list.numItems = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear()).Count;
         }
 
         protected override void OnHide()
@@ -77,15 +61,14 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            MonthlyCardCfg cardCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.BlackGold);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardCfg.clothesIdArr[index]);
-
             UI_ListBlackRewardtem item = UI_ListBlackRewardtem.Proxy(obj);
-
+            MonthlyCardClothesCfg clothesCfg = MonthlyCardClothesCfgArray.Instance.GetCfgsByyear(TimeUtil.GetCurYear())[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(clothesCfg.clothesArr[0]);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_txtMonth.text = string.Format("{0}月", NumberUtil.GetChiniseNumberText(index + 1));
 
-            bool isCurMonth = index + 1 == _month;
+            item.m_txtMonth.text = string.Format("{0}月", clothesCfg.month);
+
+            bool isCurMonth = clothesCfg.month == _month;
             item.m_imgMask.visible = !isCurMonth;
             item.m_grpMonth.visible = isCurMonth;
             item.m_grpName.visible = isCurMonth;
@@ -94,7 +77,7 @@ namespace GFGGame
             {
                 item.target.onClick.Add(OnBtnGetClick);
             }
-            item.target.data = _month;
+            item.target.data = clothesCfg.month;
 
             UI_ListBlackRewardtem.ProxyEnd();
         }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -39,6 +39,7 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnBlackReward.onClick.Add(OnBtnBlackRewardClick);
@@ -104,6 +105,7 @@ namespace GFGGame
                     _ui.m_txtMoneyCount.text = privilegeCfg.value1Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value1Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = false;
+                    _ui.m_btnRule.data = 300010;
                     break;
                 case ConstStoreSubId.STORE_MONTH_BLACK_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
@@ -122,6 +124,7 @@ namespace GFGGame
                     _ui.m_txtMoneyCount.text = privilegeCfg.value2Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value2Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = true;
+                    _ui.m_btnRule.data = 300011;
                     break;
             }
 
@@ -141,6 +144,7 @@ namespace GFGGame
             _ui.m_loaMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_loaDailyMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_txtPrivilegeCount.text = privilegeCount.ToString();
+            _ui.m_txtTPrivilege.SetVar("value", privilegeCount.ToString()).FlushVars();
             _ui.m_btnGet.enabled = endTime > TimeHelper.ServerNow() && !isGot;
             _ui.m_btnGet.text = isGot ? "已领取" : "领取";
             _ui.m_btnGet.data = monthCfg.type; ;

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -14,6 +14,8 @@ namespace GFGGame
         private UI_StoreUI _ui;
         // private ValueBarController _valueBarController;
         private List<List<string>> _arenaSubTab = new List<List<string>>();
+
+        private List<string[]> _storeTabCfgs = new List<string[]>();
         private int _curTabIndex = 0;
         private int _curSubTabIndex = 0;
         private string _curViewName = "";
@@ -38,19 +40,14 @@ namespace GFGGame
             isfullScreen = true;
             this.bringToFontOnClick = false;
 
-            StoreTabCfg charge = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_CHARGE);
-            Debug.Log("charge[0]" + charge.subTabArr[0][0]);
-            Debug.Log("charge[0]" + charge.subTabArr[0][1]);
-            Debug.Log("charge[0]" + charge.subTabArr[0][2]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][0]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][1]);
-            Debug.Log("charge[1]" + charge.subTabArr[1][2]);
-            StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
-            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
-            for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
-            {
-                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
-            }
+            // StoreTabCfg charge = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_CHARGE);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][0]);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][1]);
+            // Debug.Log("charge[0]" + charge.subTabArr[0][2]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][0]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][1]);
+            // Debug.Log("charge[1]" + charge.subTabArr[1][2]);
+
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
 
@@ -68,11 +65,16 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            //this.viewData[functionId][subTabIndex]
+            StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
+            _arenaSubTab.Clear();
+            _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
+            for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
+            {
+                _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
+            }
+
             _curTabIndex = this.viewData == null ? ConstStoreTabId.STORE_CHARGE : (int)(this.viewData as object[])[0];
 
-            // StoreTabCfg tabCfg = StoreTabCfgArray.Instance.GetCfg(tabIndex);
-            // _curTabIndex = tabCfg == null ? 1 : tabCfg.index;
             _ui.m_comTab.m_c1.selectedIndex = _curTabIndex;
             _ui.m_comTab.target.scrollPane.SetPercX((float)(_curTabIndex - 1) / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
 
@@ -100,7 +102,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.Hide(_curViewName);
-            ViewManager.GoBackFrom(typeof(StoreView).FullName, false);
+            this.Hide();
         }
 
         private void OnTabChange()
@@ -118,7 +120,26 @@ namespace GFGGame
             }
             else
             {
-                _ui.m_listSubTab.numItems = tabCfg.subTabArr.Length;
+                _storeTabCfgs.Clear();
+                if (tabCfg.index == ConstStoreTabId.STORE_GIFT_BAG)
+                {
+                    for (int i = 0; i < tabCfg.subTabArr.Length; i++)
+                    {
+                        int menu2 = int.Parse(tabCfg.subTabArr[i][1]);
+                        if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
+                        {
+                            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+                            if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0) continue;
+                        }
+                        _storeTabCfgs.Add(tabCfg.subTabArr[i]);
+                    }
+
+                }
+                else
+                {
+                    _storeTabCfgs = new List<string[]>(tabCfg.subTabArr);
+                }
+                _ui.m_listSubTab.numItems = _storeTabCfgs.Count;
             }
             _ui.m_listSubTab.selectedIndex = 0;
             _curSubTabIndex = 0;
@@ -136,8 +157,8 @@ namespace GFGGame
             }
             else
             {
-                item.title = tabCfg.subTabArr[index][0];
-                menu2 = int.Parse(tabCfg.subTabArr[index][1]);
+                item.title = _storeTabCfgs[index][0];
+                menu2 = int.Parse(_storeTabCfgs[index][1]);
             }
             item.data = index;
             if (menu2 == ConstStoreSubId.STORE_CHARGE_ADDUP)
@@ -165,8 +186,8 @@ namespace GFGGame
             }
             else
             {
-                menu2 = int.Parse(tabCfg.subTabArr[index][1]);
-                viewName = tabCfg.subTabArr[index][2];
+                menu2 = int.Parse(_storeTabCfgs[index][1]);
+                viewName = _storeTabCfgs[index][2];
             }
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(viewName))
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -61,7 +61,23 @@ namespace GFGGame
         private void UpdateView()
         {
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+            _ui.m_txtNum1.visible = false;
+            _ui.m_txtNum0.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+
+            List<MonthlyCardPrivilegeCfg> privilegeCfgs = MonthlyCardPrivilegeCfgArray.Instance.GetCfgsByparamsType(1);
+            for (int i = 0; i < privilegeCfgs.Count; i++)
+            {
+                if (privilegeCfgs[i].paramsArr[0] == _limitId)
+                {
+                    _ui.m_txtNum1.visible = true;
+                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("金卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
+                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("黑金卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
+                    _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0, !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
+                    _ui.m_txtNum1.text = string.Format("2.道具兑换(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+                    break;
+                }
+            }
+
 
             ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _limitCfg.itemID, _limitCfg.itemNum, true);
 
@@ -100,7 +116,7 @@ namespace GFGGame
         }
         private void OnLimitChanged(EventContext context = null)
         {
-            if((int)context.data != _limitId)
+            if ((int)context.data != _limitId)
             {
                 return;
             }

GameClient/Assets/ResIn/Config.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3e788236d9da284e8fa725fc87ababd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b666127406be94f43992f57c49d5497b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityDay7.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dba4b17e28b32449eb0bb80017d0275d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta

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