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

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -4,8 +4,8 @@
     <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
     <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
     <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
-    <image id="n1_v5no" name="n1" src="v5notm1" fileName="images/lm_dt_zsx1.png" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="v5notm2" fileName="images/lm_dt_zsx2.png" xy="587,71" group="n11_v5no"/>
+    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="243,72" group="n11_v5no"/>
+    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="587,71" pivot="0.5,0" group="n11_v5no" scale="-1,1"/>
     <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
     <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
     <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>

FGUIProject/assets/Bag/package.xml

@@ -12,8 +12,6 @@
     <image id="v5notly" name="back.png" path="/images/"/>
     <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
     <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
-    <image id="v5notm1" name="lm_dt_zsx1.png" path="/images/"/>
-    <image id="v5notm2" name="lm_dt_zsx2.png" path="/images/"/>
     <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
     <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -5,10 +5,10 @@
     <loader id="n12_ehs9" name="loaIcon" xy="105,105" pivot="0.5,0.5" anchor="true" size="152,152" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
     <text id="n17_j48o" name="txtHasCount" xy="105,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="162,0" size="44,94" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale" autoSize="true"/>
-    <image id="n23_slyz" name="imgHas" src="volstnm" fileName="imagesNew/wp_own.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
+    <image id="n23_slyz" name="imgHas" src="volstnm" fileName="imagesNew/wp_own.png" xy="16,95" group="n29_pu55" visible="false"/>
     <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="16,91" size="178,40" group="n29_pu55" visible="false"/>
     <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="25,91" size="160,40" group="n29_pu55" visible="false"/>
-    <group id="n29_pu55" name="n29" xy="16,91" size="178,40" group="n30_9jv6" advanced="true"/>
+    <group id="n29_pu55" name="n29" xy="16,91" size="182,40" group="n30_9jv6" advanced="true"/>
     <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="49,49" group="n27_pu55"/>
     <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="63,80" size="85,49" group="n27_pu55"/>
     <group id="n27_pu55" name="grpGot" xy="49,49" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>

FGUIProject/assets/CommonGame/components/ComItem003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,210" pivot="0.5,0.5" overflow="hidden" opaque="false">
   <displayList>
-    <component id="n25_pu55" name="comItemIcon" src="volstnj" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <component id="n25_pu55" name="comItemIcon" src="volstnd" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
     <text id="n26_r9ri" name="txtName" xy="105,224" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
       <relation target="n25_pu55" sidePair="bottom-bottom"/>
     </text>

FGUIProject/assets/CommonGame/package.xml

@@ -300,7 +300,7 @@
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
     <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -339,11 +339,11 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
-    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
     <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
     <component id="volstnf" name="BtnStyle005.xml" path="/components/"/>
     <component id="volstng" name="BtnStyle006.xml" path="/components/"/>
-    <component id="volstnh" name="ComItem003.xml" path="/components/"/>
+    <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
     <image id="volstni" name="an_bt_bai.png" path="/imagesNew/"/>
     <image id="volstnj" name="an_bt_cut.png" path="/imagesNew/"/>
     <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/"/>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -5,8 +5,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="width-width,height-height,top-top"/>
     </image>
+    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
     <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
@@ -14,10 +15,9 @@
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
-    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,195" size="987,1724">
+    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
       <relation target="" sidePair="height-height"/>
     </component>
-    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,54"/>
     <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,13 @@
   <displayList>
     <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
-    <list id="n3_mbf1" name="listRewards" xy="99,65" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="93,65" size="662,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
     </list>

FGUIProject/assets/DailyWelfare/package.xml

@@ -68,7 +68,6 @@
     <image id="vols1r" name="hdbn_zsx.png" path="/images/"/>
     <image id="vols1s" name="hdrk_biaotz.png" path="/images/"/>
     <image id="vols1t" name="hdrk_zz.png" path="/images/"/>
-    <image id="vols1u" name="zjm_guanggao_kuang.png" path="/images/"/>
     <image id="vols1v" name="hd_sj_dkuang.png" path="/images/"/>
     <image id="vols1w" name="hdbn_db.png" path="/images/"/>
     <image id="vols1x" name="hdbn_mrbj.png" path="/images/"/>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1158">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n13_vols" name="n13" src="volstc4" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
-    <image id="n14_vols" name="n14" src="volstc5" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
-    <image id="n11_vols" name="n11" src="volstc3" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
+    <image id="n13_vols" name="n13" src="volstc9" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
+    <image id="n14_vols" name="n14" src="volstca" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
+    <image id="n11_vols" name="n11" src="volstc8" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
     <group id="n15_vols" name="n15" xy="-47,-130" size="1046,1353"/>
-    <image id="n16_vols" name="n16" src="volstbz" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
+    <image id="n16_vols" name="n16" src="volstcf" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
     <text id="n2_ga16" name="n2" xy="68,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="物"/>
     <text id="n17_vols" name="n17" xy="123,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="品"/>
     <text id="n18_vols" name="n18" xy="168,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="展"/>
     <text id="n19_vols" name="n19" xy="223,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="示"/>
     <group id="n20_vols" name="n20" xy="28,62" size="249,110" advanced="true"/>
-    <image id="n3_ga16" name="n3" src="volstc6" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
-      <Button title="物品预览" controller="c1" page="0"/>
+    <image id="n3_ga16" name="n3" src="volstcb" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="volstao" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
+      <Button controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
-      <Button checked="true" title="概率公示" controller="c1" page="1"/>
+    <component id="n5_ga16" name="btnProb" src="volstao" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
+      <Button title="概率公示" controller="c1" page="1"/>
     </component>
-    <image id="n12_vols" name="n12" src="volstc7" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
+    <image id="n12_vols" name="n12" src="volstcc" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
     <group id="n10_dhoa" name="n10" xy="33,181" size="896,75"/>
     <list id="n6_ga16" name="list" xy="96,318" size="770,735" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -14,6 +14,9 @@
     <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
+    <image id="n72_vols" name="n72" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <image id="n68_vols" name="n68" src="qi041j" fileName="images/cj_zizi_2.png" xy="392,545" group="n71_vols"/>
     <image id="n69_vols" name="n69" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="676,700" group="n71_vols"/>
     <text id="n70_vols" name="txtTime" xy="643,949" size="62,237" group="n71_vols" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>

FGUIProject/assets/LuckyBox/components/ButtonTab1.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="238,74" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
-  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_ga16" name="n0" src="volstc8" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+    <image id="n0_ga16" name="n0" src="volstcd" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" size="238,74">
       <gearDisplay controller="button" pages="1,2,3"/>
       <gearSize controller="c1" pages="1" values="238,74,-1,1" default="238,74,1,1"/>
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="770,355">
   <displayList>
-    <image id="n12_qr4e" name="n12" src="volstc9" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
+    <image id="n12_qr4e" name="n12" src="volstce" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
     <text id="n9_ga16" name="txtName" xy="57,6" size="84,54" fontSize="40" color="#5a3e16" text="示例"/>
-    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnk" autoClearItems="true">
+    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnh" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/LuckyBox/package.xml

@@ -72,6 +72,74 @@
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
     <component id="droitan" name="ComBagTime.xml" path="/components/"/>
