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

# Conflicts:
#	FGUIProject/assets/CommonGame/package.xml
#	GameClient/Assets/ResIn/UI/Task/Task_fui.bytes

FGUIProject/assets/ActivityDay7/components/ExpProcess.xml

@@ -4,7 +4,7 @@
     <image id="n0_nyhm" name="n0" src="nyhmb" fileName="images/qrhd_jdt_db.png" xy="0,0" size="38,676">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_nyhm" name="bar" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
   </displayList>
-  <ProgressBar reverse="true"/>
+  <ProgressBar/>
 </component>

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="94,95" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" pages="0,非最大,1,最大" selected="1"/>
+  <controller name="c1" pages="0,非最大,1,最大" selected="0"/>
   <controller name="c2" pages="0,未获得,1,已获得" selected="0"/>
   <displayList>
     <image id="n11_bhmm" name="n11" src="nyhm4" fileName="images/qrhd_wp_db_1.png" xy="-17,-15" group="n9_bhmm">
@@ -15,9 +15,6 @@
     <image id="n6_bhmm" name="n6" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="58,62" group="n9_bhmm"/>
     <text id="n7_bhmm" name="Num" xy="58,54" size="47,42" group="n9_bhmm" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
     <text id="n8_bhmm" name="Score" xy="-48,39" size="66,42" group="n9_bhmm" fontSize="30" color="#fffbeb" autoSize="none" text="1000"/>
-    <image id="n12_bhmm" name="n12" src="l500tlx" fileName="imagesNew/wpk_zz.png" pkg="eg2y0ldp" xy="-7,-6" group="n9_bhmm">
-      <gearDisplay controller="c2" pages="1"/>
-    </image>
     <image id="n10_bhmm" name="Get" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="10,27" group="n9_bhmm">
       <gearDisplay controller="c2" pages="1"/>
     </image>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,210">
   <displayList>
-    <image id="n25_pu55" name="n25" src="volstc1" fileName="imagesNew/wp_bg_yuan.png" xy="1,1"/>
+    <image id="n25_pu55" name="n25" src="volstnl" fileName="imagesNew/wp_bg_yuan.png" xy="1,1"/>
     <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="volstc2" 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,91" size="178,40" 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"/>

FGUIProject/assets/CommonGame/package.xml

@@ -20,7 +20,6 @@
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
-    <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
@@ -341,15 +340,15 @@
     <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"/>
-    <image id="8paktne" name="lm_fl_db.png" path="/bgimg/"/>
-    <component id="8paktnf" name="BtnStyle005.xml" path="/components/"/>
-    <component id="8paktng" name="BtnStyle006.xml" path="/components/"/>
-    <component id="8paktnh" name="ComItem003.xml" path="/components/"/>
-    <image id="8paktni" name="an_bt_bai.png" path="/imagesNew/"/>
-    <image id="8paktnj" name="an_bt_cut.png" path="/imagesNew/"/>
-    <image id="8paktnk" name="an_bt_jin.png" path="/imagesNew/"/>
-    <image id="8paktnl" name="wp_bg_yuan.png" path="/imagesNew/"/>
-    <image id="8paktnm" name="wp_own.png" path="/imagesNew/"/>
+    <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/"/>
+    <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/"/>
+    <image id="volstnl" name="wp_bg_yuan.png" path="/imagesNew/"/>
+    <image id="volstnm" name="wp_own.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/ComList.xml

@@ -3,19 +3,21 @@
   <displayList>
     <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,0" group="n30_idkd" controller="c1,1,c2,0">
       <Button title="限时累充" icon="ui://t8nwuj7ivols1q"/>
-      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1o"/>
     </component>
     <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
-      <Button title="一周黄历" icon="ui://t8nwuj7ivols20"/>
-      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1z"/>
+      <Button title="一周黄历"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols20"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1z"/>
     </component>
     <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,702" group="n30_idkd" controller="c2,2">
       <Button title="每日签到" icon="ui://t8nwuj7ivols1y"/>
-      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1m"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1y"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1m"/>
     </component>
     <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1053" group="n30_idkd" controller="c2,3">
       <Button title="每日补给" icon="ui://t8nwuj7ivols1x"/>
-      <property target="title" propertyId="1" value="ui://t8nwuj7ivols21"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1x"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols21"/>
     </component>
     <group id="n30_idkd" name="n30" xy="0,0" size="987,1393" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
   </displayList>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -4,7 +4,9 @@
     <loader id="n27_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n31_vols" name="n31" src="9jv65o" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true"/>