+    <component id="volstao" name="ButtonTab1.xml" path="/components/"/>
+    <image id="volstap" name="zx_title_zi_star.png" path="/imageNews/"/>
+    <image id="volstaq" name="zx_title_zi_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstar" name="zx_tx_hengxiang.png" path="/imageNews/"/>
+    <image id="volstas" name="zx_tx_jiguang.png" path="/imageNews/"/>
+    <image id="volstat" name="zx_tx_qianjing.png" path="/imageNews/"/>
+    <image id="volstau" name="zx_tx_star.png" path="/imageNews/"/>
+    <image id="volstav" name="zx_tx_yuanquan.png" path="/imageNews/"/>
+    <image id="volstaw" name="zx_tx_zhongjian.png" path="/imageNews/"/>
+    <image id="volstax" name="zx_wp_baseboard.png" path="/imageNews/"/>
+    <image id="volstay" name="zx_wp_fen_bg.png" path="/imageNews/"/>
+    <image id="volstaz" name="zx_wp_fen_diguang.png" path="/imageNews/"/>
+    <image id="volstb0" name="zx_wp_fen_guangxiao.png" path="/imageNews/"/>
+    <image id="volstb1" name="zx_wp_fen_xian.png" path="/imageNews/"/>
+    <image id="volstb2" name="zx_wp_jin_bg.png" path="/imageNews/"/>
+    <image id="volstb3" name="zx_title_zi_guangxiao.png" path="/imageNews/"/>
+    <image id="volstb4" name="zx_wp_jin_diguang.png" path="/imageNews/"/>
+    <image id="volstb5" name="zx_wp_jin_jiaobiao.png" path="/imageNews/"/>
+    <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
+    <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
+    <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
+    <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
+    <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
+    <image id="volstbd" name="zx_yuan_tx_star.png" path="/imageNews/"/>
+    <image id="volstbe" name="zx_yuan_tx_waiquan.png" path="/imageNews/"/>
+    <image id="volstbf" name="zx_yulan_diaoshi.png" path="/imageNews/"/>
+    <image id="volstbg" name="zx_yulan_tubiao.png" path="/imageNews/"/>
+    <image id="volstbh" name="zx_yulan_tubiao_bg.png" path="/imageNews/"/>
+    <image id="volstbi" name="zx_yulan_xinggui.png" path="/imageNews/"/>
+    <image id="volstbj" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
+    <image id="volstbk" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
+    <image id="volstbl" name="zx_title_zi.png" path="/imageNews/"/>
+    <image id="volstbm" name="zx_title_guangdian.png" path="/imageNews/"/>
+    <image id="volstbn" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
+    <image id="volstbo" name="bt_tiaoguo.png" path="/imageNews/"/>
+    <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/" scale="9grid" scale9grid="24,9,48,18"/>
+    <image id="volstbq" name="zx_bg_yueliang.png" path="/imageNews/"/>
+    <image id="volstbr" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstbs" name="zx_jindu_bg.png" path="/imageNews/"/>
+    <image id="volstbt" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstbu" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
+    <image id="volstbv" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
+    <image id="volstbw" name="zx_lianxian_huang_star_1.png" path="/imageNews/"/>
+    <image id="volstbx" name="zx_lianxian_huang_star_2.png" path="/imageNews/"/>
+    <image id="volstby" name="zx_lianxian_huang_star_3.png" path="/imageNews/"/>
+    <image id="volstbz" name="zx_lianxian_huang_xia.png" path="/imageNews/"/>
+    <image id="volstc0" name="zx_lianxian_huang_xian.png" path="/imageNews/"/>
+    <image id="volstc1" name="zx_title_xianding.png" path="/imageNews/"/>
+    <image id="volstc2" name="zx_lianxian_lan_guangquan.png" path="/imageNews/"/>
+    <image id="volstc3" name="zx_lianxian_lan_star_1.png" path="/imageNews/"/>
+    <image id="volstc4" name="zx_lianxian_lan_star_2.png" path="/imageNews/"/>
+    <image id="volstc5" name="zx_lianxian_lan_star_3.png" path="/imageNews/"/>
+    <image id="volstc6" name="zx_lianxian_lan_xia.png" path="/imageNews/"/>
+    <image id="volstc7" name="zx_lianxian_lan_xian.png" path="/imageNews/"/>
+    <image id="volstc8" name="zx_tc_bg.png" path="/imageNews/"/>
+    <image id="volstc9" name="zx_tc_piaodai_shang.png" path="/imageNews/"/>
+    <image id="volstca" name="zx_tc_piaodai_xia.png" path="/imageNews/"/>
+    <image id="volstcb" name="zx_tc_tab_bg.png" path="/imageNews/" scale="9grid" scale9grid="25,18,104,36"/>
+    <image id="volstcc" name="zx_tc_tab_biankuang.png" path="/imageNews/"/>
+    <image id="volstcd" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
+    <image id="volstce" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
+    <image id="volstcf" name="zx_tc_title_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstcg" name="zx_title_bg.png" path="/imageNews/"/>
+    <image id="volstch" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
+    <image id="volstci" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
+    <image id="volstcj" name="cj_wz_jhsy.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -46,8 +46,7 @@
     <group id="n88_ktf2" name="n88" xy="607,162" size="443,132" group="n52_qqat" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
-      <relation target="" sidePair="right-right,top-top"/>
+    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" scrollItemToViewOnClick="false" foldInvisibleItems="true">
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
@@ -63,18 +62,23 @@
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="995,1597" pivot="0.5,0" anchor="true" size="102,117" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true"/>
-    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,457" group="n89_vols">
+    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
+    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,596" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,608" group="n89_vols" controller="c1,1">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,763" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,775" group="n89_vols" controller="c1,1">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="22,457" size="141,463" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true"/>
+    <group id="n89_vols" name="n89" xy="0,314" size="411,618" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
+      <relation target="" sidePair="left-left,top-top"/>
+    </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,13 +20,13 @@
     <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"/>
+    <component id="n54_psph" name="comTargetCard" src="volsov" fileName="components/ComTargetSkillShow.xml" xy="1180,420" pivot="0.5,0.5" anchor="true" aspect="true" scale="0.3,0.3"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="102,500" pivot="0.5,0.5" anchor="true" scale="0,0"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Scale" target="n54_psph" value="1,1"/>
-    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,540" endValue="995,540" duration="6" ease="Linear"/>
-    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="1,1" endValue="0,0" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n54_psph" value="0.3,0.3"/>
+    <item time="0" type="XY" target="n54_psph" tween="true" startValue="1180,420" endValue="995,420" duration="6" ease="Linear"/>
+    <item time="24" type="Scale" target="n54_psph" tween="true" startValue="0.3,0.3" endValue="0,0" duration="6" ease="Linear"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Scale" target="n55_psph" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>

FGUIProject/assets/Main/components/ComAd.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="381,145">
+  <displayList>
+    <image id="n95_vols" name="n95" src="volsop" fileName="imagesNew/zjm_guanggao_zsx.png" xy="-4,21" group="n98_vols"/>
+    <list id="n90_vols" name="listAd" xy="0,0" size="381,131" group="n98_vols" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="8" defaultItem="ui://mfvz4q8kvolsot">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n94_vols" name="listAdSelect" xy="179,106" pivot="1,0" size="187,14" group="n98_vols" layout="row" scroll="horizontal" colGap="10" defaultItem="ui://mfvz4q8kvolsou" align="right">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n96_vols" name="n96" src="volsom" fileName="imagesNew/zjm_guanggao_kuang.png" xy="0,0" group="n98_vols"/>
+    <group id="n98_vols" name="n98" xy="-4,0" size="385,135" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComAdSelectItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="14,14" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_vols" name="n0" src="volsoo" fileName="imagesNew/zjm_guanggao_point_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_vols" name="n1" src="volson" fileName="imagesNew/zjm_guanggao_point_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Main/components/ComTargetSkillShow.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="546,997" overflow="hidden">
+  <displayList>
+    <image id="n18_vols" name="n18" src="qkjsjv" fileName="imagesNew/dikuang_card_light2.png" xy="-267,-67" group="n14_idkd"/>
+    <graph id="n15_idkd" name="holderBottom" xy="268,538" size="10,10" group="n14_idkd" type="rect"/>
+    <image id="n13_idkd" name="n13" src="qkjskb" fileName="imagesNew/dikuang_card.png" xy="0,96" group="n14_idkd"/>
+    <component id="n0_py00" name="comSkillCard" src="py009o" fileName="components/ComSkillCard.xml" xy="11,95" pivot="0.5,0.5" group="n14_idkd"/>
+    <component id="n6_om9f" name="ComSkillScore" src="om9f9w" fileName="components/ComSkillScore.xml" xy="322,129" pivot="0.5,0.5" group="n14_idkd"/>
+    <text id="n17_idkd" name="txtName" xy="46,0" size="454,79" group="n21_vols" visible="false" font="ui://eg2y0ldpa0cftks" fontSize="60" color="#fefef6" align="center" ubb="true" autoSize="none" text="月中天"/>
+    <graph id="n16_idkd" name="holderTop" xy="275,512" size="10,10" group="n21_vols" type="rect"/>
+    <image id="n19_vols" name="n19" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="404,22" group="n21_vols"/>
+    <image id="n20_vols" name="n20" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="0,22" pivot="0.5,0" group="n21_vols" scale="-1,1"/>
+    <group id="n21_vols" name="n21" xy="0,0" size="546,522" group="n14_idkd" visible="false" advanced="true"/>
+    <group id="n14_idkd" name="n14" xy="-267,-67" size="1080,1156"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="true"/>
+    <item time="0" type="Visible" target="n16_idkd" value="true"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="-802,0" endValue="11,0" duration="18" ease="Expo.Out"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="802,1" endValue="0,1" duration="18" ease="Expo.Out"/>
+    <item time="18" type="Scale" target="n6_om9f" tween="true" startValue="0,0" endValue="1.4,1.4" duration="6" ease="Linear"/>
+    <item time="18" type="Visible" target="n17_idkd" value="true"/>
+    <item time="18" type="Visible" target="n6_om9f" value="true"/>
+    <item time="24" type="Scale" target="n6_om9f" tween="true" startValue="1.4,1.4" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="60" type="Visible" target="n17_idkd" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="false"/>
+    <item time="0" type="Visible" target="n16_idkd" value="false"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="11,0" endValue="-802,0" duration="18" ease="Expo.In"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="0,1" endValue="802,1" duration="18" ease="Expo.In"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/ListAdItem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="381,131">
+  <displayList>
+    <loader id="n91_vols" name="loaRes" xy="0,0" size="381,131" url="ui://mfvz4q8kvolsoi" autoSize="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/package.xml

@@ -452,8 +452,8 @@
     <component id="psphix" name="ComDeduction.xml" path="/components/"/>
     <component id="psphiy" name="ComSkillShow.xml" path="/components/"/>
     <component id="psphiz" name="ComTargetCard.xml" path="/components/"/>
-    <component id="psphj0" name="ComClick.xml" path="/"/>
-    <component id="psphj1" name="ComSkillTips.xml" path="/"/>
+    <component id="psphj0" name="ComClick(1).xml" path="/components/"/>
+    <component id="psphj1" name="ComSkillTips.xml" path="/components/"/>
     <component id="psphj2" name="ComAllCircle.xml" path="/components/"/>
     <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
     <component id="psphj5" name="ComClick.xml" path="/components/"/>
@@ -628,18 +628,22 @@
     <image id="volsod" name="zjm_tb_cz_xsqg.png" path="/imagesNew/"/>
     <image id="volsoe" name="zjm_tb_db_hd.png" path="/imagesNew/" scale="9grid" scale9grid="35,7,70,14"/>
     <image id="volsof" name="zjm_tb_hd.png" path="/imagesNew/"/>
-    <image id="volsog" name="zjm_tb_jhsy.png" path="/imagesNew/"/>
+    <image id="volsog" name="zjm_tb_jhsy.png" path="/imagesNew/" exported="true"/>
     <image id="volsoh" name="zjm_tb_qrhd.png" path="/imagesNew/"/>
-    <image id="volsoi" name="guanggao_mrqd.png" path="/imagesNew/"/>
-    <image id="volsoj" name="guanggao_xsgl_kqdnf.png" path="/imagesNew/"/>
-    <image id="volsok" name="guanggao_xslc_wylh.png" path="/imagesNew/"/>
-    <image id="volsol" name="guanggao_xslc_xslgt.png" path="/imagesNew/"/>
+    <image id="volsoi" name="guanggao_mrqd.png" path="/imagesNew/" exported="true"/>
+    <image id="volsoj" name="guanggao_kqdnf.png" path="/imagesNew/" exported="true"/>
+    <image id="volsok" name="guanggao_wylh.png" path="/imagesNew/" exported="true"/>
+    <image id="volsol" name="guanggao_xslgt.png" path="/imagesNew/" exported="true"/>
     <image id="volsom" name="zjm_guanggao_kuang.png" path="/imagesNew/"/>
     <image id="volson" name="zjm_guanggao_point_1.png" path="/imagesNew/"/>
     <image id="volsoo" name="zjm_guanggao_point_2.png" path="/imagesNew/"/>
     <image id="volsop" name="zjm_guanggao_zsx.png" path="/imagesNew/"/>
     <component id="volsoq" name="BtnModle1.xml" path="/components/"/>
     <image id="volsor" name="zjm_gn_yj.png" path="/images/"/>
+    <component id="volsos" name="ComAd.xml" path="/components/"/>
+    <component id="volsot" name="ListAdItem.xml" path="/components/"/>
+    <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
+    <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -3,7 +3,7 @@
   <displayList>
     <loader id="n0_r9ri" name="bg" xy="0,0" size="960,665" touchable="false" url="ui://374k3dwvr9riw" autoSize="true"/>
     <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
-    <text id="n15_oqa1" name="n15" xy="432,87" size="95,62" group="n16_oqa1" fontSize="46" color="#a98151" text="设置"/>
+    <text id="n15_oqa1" name="n15" xy="432,87" size="95,61" group="n16_oqa1" fontSize="46" color="#a98151" text="设置"/>
     <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
     <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="511,488" aspect="true">
       <Button title="注销账户"/>
@@ -12,10 +12,14 @@
       <Button title="返回登录"/>
     </component>
     <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" fontSize="42" color="#c58c88" text="音乐"/>
-    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri"/>
+    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri">
+      <Button checked="true"/>
+    </component>
     <group id="n12_r9ri" name="n12" xy="144,273" size="244,61"/>
     <text id="n5_r9ri" name="n5" xy="572,272" size="87,56" group="n11_r9ri" fontSize="42" color="#c58c88" text="音效"/>