+    <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"/>
+    </image>
     <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>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -25,5 +25,6 @@
     </group>
   </displayList>
   <Button/>
-  <customProperty target="title" propertyId="1"/>
+  <customProperty target="loaIcon" propertyId="1"/>
+  <customProperty target="loaTitle" propertyId="1"/>
 </component>

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -5,12 +5,12 @@
     <loader id="n14_9jv6" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110" pkg="eg2y0ldp">
+    <image id="n0_pvb4" name="n0" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="0,110">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>
     <image id="n2_pvb4" name="n2" src="9jv669" fileName="images/biaotizi_11.png" xy="203,222" size="673,62"/>
-    <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649" pkg="eg2y0ldp">
+    <image id="n18_9jv6" name="n18" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,1649">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -25,7 +25,7 @@
     <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="920,101" size="36,37">
       <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
-    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697" pkg="eg2y0ldp">
+    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="430,1697">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="一键领取"/>

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898" pkg="eg2y0ldp">
+    <image id="n15_miy3" name="n15" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-31,21" size="1144,1898">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>

FGUIProject/assets/Main/MainUI.xml

@@ -6,19 +6,11 @@
       <relation target="" sidePair="bottom-bottom"/>
     </image>
     <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
-    <component id="n74_fqor" name="btnDailyWelfare" src="ox5bf5" fileName="components/Button2.xml" xy="18,457" group="n52_qqat" visible="false">
-      <relation target="" sidePair="left-left,top-top"/>
-      <Button title="福利大厅"/>
-    </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="mbf1o4" fileName="components/Button4.xml" xy="18,595" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="wg7t8y" fileName="components/ButtonModle.xml" xy="41,770" group="n52_qqat">
-      <Button icon="ui://mfvz4q8kq08xe"/>
-    </component>
     <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="25,1675" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fn"/>
@@ -42,7 +34,19 @@
     <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="930,1447" group="n52_qqat">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <list id="n41_wg7t" name="list" xy="910,290" size="108,1280" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
+    <component id="n79_g1yr" name="btnFirstRecharge" src="volso9" fileName="components/BtnModle.xml" xy="607,162" group="n88_ktf2">
+      <Button title="首充"/>
+    </component>
+    <component id="n80_ktf2" name="btnGiftBag1" src="volso9" fileName="components/BtnModle.xml" xy="758,162" group="n88_ktf2" controller="c1,1">
+      <Button title="限时抢购" icon="ui://mfvz4q8kvolsod"/>
+    </component>
+    <component id="n84_ktf2" name="btnGiftBag2" src="volso9" fileName="components/BtnModle.xml" xy="909,162" group="n88_ktf2" controller="c1,1">
+      <Button title="特惠礼包" icon="ui://mfvz4q8kvolsoc"/>
+    </component>
+    <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"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
@@ -56,10 +60,21 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
     </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="963,1570" pivot="0.5,0" anchor="true" group="n57_oju1" visible="false">
+    <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="910,290" size="108,1393" group="n52_qqat" advanced="true"/>
+    <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">
+      <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,611" 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,765" group="n89_vols">
+      <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
+    </component>
+    <group id="n89_vols" name="n89" xy="22,457" size="141,462" group="n52_qqat" advanced="true" layout="vt" excludeInvisibles="true"/>
     <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"/>
@@ -100,22 +115,6 @@
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n79_g1yr" name="btnFirstRecharge" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="423,223" group="n88_ktf2">
-      <Button title="首充"/>
-    </component>
-    <component id="n80_ktf2" name="btnGiftBag1" src="ktf2o5" fileName="components/Button5.xml" xy="806,205" group="n83_ktf2">
-      <Button icon="ui://mfvz4q8kktf2o7"/>
-    </component>
-    <image id="n81_ktf2" name="n81" src="ktf2o8" fileName="images/cj_sj_db.png" xy="789,285" size="128,32" group="n83_ktf2"/>
-    <text id="n82_ktf2" name="txtGiftBagTime1" xy="803,280" pivot="0.5,0" size="100,39" group="n83_ktf2" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
-    <group id="n83_ktf2" name="n83" xy="789,205" size="128,114" group="n88_ktf2" advanced="true"/>
-    <component id="n84_ktf2" name="btnGiftBag2" src="ktf2o5" fileName="components/Button5.xml" xy="667,207" group="n87_ktf2">
-      <Button icon="ui://mfvz4q8kktf2o7"/>
-    </component>
-    <image id="n85_ktf2" name="n85" src="ktf2o8" fileName="images/cj_sj_db.png" xy="650,287" size="128,32" group="n87_ktf2"/>
-    <text id="n86_ktf2" name="txtGiftBagTime2" xy="664,282" pivot="0.5,0" size="100,39" group="n87_ktf2" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
-    <group id="n87_ktf2" name="n87" xy="650,207" size="128,114" group="n88_ktf2" advanced="true"/>
-    <group id="n88_ktf2" name="n88" xy="423,205" size="494,116"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>