-    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri"/>
+    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri">
+      <Button checked="true"/>
+    </component>
     <group id="n11_r9ri" name="n11" xy="572,272" size="243,59"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="448,590">
   <displayList>
-    <image id="n48_r9ri" name="n48" src="r9ri15" fileName="images/grxx_zyjiah.png" xy="0,0"/>
+    <image id="n48_r9ri" name="n48" src="volsgh" fileName="images/grxc_db.png" xy="0,0"/>
+    <image id="n50_vols" name="imgNone" src="volsgi" fileName="images/tb_jiahao.png" xy="122,193"/>
     <component id="n49_r9ri" name="comPhoto" src="r9ri1o" fileName="components/ComPhoto.xml" xy="2,2" size="444,586"/>
+    <image id="n55_vols" name="n55" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="202,249" group="n54_vols"/>
+    <image id="n51_vols" name="n51" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="13,287" group="n54_vols"/>
+    <text id="n52_vols" name="txtLock" xy="163,274" pivot="0.5,0" size="122,42" group="n54_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#d7c09f" align="center" vAlign="middle" leading="1" text="金卡开启"/>
+    <image id="n53_vols" name="n53" src="volsgj" fileName="componentsBg/lm_dt_zsx2.png" xy="305,287" group="n54_vols"/>
+    <group id="n54_vols" name="grpLock" xy="13,249" size="422,66" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/components/ListPhotoItem1.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="512,740">
   <displayList>
-    <component id="n1_r9ri" name="comIcon" src="r9ri1q" fileName="components/ComIcon.xml" xy="0,0"/>
-    <image id="n2_r9ri" name="n2" src="r9ri1t" fileName="images/xc_kuangdi.png" xy="0,0"/>
-    <text id="n3_r9ri" name="txtTime" xy="88,691" pivot="0.5,0" size="335,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
-    <image id="n4_r9ri" name="imgOtherSelect" src="r9ri1s" fileName="images/xc_xzxd.png" xy="0,0"/>
+    <component id="n1_r9ri" name="comIcon" src="r9ri1q" fileName="components/ComIcon.xml" xy="0,1"/>
+    <image id="n2_r9ri" name="n2" src="r9ri1t" fileName="images/xc_kuangdi.png" xy="0,0" size="512,696"/>
+    <text id="n3_r9ri" name="txtTime" xy="110,691" pivot="0.5,0" size="290,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
+    <image id="n4_r9ri" name="imgOtherSelect" src="r9ri1s" fileName="images/xc_xzxd.png" xy="0,0" size="512,695"/>
     <image id="n5_oqa1" name="imgSelect" src="oqa1g1" fileName="images/xc_qxxzxd.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -48,7 +48,6 @@
     <image id="r9ri12" name="grxx_zyddt.png" path="/images/" scale="9grid" scale9grid="267,350,534,700"/>
     <image id="r9ri13" name="grxx_zydik.png" path="/images/"/>
     <image id="r9ri14" name="grxx_zygrxc.png" path="/images/"/>
-    <image id="r9ri15" name="grxx_zyjiah.png" path="/images/"/>
     <image id="r9ri16" name="grxx_zyshul.png" path="/images/"/>
     <image id="r9ri17" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri18" name="grxx_grxcxc.png" path="/images/"/>
@@ -63,8 +62,8 @@
     <component id="r9ri1o" name="ComPhoto.xml" path="/components/"/>
     <component id="r9ri1p" name="Button5.xml" path="/components/"/>
     <component id="r9ri1q" name="ComIcon.xml" path="/components/"/>
-    <image id="r9ri1s" name="xc_xzxd.png" path="/images/"/>
-    <image id="r9ri1t" name="xc_kuangdi.png" path="/images/"/>
+    <image id="r9ri1s" name="xc_xzxd.png" path="/images/" scale="9grid" scale9grid="128,173,256,346"/>
+    <image id="r9ri1t" name="xc_kuangdi.png" path="/images/" scale="9grid" scale9grid="128,173,256,346"/>
     <component id="r9ri1v" name="ListPhotoItem1.xml" path="/components/"/>
     <image id="r9ri1w" name="xc_xczi.png" path="/images/"/>
     <image id="r9ri1x" name="hl_sczpxzdik.png" path="/images/" scale="9grid" scale9grid="146,20,292,40"/>
@@ -75,6 +74,9 @@
     <component id="v95qg2" name="OtherRoleInfoUI.xml" path="/" exported="true"/>
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
+    <image id="volsgh" name="grxc_db.png" path="/images/"/>
+    <image id="volsgi" name="tb_jiahao.png" path="/images/"/>
+    <image id="volsgj" name="lm_dt_zsx2.png" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -5,7 +5,7 @@
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
     </image>
-    <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <text id="n19_nd17" name="LeftTime" xy="37,240" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
     <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
       <relation target="" sidePair="left-left"/>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="346,22" extention="ProgressBar">
+  <controller name="c1" pages="0,未满,1,已满" selected="1"/>
   <displayList>
     <image id="n0_e3m1" name="n0" src="uxxstn2" fileName="images/jyt_dk.png" xy="0,0" size="346,22">
       <relation target="" sidePair="width-width,height-height"/>
@@ -8,8 +9,14 @@
     <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-103,-54"/>
     <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>
-    <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}"/>
-    <image id="n7_e3m1" name="n7" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="2,-40"/>
+    <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" group="n8_cj0b" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
+    <loader id="n7_e3m1" name="icon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
+    <group id="n8_cj0b" name="n8" xy="2,-47" size="119,44" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <text id="n9_cj0b" name="n9" xy="20,-46" size="101,42" fontSize="30" color="#7a4e22" autoSize="none" text="已满级">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/Task/components/TabButton.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="261,72" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_ids4" name="n0" src="uxxstmk" fileName="images/yeqian_xz.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -111,6 +111,8 @@ namespace GFGGame
             await ShopSProxy.ReqShopInfo();
             await StudioSProxy.ReqStudioInfos();
             await RoleInfoSProxy.ReqPersonalInfo();
+            await ActivityGlobalSProxy.GetActivityInfo();
+
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
             long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
@@ -258,7 +260,6 @@ namespace GFGGame
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
-            ActivityGlobalSProxy.GetActivityInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -68,7 +68,8 @@ namespace GFGGame
             var battlePassLevel = GetBattlePassLevel();
             if (level > battlePassLevel) return 0;
             if (!NormalRewards.Contains(level)) return 1;
-            return SuperRewards.Contains(level) ? 2 : 3;
+            if (!IsBuy) return 3;
+            return SuperRewards.Contains(level) ? 2 : 1;
         }
 
         //检查普通领取状态

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

@@ -250,5 +250,12 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.SUIT_BOX_STATUS_CHANGED, suitId);
         }
 
+        //检查套装是否有动作资源
+        public static bool CheckSuitHasActionRes(int suitId)
+        {
+            var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            return suitCfg != null && ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+        }
+
     }
 }

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

@@ -218,5 +218,40 @@ namespace GFGGame
             comLv.m_txtLvl.text = lv > 0 ? lv.ToString() : "--";
             UI_ComHeadLv.ProxyEnd();
         }
+
+        public static string[] GetSuitPosItems()
+        {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege4);
+            string[] posItems = new string[GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0] + privilegeCfg.value2Arr[0]];
+            for (int i = 0; i < posItems.Length; i++)
+            {
+                posItems[i] = "";
+                if (GetPosType(i) == 0)
+                {
+                    posItems[i] = "";
+                }
+                else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+                {
+                    posItems[i] = "金卡开启";
+                }
+                else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+                {
+                    posItems[i] = "黑金卡开启";
+                }
+            }
+            return posItems;
+        }
+
+        //获取指定位置月卡类型
+        public static int GetPosType(int pos)
+        {
+            if (pos < GlobalCfgArray.globalCfg.freeAlbumNum) return 0;
+
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege4);
+            if (pos < GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0]) return MonthCardType.Gold;
+            if (pos >= GlobalCfgArray.globalCfg.freeAlbumNum + privilegeCfg.value1Arr[0]) return MonthCardType.BlackGold;
+
+            return 0;
+        }
     }
 }

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

@@ -141,16 +141,23 @@ namespace GFGGame
                         name = EctypeCfgArray.Instance
                             .GetCfgBytypeAndsubType(taskCfg.paramsArr[0], taskCfg.paramsArr[1]).subName;
                     }
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, name);
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), name);
                 case ConstTaskType.UseItem:
+                case ConstTaskType.Suitsynthesis:
                     var cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), cfg.name);
                 case ConstTaskType.UpgradeCardLvl:
                 case ConstTaskType.UpgradeCardStar:
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
-                default: return string.Format(activeRewardCfg.desc, taskCfg.count);
+                case ConstTaskType.FinishStory:
+                case ConstTaskType.FinishInstanceZones:
+                {
+                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                }
+                default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
+
         /// <summary>
         /// 任务界面跳转
         /// </summary>
@@ -164,7 +171,7 @@ namespace GFGGame
                     if (LeagueDataManager.Instance.Type == 1)
                     {
                         ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                        ViewManager.Show($"GFGGame.{jumpId}", null);
+                        ViewManager.Show($"GFGGame.{jumpId}");
                     }
                     else
                     {

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -47,18 +47,6 @@ namespace GFGGame
             }
         }
 
-        public bool HasSuitActionRes
-        {
-            get
-            {
-                if (_dressUpData.suitId > 0)
-                {
-                    return SuitCfgArray.Instance.CheckSuitHasAction(_dressUpData.suitId);
-                }
-                return false;
-            }
-        }
-
         public List<int> itemList
         {
             get
@@ -305,7 +293,8 @@ namespace GFGGame
             }
             TakeOffAll(false);
             _dressUpData.suitId = id;
-            _dressUpData.actionId = (HasSuitActionRes && tryShowAction) ? id : 0;
+            bool hasSuitActionRes = DressUpMenuSuitDataManager.CheckSuitHasActionRes(_dressUpData.suitId);
+            _dressUpData.actionId = (hasSuitActionRes && tryShowAction) ? id : 0;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.suitId);
             List<int> items = new List<int>(suitCfg.partsArr);
             if (showOptional)
@@ -336,6 +325,63 @@ namespace GFGGame
             UpdateWholeBodyView();
         }
 
+        //穿上一个动作
+        public void PutOnAction(int actionId)
+        {
+            bool hasSuitActionRes = DressUpMenuSuitDataManager.CheckSuitHasActionRes(_dressUpData.suitId);
+            _dressUpData.actionId = actionId;
+            if(hasSuitActionRes)
+            {
+                foreach (int itemId in itemList)
+                {
+                    bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
+                    if (!replaceableByAction)
+                    {
+                        AddOrRemove(itemId, false, false, true);
+                    }
+                }
+            }
+            else
+            {
+                CancelAction(true);
+            }
+            checkDefaultItem();
+            UpdateWholeBodyView();
+        }
+
+        //取消动作
+        public void CancelAction(bool changeToStand = false)
+        {
+            if (_dressUpData.actionId <= 0)
+            {
+                return;
+            }
+            var tempActionId = _dressUpData.actionId;
+            _dressUpData.actionId = 0;
+            if (changeToStand)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(tempActionId);
+                List<int> items = new List<int>(suitCfg.partsArr);
+                if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
+                {
+                    items.AddRange(suitCfg.partsOptionalArr);
+                }
+                foreach (int itemId in items)
+                {
+                    if (DressUpMenuItemDataManager.CheckHasItem(itemId))
+                    {
+                        bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, tempActionId);
+                        if (!replaceableByAction)
+                        {
+                            AddOrRemove(itemId, false, true);
+                        }
+                    }
+                }
+            }
+            checkDefaultItem();
+            UpdateWholeBodyView();
+        }
+
         //穿戴一组换装数据
         public void PutOnDressUpData(DressUpData dressUpData)
         {
@@ -538,8 +584,8 @@ namespace GFGGame
             if (IsAction)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
-                var hasAniRes = !string.IsNullOrEmpty(suitCfg.aniRes);
-                var res = hasAniRes ? suitCfg.aniRes : suitCfg.picRes;
+                var hasAniRes = ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
+                var res = hasAniRes ? suitCfg.aniRes : null;
                 DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, suitCfg.effRes, false, _roleObj);
             }
             else
@@ -548,57 +594,6 @@ namespace GFGGame
             }
         }
 
-        //穿上一个动作
-        public void PutOnAction(int actionId)
-        {
-            _dressUpData.actionId = actionId;
-            foreach (int itemId in itemList)
-            {
-                bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, _dressUpData.actionId);
-                if (!replaceableByAction)
-                {
-                    AddOrRemove(itemId, false, false, true);
-                }
-            }
-            checkDefaultItem();
-            UpdateWholeBodyView();
-        }
-
-        //取消动作
-        public void CancelAction(bool changeToStand = false)
-        {
-            if (_dressUpData.actionId <= 0)
-            {
-                return;
-            }
-            var tempActionId = _dressUpData.actionId;
-            _dressUpData.actionId = 0;
-            if(changeToStand)
-            {
-                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(tempActionId);
-                List<int> items = new List<int>(suitCfg.partsArr);
-                if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
-                {
-                    items.AddRange(suitCfg.partsOptionalArr);
-                }
-                int subType = 0;
-                foreach (int itemId in items)
-                {
-                    if (DressUpMenuItemDataManager.CheckHasItem(itemId))
-                    {
-                        subType = ItemUtilCS.GetItemSubType(itemId);
-                        bool replaceableByAction = SuitCfgArray.Instance.CheckItemReaplaceableByAction(itemId, tempActionId);
-                        if (!replaceableByAction)
-                        {
-                            AddOrRemove(itemId, false, true);
-                        }
-                    }
-                }
-            }
-            checkDefaultItem();
-            UpdateWholeBodyView();
-        }
-
         
     }
 }

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetCard.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d96de092cb5e39e4e8b216fb575a111d
+guid: dd3f87a14b967fd45b529541ea799c45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ButtonTab1
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://drx9d1usvolstao";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ButtonTab1";
+        private static UI_ButtonTab1 _proxy;
+
+        public static UI_ButtonTab1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonTab1();
+            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_ButtonTab1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonTab1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxPreShowUI.cs

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_btnItem;
-        public GComponent m_btnProb;
+        public UI_ButtonTab1 m_btnItem;
+        public UI_ButtonTab1 m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
         public const string URL = "ui://drx9d1usga16e";