FGUIProject/assets/Main/components/BtnModle.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="141,132" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="不显示时间"/>
+    <remark page="1" value="显示时间"/>
+  </controller>
+  <displayList>
+    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="124,103" url="ui://mfvz4q8kvolsob" autoSize="true"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="0,102"/>
+    <text id="n7_vols" name="title" xy="39,94" pivot="0.5,0" size="63,42" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,132" pivot="0.5,0" group="n11_vols">
+      <relation target="n9_vols" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n9_vols" name="txtTime" xy="20,123" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
+    <group id="n11_vols" name="grpTime" xy="14,123" size="112,39" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Main/components/BtnModle1.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="141,158" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="1">
+    <remark page="0" value="不显示时间"/>
+    <remark page="1" value="显示时间"/>
+  </controller>
+  <displayList>
+    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n13_vols" url="ui://mfvz4q8kvolsof" align="center"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,99" pivot="0.5,0" size="81,29" group="n12_vols">
+      <relation target="n7_vols" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n7_vols" name="title" xy="39,91" pivot="0.5,0" size="63,42" group="n12_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <group id="n12_vols" name="grpName" xy="30,91" size="81,42" group="n13_vols" advanced="true"/>
+    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,131" pivot="0.5,0" group="n11_vols">
+      <relation target="n9_vols" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n9_vols" name="txtTime" xy="20,122" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
+    <group id="n11_vols" name="grpTime" xy="14,122" size="112,39" group="n13_vols" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+    <group id="n13_vols" name="n13" xy="7,0" size="127,161" advanced="true" layout="vt" lineGap="-11" excludeInvisibles="true"/>
+  </displayList>
+  <Button/>
+  <relation target="n13_vols" sidePair="height-height"/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -621,6 +621,24 @@
     <image id="ktf2o6" name="cj_yulan.png" path="/images/"/>
     <image id="ktf2o7" name="cj_meirith.png" path="/images/"/>
     <image id="ktf2o8" name="cj_sj_db.png" path="/images/"/>
+    <component id="volso9" name="BtnModle.xml" path="/components/"/>
+    <image id="volsoa" name="zjm_hd_sj_db.png" path="/imagesNew/"/>
+    <image id="volsob" name="zjm_tb_cz_sc.png" path="/imagesNew/"/>
+    <image id="volsoc" name="zjm_tb_cz_thlb.png" path="/imagesNew/"/>
+    <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="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="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/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/components/LinessRewardProcessItemBt.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="114,119" extention="Button">
-  <controller name="c1" pages="0,NotGet,1,CanGet" selected="0"/>
+  <controller name="c1" pages="0,NotGet,1,CanGet,2,已领取" selected="0"/>
   <displayList>
     <image id="n4_9qpb" name="n4" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="0,3" size="119,118"/>
     <image id="n5_9qpb" name="n5" src="dhoatk2" fileName="imgItemIcon/hlhdjficon.png" pkg="eg2y0ldp" xy="10,19" size="99,86"/>
@@ -9,6 +9,9 @@
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <text id="n8_9qpb" name="text" xy="31,139" size="43,54" fontSize="40" color="#b46471" align="center" vAlign="middle" text="20"/>
+    <image id="n9_vnby" name="n9" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="25,42">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
   </displayList>
   <Button/>
   <customProperty target="text" propertyId="0"/>

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

@@ -11,7 +11,7 @@ namespace GFGGame
 
         public long GetScore()
         {
-            return ItemDataManager.GetItemNum(ConstItemID.BATTLE_PASS_CURRENCY);
+            return ItemDataManager.GetItemNum(ConstItemID.ACTIVITY_DAY_7_SCORE);
         }
 
         //NumericType.Day7ActivityReward