@@ -60,15 +60,17 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnItem = (GComponent)comp.GetChild("btnItem");
-            m_btnProb = (GComponent)comp.GetChild("btnProb");
+            m_btnItem = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnItem"));
+            m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnItem.Dispose();
             m_btnItem = null;
+            m_btnProb.Dispose();
             m_btnProb = null;
             m_list = null;
             m_compText.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetCard.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAd.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComTargetCard
+    public partial class UI_ComAd
     {
         public GComponent target;
-        public GLoader m_loaCard;
-        public GTextField m_txtScore;
-        public const string URL = "ui://mfvz4q8kpsphiz";
+        public GList m_listAd;
+        public GList m_listAdSelect;
+        public const string URL = "ui://mfvz4q8kvolsos";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComTargetCard";
-        private static UI_ComTargetCard _proxy;
+        public const string RES_NAME = "ComAd";
+        private static UI_ComAd _proxy;
 
-        public static UI_ComTargetCard Create(GObject gObject = null)
+        public static UI_ComAd Create(GObject gObject = null)
         {
-            var ui = new UI_ComTargetCard();
+            var ui = new UI_ComAd();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComTargetCard Proxy(GObject gObject = null)
+        public static UI_ComAd Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComTargetCard();
+                _proxy = new UI_ComAd();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaCard = (GLoader)comp.GetChild("loaCard");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_listAd = (GList)comp.GetChild("listAd");
+            m_listAdSelect = (GList)comp.GetChild("listAdSelect");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaCard = null;
-            m_txtScore = null;
+            m_listAd = null;
+            m_listAdSelect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAd.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetSkillShow.cs

@@ -0,0 +1,91 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComTargetSkillShow
+    {
+        public GComponent target;
+        public GGraph m_holderBottom;
+        public UI_ComSkillCard m_comSkillCard;
+        public UI_ComSkillScore m_ComSkillScore;
+        public GTextField m_txtName;
+        public GGraph m_holderTop;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kvolsov";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComTargetSkillShow";
+        private static UI_ComTargetSkillShow _proxy;
+
+        public static UI_ComTargetSkillShow Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTargetSkillShow();
+            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_ComTargetSkillShow Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTargetSkillShow();
+            }
+            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_holderBottom = (GGraph)comp.GetChild("holderBottom");
+            m_comSkillCard = (UI_ComSkillCard)UI_ComSkillCard.Create(comp.GetChild("comSkillCard"));
+            m_ComSkillScore = (UI_ComSkillScore)UI_ComSkillScore.Create(comp.GetChild("ComSkillScore"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_holderTop = (GGraph)comp.GetChild("holderTop");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holderBottom = null;
+            m_comSkillCard.Dispose();
+            m_comSkillCard = null;
+            m_ComSkillScore.Dispose();
+            m_ComSkillScore = null;
+            m_txtName = null;
+            m_holderTop = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComTargetSkillShow.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListAdItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListAdItem
+    {
+        public GComponent target;
+        public GLoader m_loaRes;
+        public const string URL = "ui://mfvz4q8kvolsot";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListAdItem";
+        private static UI_ListAdItem _proxy;
+
+        public static UI_ListAdItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListAdItem();
+            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_ListAdItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListAdItem();
+            }
+            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_loaRes = (GLoader)comp.GetChild("loaRes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaRes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListAdItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -21,6 +21,7 @@ namespace UI.Main
         public GList m_list;
         public UI_ButtonChange m_btnChange;
         public GGroup m_grpList;
+        public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnActivityDay7;
         public UI_BtnModle1 m_btnActivityLuckyBox;
@@ -100,6 +101,7 @@ namespace UI.Main
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_grpList = (GGroup)comp.GetChild("grpList");
+            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityLuckyBox"));
@@ -146,6 +148,8 @@ namespace UI.Main
             m_btnChange.Dispose();
             m_btnChange = null;
             m_grpList = null;
+            m_comListAd.Dispose();
+            m_comListAd = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnActivityDay7.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -14,7 +14,7 @@ namespace UI.Main
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_ComTargetCard m_comTargetCard;
+        public UI_ComTargetSkillShow m_comTargetCard;
         public UI_ComDeduction m_comDeduction;
         public Transition m_t1;
         public Transition m_t2;
@@ -72,7 +72,7 @@ namespace UI.Main
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCard = (UI_ComTargetCard)UI_ComTargetCard.Create(comp.GetChild("comTargetCard"));
+            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
             m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");

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

@@ -7,7 +7,10 @@ namespace UI.RoleInfo
     public partial class UI_ListPhotoItem
     {
         public GComponent target;
+        public GImage m_imgNone;
         public UI_ComPhoto m_comPhoto;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://374k3dwvr9ri1m";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListPhotoItem";
@@ -55,12 +58,18 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_imgNone = (GImage)comp.GetChild("imgNone");
             m_comPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("comPhoto"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgNone = null;
             m_comPhoto.Dispose();
             m_comPhoto = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs

@@ -7,8 +7,10 @@ namespace UI.Task
     public partial class UI_ExpProcess
     {
         public GProgressBar target;
+        public Controller m_c1;
         public GTextField m_Level;
         public GTextField m_NumProcess;
+        public GLoader m_icon;
         public const string URL = "ui://5mpsibzze3m1tnl";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "ExpProcess";
@@ -56,13 +58,17 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_Level = (GTextField)comp.GetChild("Level");
             m_NumProcess = (GTextField)comp.GetChild("NumProcess");
+            m_icon = (GLoader)comp.GetChild("icon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_Level = null;
             m_NumProcess = null;
+            m_icon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using GFGGame;
@@ -102,7 +103,7 @@ namespace GFGGame
         }
 
         //C2S_GetAllBattlePassReward
-        public static async ETTask<bool> GetAllBattlePassReward()
+        public static async ETTask<bool> GetAllBattlePassReward(Action onSuccess = null)
         {
             var response =
                 (S2C_GetAllBattlePassReward)await MessageHelper.SendToServer(new C2S_GetAllBattlePassReward());
@@ -131,7 +132,7 @@ namespace GFGGame
                     dataManager.AddSuperReward(level);
                 }
             }
-            BonusController.TryShowBonusList(bonusList);
+            BonusController.TryShowBonusList(bonusList, onSuccess);
             return true;
         }
 

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

@@ -111,6 +111,17 @@ namespace GFGGame
         {
             return $"{ANIMATION_DIR_PATH}/DressUp/{res}/{res}.{extName}";
         }
+
+        public static bool CheckDressUpAnimationExist(string res, string extName = "prefab")
+        {
+            if(string.IsNullOrEmpty(res))
+            {
+                return false;
+            }
+            string resPath = ResPathUtil.GetDressUpAnimationPath(res, extName);
+            return VEngine.Versions.Contains(resPath);
+        }
+
         public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
         {
             if(inAni)

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

@@ -147,7 +147,7 @@ namespace GFGGame
             item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
             item.m_txtCount.text =
-                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.count}";
+                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
             if (item.m_GetRewardBt.data == null)
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             //领取状态
             int state = TaskDataManager.Instance.GetTaskStateById(_taskCfgs[index].id);
             item.m_c1.selectedIndex = state == ConstBonusStatus.CAN_NOT_GET && !string.IsNullOrEmpty(_taskCfgs[index].jumpId) ? 3 : state;
-            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].count);
+            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].GetTargetCount());
 
             if (item.m_btnGet.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()

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

@@ -123,7 +123,7 @@ namespace GFGGame
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
-            int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
+            int[] reward = ((int[][])obj.parent.data)[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -334,7 +334,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }
@@ -370,7 +371,8 @@ namespace GFGGame
             if (t_skillScoreSelf > 0)
             {
                 _targetSkillScore += t_skillScoreSelf;
-                _ui.m_comTargetCard.m_txtScore.text = t_skillScoreSelf.ToString();
+                _ui.m_comTargetCard.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(ItemCfgArray.Instance.GetCfg(targetData.cardId).res);
+                _ui.m_comTargetCard.m_ComSkillScore.m_txtCount.text = t_skillScoreSelf.ToString();
                 _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_t1.Play();
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -66,7 +66,7 @@ namespace GFGGame
                 string res = skillCfg.res;
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
-                    res = "kp_mengying";
+                    res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
                     ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);

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

@@ -20,6 +20,9 @@ namespace GFGGame
         private bool isOpen = false;
         private int _actLuckyBoxId = 0;
         private int _actLimitChargeId = 0;
+        private List<AdCfg> _adIds = new List<AdCfg>();
+        private Vector2 _startPos;
+        private Vector2 _endPos;
         private GButton _btnGongGao;
         private GButton _btnHaoYou;
         private GButton _btnYouJian;
@@ -160,8 +163,15 @@ namespace GFGGame
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
 
+            _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
+            _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
+            _ui.m_comListAd.m_listAd.scrollPane.onScrollEnd.Add(OnListAdScrollEnd);
+            _ui.m_comListAd.m_listAd.scrollPane.decelerationRate = 0.8f;
+
             swipeGesture = new SwipeGesture(_ui.target);
             swipeGesture.onAction.Add(OnSwipe);
+            swipeGesture.onBegin.Add(OnSwipeBegin);
+            swipeGesture.onEnd.Add(OnSwipeEnd);
             swipeGesture.actionDistance = swipeDistance;
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
@@ -215,7 +225,15 @@ namespace GFGGame
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
             SetPos();
-
+            GetAdIds();
+            _ui.m_comListAd.target.visible = _ui.m_comListAd.m_listAd.numItems > 0;
+            if (_ui.m_comListAd.target.visible)
+            {
+                Timers.inst.Remove(UpdateAdListTime);
+                Timers.inst.Add(3, 0, UpdateAdListTime);
+            }
+            Timers.inst.Remove(Update);
+            Timers.inst.Remove(CheckGuide);
             Timers.inst.AddUpdate(CheckGuide);
             Timers.inst.AddUpdate(Update);
         }
@@ -231,6 +249,7 @@ namespace GFGGame
             _valueBarController.OnHide();
             Timers.inst.Remove(Update);
             Timers.inst.Remove(CheckGuide);
+            Timers.inst.Remove(UpdateAdListTime);
         }
 
         protected override void RemoveEventListener()
@@ -300,12 +319,31 @@ namespace GFGGame
                 // _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
             }
         }
+        private void OnSwipeBegin()
+        {
+            Vector2 pos = Input.mousePosition;
+            pos.y = Screen.height - pos.y;
+
+            _startPos = _ui.target.GlobalToLocal(pos);
+        }
+        private void OnSwipeEnd()
+        {
+            Vector2 pos = Input.mousePosition;
+            pos.y = Screen.height - pos.y;
 
+            _endPos = _ui.target.GlobalToLocal(pos);
+        }
         private void OnSwipe(EventContext context)
         {
             if (!MainDataManager.Instance.CanSwipe) return;
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
 
+            if (_ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
+            && _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
+            && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)
+            && _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
+            && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
+
             SwipeGesture swipeture = (SwipeGesture)context.sender;
             if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
                 swipeture.position.y < -swipeture.position.x && swipeture.position.y > swipeture.position.x)
@@ -725,7 +763,7 @@ namespace GFGGame
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-
+                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
                 long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
@@ -797,7 +835,7 @@ namespace GFGGame
         private void UpdateBtnFirstRecharge()
         {
             _ui.m_btnFirstRecharge.target.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
-            if(_ui.m_btnFirstRecharge.target.visible)
+            if (_ui.m_btnFirstRecharge.target.visible)
             {
                 bool canget = ActivityDataManager.Instance.firstChargeBonusStatus == ConstBonusStatus.CAN_GET;
                 RedDotController.Instance.SetComRedDot(_ui.m_btnFirstRecharge.target, canget);
@@ -814,7 +852,62 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId,
                 RoleDataManager.headBorderId);
         }
+        /// <summary>
+        /// 获取当前开启的滚动广告列表
+        /// </summary>
+        private void GetAdIds()
+        {
+            _adIds.Clear();
+            for (int i = 0; i < AdCfgArray.Instance.dataArray.Length; i++)
+            {
+                AdCfg adCfg = AdCfgArray.Instance.dataArray[i];
+                if (adCfg.activityId > 0 && ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                if (!string.IsNullOrEmpty(adCfg.startTime) && !string.IsNullOrEmpty(adCfg.endTime))
+                {
+                    long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                    long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                    if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime) continue;
+                }
+                _adIds.Add(adCfg);
+            }
+            _ui.m_comListAd.m_listAd.numItems = _adIds.Count;
+            _ui.m_comListAd.m_listAdSelect.numItems = _adIds.Count;
+            if (_ui.m_comListAd.m_listAd.numItems > 0)
+            {
+                _ui.m_comListAd.m_listAd.ScrollToView(0);
+                _ui.m_comListAd.m_listAdSelect.selectedIndex = 0;
+            }
+        }
+        private void UpdateAdListTime(object param)
+        {
+            int itemIndex = _ui.m_comListAd.m_listAd.ChildIndexToItemIndex(0) + 1;
+            itemIndex = itemIndex == _ui.m_comListAd.m_listAd.numItems ? 0 : itemIndex;
+            _ui.m_comListAd.m_listAdSelect.selectedIndex = itemIndex;
+            _ui.m_comListAd.m_listAd.scrollPane.ScrollRight(0.8f, true);
+        }
+        private void RenderListAdItem(int index, GObject obj)
+        {
+            UI_ListAdItem item = UI_ListAdItem.Proxy(obj);
 
+            item.m_loaRes.url = "ui://Main/guanggao_" + _adIds[index].res;
+            if (item.m_loaRes.data == null)
+            {
+                item.m_loaRes.onClick.Add(OnBtnAdJump);
+            }
+            item.m_loaRes.data = _adIds[index].jumpId;
+
+            UI_ListAdItem.ProxyEnd();
+        }
+        private void OnBtnAdJump(EventContext context)
+        {
+            string jumpId = (context.sender as GObject).data.ToString();
+            ViewManager.Show($"GFGGame.{jumpId}");
+        }
+        private void OnListAdScrollEnd()
+        {
+            int itemIndex = _ui.m_comListAd.m_listAd.ChildIndexToItemIndex(0);
+            _ui.m_comListAd.m_listAdSelect.selectedIndex = itemIndex;
+        }
         private void CheckFunOpen()
         {
             _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);

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