@@ -28,6 +28,7 @@ namespace GFGGame
         
         public long GetEndTime()
         {
+            //TODO 进行缓存
             return TimeUtil.TodayRestTime() +
                    (Activity7DaysCfgArray.Instance.dataArray.Length - GetActivityDay7Day())
                    * TimeUtil.SECOND_PER_DAY * 1000;

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_ListSelectorItem.cs

@@ -8,10 +8,10 @@ namespace UI.Bag
     {
         public GComponent target;
         public GTextField m_txtSelNum;
-        public GLoader m_loaIcon;
-        public GTextField m_txtNum;
         public GButton m_btnReduce;
         public GButton m_btnAdd;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNum;
         public const string URL = "ui://2bsz6nelv5notmb";
         public const string PACKAGE_NAME = "Bag";
         public const string RES_NAME = "ListSelectorItem";
@@ -60,18 +60,18 @@ namespace UI.Bag
         private void Init(GComponent comp)
         {
             m_txtSelNum = (GTextField)comp.GetChild("txtSelNum");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnReduce = (GButton)comp.GetChild("btnReduce");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtSelNum = null;
-            m_loaIcon = null;
-            m_txtNum = null;
             m_btnReduce = null;
             m_btnAdd = null;
+            m_loaIcon = null;
+            m_txtNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -14,7 +14,7 @@ namespace UI.CommonGame
         public GImage m_imgNotHas;
         public GImage m_imgShowTong;
         public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldpvolstnj";
+        public const string URL = "ui://eg2y0ldpvolstnd";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComIcon003";
         private static UI_ComIcon003 _proxy;

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

@@ -1,78 +0,0 @@
-/** 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://eg2y0ldpvolstnk";
-        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_Button4.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle.cs

@@ -4,18 +4,20 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_Button4
+    public partial class UI_BtnModle
     {
         public GButton target;
-        public GGraph m_holder;
-        public const string URL = "ui://mfvz4q8kmbf1o4";
+        public Controller m_c1;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public const string URL = "ui://mfvz4q8kvolso9";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "Button4";
-        private static UI_Button4 _proxy;
+        public const string RES_NAME = "BtnModle";
+        private static UI_BtnModle _proxy;
 
-        public static UI_Button4 Create(GObject gObject = null)
+        public static UI_BtnModle Create(GObject gObject = null)
         {
-            var ui = new UI_Button4();
+            var ui = new UI_BtnModle();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +26,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_Button4 Proxy(GObject gObject = null)
+        public static UI_BtnModle Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button4();
+                _proxy = new UI_BtnModle();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +57,15 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_holder = (GGraph)comp.GetChild("holder");
+            m_c1 = comp.GetController("c1");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_holder = null;
+            m_c1 = null;
+            m_txtTime = null;
+            m_grpTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Button4.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0e2f9f774633e3a4289339ad02507c6f
+guid: e5abdda59e63c6347a83fce44dc68c46
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Button2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle1.cs

@@ -4,18 +4,21 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_Button2
+    public partial class UI_BtnModle1
     {
         public GButton target;
-        public GGraph m_holder;
-        public const string URL = "ui://mfvz4q8kox5bf5";
+        public Controller m_c1;
+        public GGroup m_grpName;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public const string URL = "ui://mfvz4q8kvolsoq";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "Button2";
-        private static UI_Button2 _proxy;
+        public const string RES_NAME = "BtnModle1";
+        private static UI_BtnModle1 _proxy;
 
-        public static UI_Button2 Create(GObject gObject = null)
+        public static UI_BtnModle1 Create(GObject gObject = null)
         {
-            var ui = new UI_Button2();
+            var ui = new UI_BtnModle1();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +27,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_Button2 Proxy(GObject gObject = null)
+        public static UI_BtnModle1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button2();
+                _proxy = new UI_BtnModle1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +58,17 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_holder = (GGraph)comp.GetChild("holder");
+            m_c1 = comp.GetController("c1");
+            m_grpName = (GGroup)comp.GetChild("grpName");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_holder = null;
+            m_c1 = null;
+            m_grpName = null;
+            m_txtTime = null;
+            m_grpTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4a41fe5724576014fa844fef55020b00
+guid: ab04cd979b8f3f64dab04d06ad7620f4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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

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

@@ -9,18 +9,21 @@ namespace UI.Main
         public GComponent target;
         public GComponent m_valueBar;
         public UI_ComponentHeadBar m_headBar;
-        public UI_Button2 m_btnDailyWelfare;
-        public UI_Button4 m_btnActivityLuckyBox;
         public UI_ButtonModle1 m_btnMain;
-        public GButton m_btnActivityDay7;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_Component7 m_loaRight;
+        public UI_BtnModle m_btnFirstRecharge;
+        public UI_BtnModle m_btnGiftBag1;
+        public UI_BtnModle m_btnGiftBag2;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
         public GGroup m_grpList;
+        public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle1 m_btnActivityDay7;
+        public UI_BtnModle1 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
         public UI_ButtonModle6 m_btnArena;
         public UI_ButtonModle7 m_btn1;
@@ -32,11 +35,6 @@ namespace UI.Main
         public GGroup m_grpRight;
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
-        public GButton m_btnFirstRecharge;
-        public GButton m_btnGiftBag1;
-        public GTextField m_txtGiftBagTime1;
-        public GButton m_btnGiftBag2;
-        public GTextField m_txtGiftBagTime2;
         public Transition m_t1;
         public Transition m_t2;
         public Transition m_t3;
@@ -90,18 +88,21 @@ namespace UI.Main
         {
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
-            m_btnDailyWelfare = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityLuckyBox = (UI_Button4)UI_Button4.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
-            m_btnActivityDay7 = (GButton)comp.GetChild("btnActivityDay7");
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_loaRight = (UI_Component7)UI_Component7.Create(comp.GetChild("loaRight"));
+            m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
+            m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
+            m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_grpList = (GGroup)comp.GetChild("grpList");
+            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"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_btnArena = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnArena"));
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -113,11 +114,6 @@ namespace UI.Main
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
-            m_btnFirstRecharge = (GButton)comp.GetChild("btnFirstRecharge");
-            m_btnGiftBag1 = (GButton)comp.GetChild("btnGiftBag1");
-            m_txtGiftBagTime1 = (GTextField)comp.GetChild("txtGiftBagTime1");
-            m_btnGiftBag2 = (GButton)comp.GetChild("btnGiftBag2");
-            m_txtGiftBagTime2 = (GTextField)comp.GetChild("txtGiftBagTime2");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
             m_t3 = comp.GetTransition("t3");
@@ -128,13 +124,8 @@ namespace UI.Main
             m_valueBar = null;
             m_headBar.Dispose();
             m_headBar = null;
-            m_btnDailyWelfare.Dispose();
-            m_btnDailyWelfare = null;
-            m_btnActivityLuckyBox.Dispose();
-            m_btnActivityLuckyBox = null;
             m_btnMain.Dispose();
             m_btnMain = null;
-            m_btnActivityDay7 = null;
             m_btnHuanZhuang.Dispose();
             m_btnHuanZhuang = null;
             m_btnXiuFang.Dispose();
@@ -145,10 +136,22 @@ namespace UI.Main
             m_btnZhaiXing = null;
             m_loaRight.Dispose();
             m_loaRight = null;
+            m_btnFirstRecharge.Dispose();
+            m_btnFirstRecharge = null;
+            m_btnGiftBag1.Dispose();
+            m_btnGiftBag1 = null;
+            m_btnGiftBag2.Dispose();
+            m_btnGiftBag2 = null;
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
             m_grpList = null;
+            m_btnDailyWelfare.Dispose();
+            m_btnDailyWelfare = null;
+            m_btnActivityDay7.Dispose();
+            m_btnActivityDay7 = null;
+            m_btnActivityLuckyBox.Dispose();
+            m_btnActivityLuckyBox = null;
             m_grpLeft = null;
             m_btnArena.Dispose();
             m_btnArena = null;
@@ -167,11 +170,6 @@ namespace UI.Main
             m_grpRight = null;
             m_grpMove = null;
             m_loaGuidestudio = null;
-            m_btnFirstRecharge = null;
-            m_btnGiftBag1 = null;
-            m_txtGiftBagTime1 = null;
-            m_btnGiftBag2 = null;
-            m_txtGiftBagTime2 = null;
             m_t1 = null;
             m_t2 = null;
             m_t3 = null;

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

@@ -68,6 +68,20 @@ namespace GFGGame
             base.Hide();
         }
 
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+        }
+
+        private void OnItemChange(EventContext context)
+        {
+            var itemId = (int)context.data;
+            if (itemId != ConstItemID.ACTIVITY_DAY_7_SCORE) return;
+            SetScoreList();
+            SetScore();
+        }
+
+
         private void SetScore()
         {
             var score = ActivityDay7DataManager.Instance.GetScore();

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

@@ -118,7 +118,7 @@ namespace GFGGame
             // _btnField = _ui.m_list.GetChild("btnField").asButton;
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
 
-            _btnActivityDay7 = _ui.m_btnActivityDay7;
+            _btnActivityDay7 = _ui.m_btnActivityDay7.target;
 
             // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
@@ -150,12 +150,12 @@ namespace GFGGame
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);
-            _ui.m_btnFirstRecharge.onClick.Add(OnClickBtnFirstRecharge);
+            _ui.m_btnFirstRecharge.target.onClick.Add(OnClickBtnFirstRecharge);
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
-            _ui.m_btnGiftBag1.onClick.Add(OnClickBtnGiftBag1);
-            _ui.m_btnGiftBag2.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag1);
+            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag2);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
@@ -683,11 +683,11 @@ namespace GFGGame
                 .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_txtGiftBagTime1.text = "已结束";
+                _ui.m_btnGiftBag1.m_txtTime.text = "已结束";
             }
             else
             {
-                _ui.m_txtGiftBagTime1.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
             }
         }
 
@@ -700,11 +700,11 @@ namespace GFGGame
                 .Where(a => a.endTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_txtGiftBagTime2.text = "已结束";
+                _ui.m_btnGiftBag2.m_txtTime.text = "已结束";
             }
             else
             {
-                _ui.m_txtGiftBagTime2.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
+                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].endTime);
             }
         }
 
@@ -737,9 +737,9 @@ namespace GFGGame
                 !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
                 (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
             }
-            if (_ui.m_btnActivityDay7.visible && !ActivityDay7DataManager.Instance.CheckOpen())
+            if (_ui.m_btnActivityDay7.target.visible && !ActivityDay7DataManager.Instance.CheckOpen())
             {
-                _ui.m_btnActivityDay7.visible = false;
+                _ui.m_btnActivityDay7.target.visible = false;
             }
 
             //特惠礼包/限时礼包窗口内的倒计时
@@ -784,7 +784,7 @@ namespace GFGGame
 
         private void UpdateBtnFirstRecharge()
         {
-            _ui.m_btnFirstRecharge.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
+            _ui.m_btnFirstRecharge.target.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
         }
 
         private void UpdateRoleLvl()

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

@@ -107,6 +107,12 @@ namespace GFGGame
         {
             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();

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

@@ -91,23 +91,22 @@ namespace GFGGame
             {
                 var boxId = i + 1;
                 var state = DailyTaskDataManager.Instance.GetBoxStateById(boxId);
-                var index = state == ConstBonusStatus.CAN_GET ? 1 : 0;
                 switch (boxId)
                 {
                     case 1:
-                        _ui.m_LivenessProcess.m_Reward20.m_c1.selectedIndex = index;
+                        _ui.m_LivenessProcess.m_Reward20.m_c1.selectedIndex = state;
                         break;
                     case 2:
-                        _ui.m_LivenessProcess.m_Reward40.m_c1.selectedIndex = index;
+                        _ui.m_LivenessProcess.m_Reward40.m_c1.selectedIndex = state;
                         break;
                     case 3:
-                        _ui.m_LivenessProcess.m_Reward60.m_c1.selectedIndex = index;
+                        _ui.m_LivenessProcess.m_Reward60.m_c1.selectedIndex = state;
                         break;
                     case 4:
-                        _ui.m_LivenessProcess.m_Reward80.m_c1.selectedIndex = index;
+                        _ui.m_LivenessProcess.m_Reward80.m_c1.selectedIndex = state;
                         break;
                     case 5:
-                        _ui.m_LivenessProcess.m_Reward100.m_c1.selectedIndex = index;
+                        _ui.m_LivenessProcess.m_Reward100.m_c1.selectedIndex = state;
                         break;
                 }
             }
@@ -173,7 +172,7 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(TaskView).FullName, viewData });
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -194,17 +193,17 @@ namespace GFGGame
             switch (state)
             {
                 case ConstBonusStatus.CAN_NOT_GET:
-                    {
-                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                        break;
-                    }
+                {
+                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                    break;
+                }
                 case ConstBonusStatus.CAN_GET:
-                    {
-                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                        if (result) UpdateLivenessProcess();
-                        break;
-                    }
+                {
+                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                    if (result) UpdateLivenessProcess();
+                    break;
+                }
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     break;

GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 8494bd312c0ed844889deda3b19e4dc6
-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/League/League_atlas0_8.png.meta

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