@@ -95,9 +95,20 @@ namespace GFGGame
         {
             PoemPhotoData poemPhotoData = _roleDetailInfo.showPhotoList[index];
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
+            item.target.data = index;
+
+            item.m_imgNone.visible = poemPhotoData == null;
+            item.m_grpLock.visible = false;
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
+            || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                item.m_grpLock.visible = true;
+                item.m_comPhoto.m_loaPhoto.texture = null;
+                item.m_imgNone.visible = false;
+                return;
+            }
 
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
-            item.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }
 

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

@@ -112,9 +112,19 @@ namespace GFGGame
             long pictureId = RoleDataManager.photoDatas[index];
             PoemPhotoData poemPhotoData = pictureId == 0 ? null : PoemPhotoDataManager.Instance.GetPersonalPhotoDataById(pictureId);
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
+            item.target.data = index;
 
+            item.m_imgNone.visible = poemPhotoData == null;
+            item.m_grpLock.visible = false;
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
+            || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                item.m_grpLock.visible = true;
+                item.m_comPhoto.m_loaPhoto.texture = null;
+                item.m_imgNone.visible = false;
+                return;
+            }
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
-            item.target.data = index;
             UI_ListPhotoItem.ProxyEnd();
         }
 
@@ -122,6 +132,17 @@ namespace GFGGame
         {
             GObject obj = context.data as GObject;
             int index = (int)obj.data;
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("金卡开启");
+                return;
+            }
+            if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("黑金卡开启");
+                return;
+            }
+
             ViewManager.Show<PersonalPhotoView>(index, new object[] { typeof(RoleInfoView).FullName, this.viewData });
             this.Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -38,6 +38,8 @@ namespace GFGGame
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300012;
+            _ui.m_LevelProcess.m_NumProcess.icon =
+                ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.BATTLE_PASS_CURRENCY).res);
         }
 
         protected override void OnHide()
@@ -103,25 +105,32 @@ namespace GFGGame
         }
 
         //继续领取
-        private async void OnBtnContinueClick(EventContext context)
+        private void OnBtnContinueClick(EventContext context)
         {
-            if (!(context.sender is GObject obj)) return;
-            var id = (int)obj.data;
-            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
-            if (!isBuy)
-            {
-                ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
-                return;
-            }
-            var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
-            if (!get) return;
-            SetBattlePassLevel();
+            // if (!(context.sender is GObject obj)) return;
+            // var id = (int)obj.data;
+            // var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            // if (!isBuy)
+            // {
+            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+            // return;
+            // }
+            // var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
+            // if (!get) return;
+            // SetBattlePassLevel();
         }
 
         //领取全部奖励
         private async void OnBtnGetAllClick(EventContext context)
         {
-            var get = await BattlePassTaskSProxy.GetAllBattlePassReward();
+            var get = await BattlePassTaskSProxy.GetAllBattlePassReward(onSuccess: () =>
+            {
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (isBuy) return;
+                ViewManager.Show<BuyBattlePassLevelView>(null,
+                    new object[] { typeof(BattlePassTaskView).FullName, null });
+            });
+            SetBattlePassLevel();
             if (!get) return;
             SetBattlePassLevel();
         }
@@ -140,6 +149,7 @@ namespace GFGGame
         {
             var item = UI_BattlePassRewardItem.Proxy(obj);
             var level = index + 1;
+
             //设置进度
             item.m_imageProgress.visible = BattlePassTaskDataManager.Instance.GetBattlePassLevel() >= level;
             //这里跳过为0的第一个配置
@@ -150,16 +160,25 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
+                item.m_NormalReward.visible = true;
                 var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
-                item.m_NormalReward.data ??= new ItemView(item.m_NormalReward);
-                (item.m_NormalReward.data as ItemView)?.SetData(itemData);
-                (item.m_NormalReward.data as ItemView)?.ChangeTxtCountStyle();
+                var itemView = new ItemView(item.m_NormalReward);
+                item.m_NormalReward.data ??= itemView;
+                itemView.SetData(itemData);
+                itemView.ChangeTxtCountStyle();
+                itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
+            }
+            else
+            {
+                item.m_NormalReward.data = null;
+                item.m_NormalReward.visible = false;
             }
             if (item.m_RewardList.data == null)
             {
                 item.m_RewardList.itemRenderer = SpecialRewardRender;
             }
-            item.m_RewardList.data = battlePassCfg.bonusSpecialArr;
+            var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            item.m_RewardList.data = (battlePassCfg.bonusSpecialArr, superLevelRewardGet);
             item.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
             //获取玩家当前的通行证等级
             var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
@@ -173,12 +192,14 @@ namespace GFGGame
         //SpecialRewardRender
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var parentData = (int[][])obj.parent.data;
-            var itemInfo = parentData[index];
+            var keyValuePair = ((int[][], bool))obj.parent.data;
+            var itemInfo = keyValuePair.Item1[index];
             var itemData = ItemUtil.createItemData(itemInfo);
-            obj.data ??= new ItemView(obj as GComponent);
-            (obj.data as ItemView)?.SetData(itemData);
-            (obj.data as ItemView)?.ChangeTxtCountStyle();
+            var itemView = new ItemView(obj as GComponent);
+            obj.data ??= itemView;
+            itemView.SetData(itemData);
+            itemView.ChangeTxtCountStyle();
+            itemView.GrpGotVisible = keyValuePair.Item2;
         }
 
         //根据状态设置按钮
@@ -235,14 +256,24 @@ namespace GFGGame
             //获取当前等级的经验
             var battlePassCfg =
                 BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel());
-            uiExpProcess.target.max = battlePassCfg.value;
-            uiExpProcess.target.value = dataManager.GetBattlePassExp();
-            uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
-                .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
-            //刷新奖励列表
-            _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
-            //去掉第一个为0的配置
-            _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            if (battlePassCfg == null)
+            {
+                //已经超过了最大等级
+                uiExpProcess.target.max = 100;
+                uiExpProcess.target.value = 0;
+                uiExpProcess.m_c1.selectedIndex = 1;
+            }
+            else
+            {
+                uiExpProcess.target.max = battlePassCfg.value;
+                uiExpProcess.target.value = dataManager.GetBattlePassExp();
+                uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
+                    .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
+                //刷新奖励列表
+                _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
+                //去掉第一个为0的配置
+                _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            }
         }
 
         private void SetOpenBattlePassBtnStatus()
@@ -273,12 +304,18 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
+                uiBattlePassReward.m_NormalReward.visible = true;
                 var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
                 var item = new ItemView(uiBattlePassReward.m_NormalReward);
                 item.SetData(itemData);
                 item.ChangeTxtCountStyle();
             }
-            uiBattlePassReward.m_RewardList.data = battlePassCfg.bonusSpecialArr;
+            else
+            {
+                uiBattlePassReward.m_NormalReward.visible = false;
+            }
+            var state = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            uiBattlePassReward.m_RewardList.data = (battlePassCfg.bonusSpecialArr, state);
             uiBattlePassReward.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -127,7 +127,7 @@ namespace GFGGame
             item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
             item.m_txtCount.text =
-                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].count}";
+                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
             if (item.m_GetRewardBt.data == null)
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta

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

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 591f4134b05ced347bc606d8c5909316
+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: