feat 任务提交

FGUIProject/assets/Arena/components/comListType(1).xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,1920">
+  <displayList>
+    <image id="n15_wono" name="n15" src="psph17" fileName="components/hz_zdikuang_1.png" xy="3,94" size="226,1826" group="n17_wono">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n16_wono" name="n16" src="psph1c" fileName="components/hz_zdikuang_2.png" xy="0,72" group="n17_wono"/>
+    <group id="n17_wono" name="n17" xy="0,72" size="276,1848"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/components/comListType(2).xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,1920">
+  <displayList>
+    <image id="n15_wono" name="n15" src="psph17" fileName="components/hz_zdikuang_1.png" xy="3,94" size="226,1826" group="n17_wono">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n16_wono" name="n16" src="psph1c" fileName="components/hz_zdikuang_2.png" xy="0,72" group="n17_wono"/>
+    <group id="n17_wono" name="n17" xy="0,72" size="276,1848"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/package.xml

@@ -171,6 +171,8 @@
     <image id="rv0958" name="dljm_jdq_5.png" path="/images/"/>
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
+    <component id="ids45b" name="comListType(1).xml" path="/components/"/>
+    <component id="ids45c" name="comListType(2).xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/BtnTab.xml

@@ -2,7 +2,7 @@
 <component size="290,70" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0">
+    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0" size="290,70">
       <gearDisplay controller="button" pages="1,6"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/CommonGame/components/Button11.xml

@@ -2,10 +2,10 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="images/lm_an_yellow.png" xy="0,0">
+    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="imagesNew/lm_an_yellow.png" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -295,6 +295,8 @@
     <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
     <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
+    <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -30,7 +30,7 @@
     <image id="n45_9jv6" name="n45" src="9jv66q" fileName="images/lm_dt_cy_db.png" xy="25,724">
       <relation target="" sidePair="height-height"/>
     </image>
-    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128" pkg="eg2y0ldp"/>
     <component id="n5_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -5,7 +5,7 @@
     <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
     <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
     <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
-    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09"/>
+    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09" pkg="eg2y0ldp"/>
     <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
     <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,48" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
@@ -23,7 +23,7 @@
     <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
     <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
     <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
-    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh"/>
+    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh" pkg="eg2y0ldp"/>
     <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
     <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,48" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
@@ -50,7 +50,7 @@
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
-    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh"/>
+    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh" pkg="eg2y0ldp"/>
     <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
     <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,48" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>

FGUIProject/assets/League/components/ComPary.xml

@@ -6,7 +6,7 @@
   </controller>
   <displayList>
     <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
-    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66"/>
+    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66" pkg="eg2y0ldp"/>
     <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
     <loader id="n2_rv09" name="LoaIcon" xy="74,109" pivot="0.5,0" size="128,128" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
     <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,48" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>

FGUIProject/assets/League/package.xml

@@ -97,7 +97,6 @@
     <image id="o9gh4d" name="lm_tb_db.png" path="/images/"/>
     <image id="o9gh4e" name="tb_gou.png" path="/images/"/>
     <image id="o9gh4f" name="lm_kuang_qifu_name.png" path="/images/"/>
-    <image id="o9gh4g" name="lm_kuang_icon.png" path="/images/"/>
     <image id="o9gh4h" name="lm_kuang_3.png" path="/images/"/>
     <image id="o9gh4i" name="lm_db_2.png" path="/images/"/>
     <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
@@ -154,7 +153,6 @@
     <image id="9jv66b" name="liuhan.png" path="/images/"/>
     <image id="9jv66g" name="lm_biaoqian_ylq.png" path="/images/"/>
     <image id="9jv66i" name="lm_biaotizi_13.png" path="/images/"/>
-    <image id="9jv66j" name="lm_zsx0.png" path="/images/"/>
     <image id="9jv66k" name="lm_bq_dcm.png" path="/images/"/>
     <image id="9jv66l" name="lm_bq_xxcm.png" path="/images/"/>
     <image id="9jv66m" name="lm_ch_dcm.png" path="/images/"/>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" opaque="false">
   <displayList>
-    <loader id="n13_gbqo" 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="n33_nd17" name="n33" src="nd172z" fileName="images/txz_nr_db.png" xy="0,691"/>
-    <image id="n15_nd17" name="n15" src="nd172t" fileName="images/sj_dk.png" xy="0,310">
+    <image id="n15_nd17" name="n15" src="nd172t" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
     </image>
-    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,303" size="61,61"/>
-    <component id="n18_nd17" name="n18" src="nd173t" fileName="components/ExpProcess.xml" xy="107,601">
+    <text id="n19_nd17" name="LeftTime" xy="59,241" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="n18_nd17" name="LevelProcess" src="nd173t" fileName="components/ExpProcess.xml" xy="107,601">
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <text id="n19_nd17" name="LeftTime" xy="59,311" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
-    <image id="n20_nd17" name="n20" src="nd173b" fileName="images/bt_db_dj.png" xy="15,691"/>
-    <text id="n21_nd17" name="n21" xy="40,697" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" text="等级"/>
-    <image id="n35_nd17" name="n35" src="nd173g" fileName="images/jdt_bg.png" xy="47,733"/>
-    <image id="n22_nd17" name="n22" src="nd173i" fileName="images/jdt_pink_2.png" xy="59,746" size="22,996"/>
-    <image id="n25_nd17" name="n25" src="nd172u" fileName="images/txz_jlzz_db_jlzz.png" xy="391,681"/>
-    <image id="n31_nd17" name="n31" src="nd172v" fileName="images/txz_jlzz_db_pt.png" xy="136,711"/>
-    <image id="n26_nd17" name="n26" src="nd172w" fileName="images/txz_jlzz_tbdj_db.png" xy="0,1558"/>
-    <image id="n27_nd17" name="n27" src="nd173c" fileName="images/bt_db_jlzz.png" xy="407,691"/>
-    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="819,706" flip="hz"/>
-    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="514,707"/>
-    <text id="n30_nd17" name="n30" xy="668,697" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" text="锦罗织造"/>
-    <image id="n32_nd17" name="n32" src="nd173d" fileName="images/bt_db_ptzz.png" xy="138,691"/>
-    <list id="n48_nd17" name="RewardList" xy="2,746" size="1080,806" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <image id="n33_nd17" name="n33" src="nd172z" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
+    <image id="n20_nd17" name="n20" src="nd173b" fileName="images/bt_db_dj.png" xy="14,694"/>
+    <text id="n21_nd17" name="n21" xy="35,701" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
+    <image id="n35_nd17" name="n35" src="nd173g" fileName="images/jdt_bg.png" xy="49,737"/>
+    <image id="n31_nd17" name="n31" src="nd172v" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
+    <image id="n32_nd17" name="n32" src="nd173d" fileName="images/bt_db_ptzz.png" xy="143,691"/>
+    <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
+    <image id="n22_nd17" name="n22" src="nd173i" fileName="images/jdt_pink_2.png" xy="61,750"/>
+    <image id="n27_nd17" name="n27" src="nd173c" fileName="images/bt_db_jlzz.png" xy="405,692"/>
+    <image id="n25_nd17" name="n25" src="nd172u" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
+    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="锦罗织造"/>
+    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
+    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
+    <list id="n48_nd17" name="RewardList" xy="2,748" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -37,13 +37,10 @@
       <item/>
       <item/>
     </list>
-    <image id="n36_nd17" name="n36" src="nd173q" fileName="images/zsx_flower.png" xy="742,746"/>
-    <text id="n37_nd17" name="n37" xy="201,697" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" text="普通织造"/>
-    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
-      <relation target="" sidePair="right-right"/>
-    </component>
-    <component id="n50_nd17" name="n50" src="nd173u" fileName="components/BattlePassRewardItem.xml" xy="0,1577"/>
-    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="430,1803">
+    <image id="n36_nd17" name="n36" src="nd173q" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
+    <image id="n26_nd17" name="n26" src="nd172w" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1538" size="1080,217"/>
+    <component id="n50_nd17" name="NowReward" src="nd173u" fileName="components/BattlePassRewardItem.xml" xy="3,1558" size="1080,152"/>
+    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">
       <Button title="一键领取"/>
     </component>
   </displayList>

FGUIProject/assets/Task/ComBattle.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="普通织造"/>
-    <remark page="1" value="特别织造"/>
-  </controller>
-  <displayList>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/ComTask.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="每日任务"/>
-    <remark page="1" value="织造任务"/>
-  </controller>
-  <displayList>
-    <list id="n1_lh8v" name="listReward" xy="16,333" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="今日任务" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="织造任务" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="0,542" size="940,884" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false" designImage="ui://5mpsibzzids44d">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="每日任务"/>
+    <remark page="1" value="织造任务"/>
+  </controller>
+  <displayList>
+    <component id="n15_ids4" name="LivenessProcess" src="ids449" fileName="components/LivenessRewardProcess.xml" xy="70,717" size="949,53">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <list id="n0_lh8v" name="TaskList" xy="0,937" size="1080,778" overflow="scroll" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
+      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
+    <text id="n22_ids4" name="n22" xy="438,880" size="215,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
+    <image id="n17_ids4" name="n17" src="nd1735" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
+    <component id="n25_ids4" name="n25" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
+      <Button checked="true" controller="c1" page="0"/>
+    </component>
+    <component id="n26_ids4" name="n26" src="ids44e" fileName="components/TabButton.xml" xy="555,805" group="n27_ids4">
+      <Button title="织造任务" controller="c1" page="1"/>
+    </component>
+    <group id="n27_ids4" name="n27" xy="294,805" size="522,72" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <component id="n18_ids4" name="GetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="405,1779" size="273,59">
+      <Button title="一键领取" titleColor="#915e15"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Task/DailyTaskUI.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <loader id="n13_gbqo" 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>
-    <list id="n1_lh8v" name="listReward" xy="82,273" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="246,494" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="262,501" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="471,501" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="512,501" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="262,501" size="550,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="246,494" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="70,659" size="940,1040" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="697,1748">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
-      <relation target="" sidePair="right-right,top-top"/>
-    </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,152">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/TaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="0">
+  <controller name="c1" pages="2,,0,,1," selected="1">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
@@ -8,24 +8,18 @@
     <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="2,36" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,170">
+    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,105">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="167,187" group="n17_fqor">
-      <Button title="今日任务" controller="c1" page="0"/>
+    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="246,118" group="n17_fqor">
+      <Button checked="true" title="今日任务" controller="c1" page="0"/>
     </component>
-    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="457,187" group="n17_fqor">
+    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,118" group="n17_fqor">
       <Button title="锦罗织造" controller="c1" page="1"/>
     </component>
-    <group id="n17_fqor" name="n17" xy="167,187" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n1_lh8v" name="comTask" src="fqor2p" fileName="ComTask.xml" xy="66,290" size="947,1558">
-      <gearDisplay controller="c1" pages="0"/>
-    </component>
-    <component id="n22_nd17" name="n22" src="nd173r" fileName="BattlePassRewardUI.xml" xy="0,0">
-      <gearDisplay controller="c1" pages="1"/>
-    </component>
+    <group id="n17_fqor" name="n17" xy="246,118" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -8,8 +8,8 @@
   </controller>
   <displayList>
     <image id="n6_nd17" name="n6" src="nd172x" fileName="images/txz_lvl_db.png" xy="9,10"/>
-    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,10"/>
-    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
+    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
@@ -26,7 +26,7 @@
       <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
     </component>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,18" size="270,111" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,11" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
       <item url="ui://5mpsibzznd1743"/>
       <item url="ui://5mpsibzznd1743"/>
     </list>

FGUIProject/assets/Task/components/Button1.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="224,76" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n4_wet2" name="n4" src="wet22c" fileName="images/mrqd_anniu_1.png" xy="0,0"/>
-    <loader id="n5_wet2" name="icon" xy="0,0" size="224,76"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Task/components/Button2.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="224,76" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n4_wet2" name="n4" src="wet22d" fileName="images/mrqd_anniu_2.png" xy="0,0"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Task/components/Button3.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="320,100" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <image id="n0_wet2" name="n0" src="wet22f" fileName="images/mrqd_anniu_4.png" xy="-11,-12">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slkg" name="n1" src="slkg2m" fileName="images/mrqd_anniu_5.png" xy="-11,-12">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Task/components/ListBoxRewardItem.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="150,200">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <image id="n2_lh8v" name="n2" src="wet22a" fileName="images/mrqd_2.png" xy="0,-183" aspect="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n3_lh8v" name="n3" src="wet22b" fileName="images/mrqd_3.png" xy="0,-172" aspect="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n4_lh8v" name="n4" src="wet229" fileName="images/mrqd_1.png" xy="0,-172" aspect="true">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <text id="n6_wet2" name="txtNum" xy="70,44" pivot="0.5,0" size="61,62" fontSize="46" color="#f7fcd6" text="50">
-      <gearColor controller="c1" pages="0,2" values="#f7fcd6,#000000|#7c7b6c,#000000" default="#fff0c6,#000000"/>
-    </text>
-    <text id="n7_wet2" name="txtTitle" xy="27,132" size="100,44" fontSize="32" color="#76844b" text="活跃度">
-      <gearColor controller="c1" pages="0,2" values="#76844b,#000000|#8f8d64,#000000" default="#b88a45,#000000"/>
-    </text>
-    <image id="n5_wet2" name="n5" src="wet228" fileName="images/mrqd_ylq.png" xy="45,72">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/ListItem.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="940,160">
-  <controller name="c1" pages="1,,2,,3," selected="0">
-    <remark page="0" value="未完成"/>
-    <remark page="1" value="可领取"/>
-    <remark page="2" value="已领取"/>
-  </controller>
-  <controller name="c2" alias="是否跳转" pages="0,,1," selected="0"/>
-  <displayList>
-    <text id="n1_lh8v" name="txtDesc" xy="29,2" size="308,52" fontSize="38" color="#f4e2a9" text="任务描述任务描述"/>
-    <component id="n3_lh8v" name="btnGet" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://5mpsibzzwet22c"/>
-    </component>
-    <component id="n4_lh8v" name="btnGo" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
-      <Button icon="ui://5mpsibzzwet22d"/>
-    </component>
-    <component id="n6_wet2" name="btnGot" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="3"/>
-      <Button icon="ui://5mpsibzzwet22e"/>
-    </component>
-    <text id="n5_lh8v" name="txtCount" xy="766,0" pivot="0.5,0" size="46,42" fontSize="30" color="#f4e2a9" align="center" text="0/5"/>
-    <list id="n7_wet2" name="listTaskReward" xy="52,80" size="361,53" layout="row" colGap="50" defaultItem="ui://5mpsibzzwet22j" autoClearItems="true">
-      <item/>
-      <item/>
-    </list>
-    <image id="n11_wet2" name="n11" src="wet22l" fileName="images/mrqd_xian.png" xy="1,150"/>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/ListTaskRewardItem.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="141,43">
-  <displayList>
-    <loader id="n9_wet2" name="loaIcon" xy="0,0" size="42,42" url="ui://eg2y0ldply9g8m" autoSize="true"/>
-    <text id="n10_wet2" name="txtNum" xy="65,1" size="76,42" fontSize="30" color="#f3d26d" text="x200"/>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/LivenessRewardProcess.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="949,53" extention="ProgressBar" designImage="ui://5mpsibzzids44d" designImageOffsetX="-67" designImageOffsetY="-716">
+  <displayList>
+    <image id="n0_ids4" name="n0" src="nd173l" fileName="images/jyt_dk.png" xy="-1,0" size="949,53">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_ids4" name="bar" src="nd173o" fileName="images/jyt_pink.png" xy="11,13" size="924,27"/>
+    <component id="n8_ids4" name="Reward20" src="ids44c" fileName="components/LivenessRewardProcessItem.xml" xy="89,-104"/>
+    <component id="n9_ids4" name="Reward40" src="ids44c" fileName="components/LivenessRewardProcessItem.xml" xy="276,-105" size="124,216">
+      <property target="text" propertyId="0" value="40"/>
+    </component>
+    <component id="n12_ids4" name="Reward60" src="ids44c" fileName="components/LivenessRewardProcessItem.xml" xy="460,-104" size="124,216">
+      <property target="text" propertyId="0" value="60"/>
+    </component>
+    <component id="n10_ids4" name="Reward80" src="ids44c" fileName="components/LivenessRewardProcessItem.xml" xy="635,-105" size="124,216">
+      <property target="text" propertyId="0" value="80"/>
+    </component>
+    <component id="n11_ids4" name="Reward100" src="ids44c" fileName="components/LivenessRewardProcessItem.xml" xy="816,-104" size="124,216">
+      <property target="text" propertyId="0" value="100"/>
+    </component>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Task/components/LivenessRewardProcessItem.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,190" designImageOffsetX="-158" designImageOffsetY="-613">
+  <controller name="c1" pages="0,CanGet,1,NotGet" selected="0"/>
+  <displayList>
+    <image id="n1_ids4" name="n1" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="5,0" size="119,118"/>
+    <image id="n2_ids4" name="n2" src="dhoatk2" fileName="imgItemIcon/hlhdjficon.png" pkg="eg2y0ldp" xy="15,16" size="99,86"/>
+    <image id="n3_ids4" name="n3" src="nd173m" fileName="images/jyt_fgx.png" xy="59,122"/>
+    <image id="n4_ids4" name="n4" src="nd173n" fileName="images/jyt_liang.png" xy="40,110">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <text id="n5_ids4" name="text" xy="36,136" size="48,54" fontSize="40" color="#b46471" align="center" vAlign="middle" text="20"/>
+  </displayList>
+  <customProperty target="text" propertyId="0"/>
+</component>

FGUIProject/assets/Task/components/TabButton.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="261,72" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_ids4" name="n0" src="nd173p" fileName="images/yeqian_xz.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_ids4" name="title" xy="0,0" size="261,72" fontSize="40" color="#915e15" align="center" vAlign="middle" autoSize="none" singleLine="true" text="每日任务">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Task/components/TaskListItem.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1037,224">
+  <controller name="c1" pages="1,,2,,3," selected="2">
+    <remark page="0" value="未完成"/>
+    <remark page="1" value="可领取"/>
+    <remark page="2" value="已领取"/>
+  </controller>
+  <displayList>
+    <image id="n13_ids4" name="n13" src="nd172s" fileName="images/mrrw_db.png" xy="-4,8"/>
+    <image id="n12_ids4" name="n12" src="nd172y" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
+    <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
+    <text id="n14_ids4" name="txtCount" xy="390,20" size="84,44" fontSize="32" color="#915e15" vars="true" text="{cur=1}/{count=100}"/>
+    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://5mpsibzzwet22j" autoClearItems="true">
+      <item url="ui://5mpsibzznd1743"/>
+      <item url="ui://5mpsibzznd1743"/>
+    </list>
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,82" size="189,58">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
+    </component>
+    <component id="n17_ids4" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button title="前往" icon="ui://eg2y0ldpnd17tlv"/>
+    </component>
+    <component id="n18_ids4" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
+      <gearDisplay controller="c1" pages="3"/>
+      <Button title="领取" icon="ui://eg2y0ldpo9gh4l"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Task/package.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5mpsibzz">
   <resources>
-    <component id="lh8v27" name="DailyTaskUI.xml" path="/" exported="true"/>
-    <component id="lh8v3" name="Button1.xml" path="/components/"/>
-    <component id="lh8v4" name="Button2.xml" path="/components/"/>
-    <component id="lh8v5" name="ListItem.xml" path="/components/"/>
-    <component id="lh8v6" name="ListBoxRewardItem.xml" path="/components/"/>
+    <component id="lh8v5" name="TaskListItem.xml" path="/components/"/>
     <image id="wet228" name="mrqd_ylq.png" path="/images/"/>
     <image id="wet229" name="mrqd_1.png" path="/images/"/>
     <image id="wet22a" name="mrqd_2.png" path="/images/"/>
@@ -16,13 +12,10 @@
     <image id="wet22f" name="mrqd_anniu_4.png" path="/images/"/>
     <image id="wet22g" name="mrqd_bjbj.jpg" path="/images/"/>
     <image id="wet22h" name="mrqd_kdi.png" path="/images/"/>
-    <component id="wet22j" name="ListTaskRewardItem.xml" path="/components/"/>
-    <component id="wet22k" name="Button3.xml" path="/components/"/>
     <image id="wet22l" name="mrqd_xian.png" path="/images/"/>
     <image id="slkg2m" name="mrqd_anniu_5.png" path="/images/"/>
     <component id="fqor2n" name="TaskUI.xml" path="/" exported="true"/>
-    <component id="fqor2p" name="ComTask.xml" path="/"/>
-    <component id="fqor2q" name="ComBattle.xml" path="/"/>
+    <component id="fqor2p" name="CombTaskUI.xml" path="/" exported="true"/>
     <image id="nd172r" name="an_jia.png" path="/images/"/>
     <image id="nd172s" name="mrrw_db.png" path="/images/"/>
     <image id="nd172t" name="sj_dk.png" path="/images/"/>
@@ -65,6 +58,9 @@
     <component id="nd1742" name="RewardIconBlue.xml" path="/components/"/>
     <component id="nd1743" name="RewardIconYellow.xml" path="/components/"/>
     <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
+    <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
+    <component id="ids44c" name="LivenessRewardProcessItem.xml" path="/components/"/>
+    <component id="ids44e" name="TabButton.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -239,6 +239,7 @@ namespace GFGGame
             RechargeSProxy.ReqRechargeInfo().Coroutine();
             RechargeSProxy.ReqExchangeInfo().Coroutine();
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
+            TaskSProxy.GetTaskInfos();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();

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

@@ -3,51 +3,14 @@ using ET;
 
 namespace GFGGame
 {
-    public class TaskInfo
-    {
-        public int id;
-        public int state;//任务奖励状态 由ConstBonusStatus定义
-        public long progress;//进度
-    }
     public class DailyTaskDataManager : SingletonBase<DailyTaskDataManager>
     {
-        private Dictionary<int, TaskInfo> _taskInfos = new Dictionary<int, TaskInfo>();
-        public Dictionary<int, TaskInfo> TaskInfo
-        {
-            get
-            {
-                return _taskInfos;
-            }
-        }
-
         private Dictionary<int, int> _livenessBoxInfos = new Dictionary<int, int>();
-        public Dictionary<int, int> LivenessBoxInfos
-        {
-            get
-            {
-                return _livenessBoxInfos;
-            }
-        }
+        public Dictionary<int, int> LivenessBoxInfos => _livenessBoxInfos;
+
         public void Clear()
         {
             _livenessBoxInfos.Clear();
-            _taskInfos.Clear();
-        }
-        public void UpdateTaskInfo(int taskId, TaskInfo info)
-        {
-            if (!_taskInfos.ContainsKey(taskId))
-            {
-                _taskInfos.Add(taskId, info);
-            }
-            else
-            {
-                _taskInfos[taskId] = info;
-            }
-        }
-
-        public void UpdateTaskState(int taskId, int state)
-        {
-            _taskInfos[taskId].state = state;
         }
 
         public void UpdateLivenessBoxInfo(int boxId, int state)
@@ -64,118 +27,31 @@ namespace GFGGame
 
 
         /// <summary>
-        /// 获取任务列表
-        /// </summary>
-        /// <returns></returns>
-        public List<DailyTaskCfg> GetDailyTaskCfgs()
-        {
-            List<DailyTaskCfg> cfgs = new List<DailyTaskCfg>();
-
-            foreach (int key in _taskInfos.Keys)
-            {
-                DailyTaskCfg cfg = DailyTaskCfgArray.Instance.GetCfg(key);
-                cfgs.Add(cfg);
-            }
-            cfgs.Sort((DailyTaskCfg a, DailyTaskCfg b) =>
-            {
-                int stateA = _taskInfos[a.id].state == 1 ? 1 : -1;
-                int stateB = _taskInfos[b.id].state == 1 ? 1 : -1;
-                if (stateA > stateB) return -1;
-                if (stateB > stateA) return 1;
-                return _taskInfos[a.id].state.CompareTo(_taskInfos[b.id].state);
-
-            });
-            return cfgs;
-        }
-
-
-        /// <summary>
-        /// 根据任务id获取任务状态
-        /// </summary>0未完成，1可领取，2已领取
-        /// <param name="taskId"></param>
-        /// <returns></returns>
-        public int GetTaskStateById(int taskId)
-        {
-            if (!_taskInfos.ContainsKey(taskId))
-            {
-                return 0;
-            }
-            else
-            {
-                return _taskInfos[taskId].state;
-            }
-        }
-        /// <summary>
-        /// 根据任务id获取任务进度
-        /// </summary>
-        /// <param name="taskId"></param>
-        /// <returns></returns>
-        public long GetTaskProgressById(int taskId)
-        {
-            if (!_taskInfos.ContainsKey(taskId))
-            {
-                return 0;
-            }
-            else
-            {
-                return _taskInfos[taskId].progress;
-            }
-        }
-        /// <summary>
         /// 根据宝箱id获取宝箱状态
         /// </summary>0未完成，1可领取，2已领取
-        /// <param name="taskId"></param>
+        /// <param name="boxId"></param>
         /// <returns></returns>
         public int GetBoxStateById(int boxId)
         {
-            if (!_livenessBoxInfos.ContainsKey(boxId))
-            {
-                return 0;
-            }
-            else
-            {
-                return _livenessBoxInfos[boxId];
-            }
+            return !_livenessBoxInfos.ContainsKey(boxId) ? 0 : _livenessBoxInfos[boxId];
         }
 
-        public string GetTaskDesc(int taskId)
-        {
-            DailyTaskCfg taskCfg = DailyTaskCfgArray.Instance.GetCfg(taskId);
-            DailyTaskTypeCfg activeRewardCfg = DailyTaskTypeCfgArray.Instance.GetCfg(taskCfg.type);
-            switch ((ConstTaskType)activeRewardCfg.id)
-            {
-                case ConstTaskType.CompleteInstanceZones:
-                    string name = "";
-                    name = EctypeCfgArray.Instance.GetCfgsBytype(taskCfg.paramsArr[0])[0].typeName;
-                    if (taskCfg.paramsArr.Length > 1)
-                    {
-                        name = EctypeCfgArray.Instance.GetCfgBytypeAndsubType(taskCfg.paramsArr[0], taskCfg.paramsArr[1]).subName;
-                    }
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, name);
-
-                case ConstTaskType.UseItem:
-                    ItemCfg cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
-
-                default:
-                    return string.Format(activeRewardCfg.desc, taskCfg.count);
-            }
-        }
         /// <summary>
         /// 获取下一个奖励宝箱的活跃度
         /// </summary>
         /// <returns></returns>
         public int GetShowLivenessBoxNum()
         {
-            DailyActiveRewardCfg[] cfgs = DailyActiveRewardCfgArray.Instance.dataArray;
-            for (int i = 0; i < cfgs.Length; i++)
+            var cfgs = DailyActiveRewardCfgArray.Instance.dataArray;
+            foreach (var t in cfgs)
             {
-                if (!_livenessBoxInfos.ContainsKey(cfgs[i].id) || _livenessBoxInfos[cfgs[i].id] != ConstBonusStatus.GOT)
+                if (!_livenessBoxInfos.ContainsKey(t.id) || _livenessBoxInfos[t.id] != ConstBonusStatus.GOT)
                 {
-                    return cfgs[i].count;
+                    return t.count;
                 }
             }
-            int index = cfgs.Length - 1;
+
+            var index = cfgs.Length - 1;
             return cfgs[index].count;
         }
     }

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

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace GFGGame
@@ -26,16 +25,17 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetTaskRed()
         {
-            Dictionary<int, TaskInfo> taskInfo = DailyTaskDataManager.Instance.TaskInfo;
-            foreach (int key in taskInfo.Keys)
-            {
-                if (DailyTaskDataManager.Instance.GetTaskStateById(key) == ConstBonusStatus.CAN_GET) return true;
-            }
-            Dictionary<int, int> livenessBoxInfos = DailyTaskDataManager.Instance.LivenessBoxInfos;
-            foreach (int key in livenessBoxInfos.Keys)
-            {
-                if (DailyTaskDataManager.Instance.GetBoxStateById(key) == ConstBonusStatus.CAN_GET) return true;
-            }
+            //TODO
+            // Dictionary<int, TaskInfo> taskInfo = TaskDataManager.TaskInfo;
+            // foreach (int key in taskInfo.Keys)
+            // {
+            //     if (DailyTaskDataManager.Instance.GetTaskStateById(key) == ConstBonusStatus.CAN_GET) return true;
+            // }
+            // Dictionary<int, int> livenessBoxInfos = DailyTaskDataManager.Instance.LivenessBoxInfos;
+            // foreach (int key in livenessBoxInfos.Keys)
+            // {
+            //     if (DailyTaskDataManager.Instance.GetBoxStateById(key) == ConstBonusStatus.CAN_GET) return true;
+            // }
             return false;
         }
 
@@ -140,7 +140,7 @@ namespace GFGGame
                 GiftBagCfg cfg = _giftCfgs[i];
                 bool isUnLock = RechargeDataManager.Instance.GetGiftStateById(cfg.id);
                 int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-                bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
+                bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum;
                 if (isUnLock && canBuy && cfg.price == 0) return true;
 
             }
@@ -248,7 +248,7 @@ namespace GFGGame
         /// <summary>
         /// 卡牌-卡牌技能升级
         /// </summary>
-        /// <param name="cardId"></param>
+        /// <param name="skillId"></param>
         /// <returns></returns>
         public bool GetCardSkillRed(int skillId)
         {

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

@@ -0,0 +1,143 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+
+namespace GFGGame
+{
+    public class TaskInfo
+    {
+        public int ID;
+        public int State; //任务奖励状态 由ConstBonusStatus定义
+        public long Progress; //进度
+    }
+
+
+    public class TaskDataManager : SingletonBase<TaskDataManager>
+    {
+        //解锁的任务列表
+        public Dictionary<int, TaskInfo> TaskInfosDic = new Dictionary<int, TaskInfo>();
+
+        //已解锁的任务类型对应的任务id列表
+        public Dictionary<int, List<int>> TaskType2TaskIdListDic = new Dictionary<int, List<int>>();
+
+        //获取某个类型任务数据
+        public Dictionary<int, TaskInfo> GetTaskInfos(int taskType)
+        {
+            return TaskType2TaskIdListDic.TryGetValue(taskType, out var taskIds)
+                ? taskIds.ToDictionary(taskId => taskId, taskId => TaskInfosDic[taskId])
+                : new Dictionary<int, TaskInfo>();
+        }
+
+        public void UpdateTaskInfo(int taskId, TaskInfo info)
+        {
+            //获取任务配置
+            var cfg = DailyTaskCfgArray.Instance.GetCfg(taskId);
+            if (cfg == null)
+            {
+                Log.Error($"出现了没有配置的任务id{taskId}");
+                return;
+            }
+
+            TaskInfosDic.TryGetValue(taskId, out var taskInfo);
+            if (taskInfo == null)
+            {
+                TaskInfosDic.Add(taskId, info);
+                TaskType2TaskIdListDic.TryGetValue(taskId, out var taskIds);
+                if (taskIds == null)
+                {
+                    taskIds = new List<int>();
+                    TaskType2TaskIdListDic.Add(cfg.type, taskIds);
+                }
+
+                taskIds.Add(taskId);
+            }
+            else
+            {
+                TaskInfosDic[taskId] = info;
+            }
+        }
+
+        public void UpdateTaskState(int taskId, int state)
+        {
+            TaskInfosDic.TryGetValue(taskId, out var taskInfo);
+            if (taskInfo == null)
+            {
+                Log.Error($"出现了不存在的任务id{taskId}");
+                return;
+            }
+
+            taskInfo.State = state;
+        }
+
+        /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        /// <returns></returns>
+        public List<TaskCfg> GetTaskCfgs(int taskType)
+        {
+            var cfgs = new List<TaskCfg>();
+
+            TaskType2TaskIdListDic.TryGetValue(taskType, out var taskIds);
+            if (taskIds == null) return cfgs;
+            cfgs.AddRange(taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId)));
+
+            cfgs.Sort((a, b) =>
+            {
+                var stateA = TaskInfosDic[a.id].State == 1 ? 1 : -1;
+                var stateB = TaskInfosDic[b.id].State == 1 ? 1 : -1;
+                if (stateA > stateB) return -1;
+                return stateB > stateA ? 1 : TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State);
+            });
+            return cfgs;
+        }
+
+
+        /// <summary>
+        /// 根据任务id获取任务状态
+        /// </summary>0未完成，1可领取，2已领取
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public int GetTaskStateById(int taskId)
+        {
+            return !TaskInfosDic.ContainsKey(taskId) ? 0 : TaskInfosDic[taskId].State;
+        }
+
+        /// <summary>
+        /// 根据任务id获取任务进度
+        /// </summary>
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public long GetTaskProgressById(int taskId)
+        {
+            return !TaskInfosDic.ContainsKey(taskId) ? 0 : TaskInfosDic[taskId].Progress;
+        }
+
+
+        public string GetTaskDesc(int taskId)
+        {
+            var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
+            var activeRewardCfg = TaskTypeCfgArray.Instance.GetCfg(taskCfg.type);
+            switch ((ConstTaskType)activeRewardCfg.id)
+            {
+                case ConstTaskType.CompleteInstanceZones:
+                    var name = EctypeCfgArray.Instance.GetCfgsBytype(taskCfg.paramsArr[0])[0].typeName;
+                    if (taskCfg.paramsArr.Length > 1)
+                    {
+                        name = EctypeCfgArray.Instance
+                            .GetCfgBytypeAndsubType(taskCfg.paramsArr[0], taskCfg.paramsArr[1]).subName;
+                    }
+
+                    return string.Format(activeRewardCfg.desc, taskCfg.count, name);
+
+                case ConstTaskType.UseItem:
+                    var cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
+                    return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
+
+                case ConstTaskType.UpgradeCardLvl:
+                case ConstTaskType.PlayLuckBox:
+                default:
+                    return string.Format(activeRewardCfg.desc, taskCfg.count);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 50102bf405cb485e8517d6b377947e28
+timeCreated: 1684467224

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_Button3.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyTask
-{
-    public partial class UI_Button3
-    {
-        public GButton target;
-        public Controller m_c1;
-        public const string URL = "ui://5mpsibzzwet22k";
-        public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "Button3";
-        private static UI_Button3 _proxy;
-
-        public static UI_Button3 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button3();
-            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_Button3 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button3();
-            }
-            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/DailyTask/UI_DailyTaskUI.cs

@@ -1,96 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyTask
-{
-    public partial class UI_DailyTaskUI
-    {
-        public GComponent target;
-        public GLoader m_loaBg;
-        public GList m_listReward;
-        public GTextField m_txtDesc0;
-        public GLoader m_loaIcon;
-        public GTextField m_txtDesc1;
-        public GList m_list;
-        public UI_Button3 m_btnGetAll;
-        public GComponent m_comValueBar;
-        public GButton m_btnback;
-        public const string URL = "ui://5mpsibzzlh8v27";
-        public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "DailyTaskUI";
-        private static UI_DailyTaskUI _proxy;
-
-        public static UI_DailyTaskUI Create(GObject gObject = null)
-        {
-            var ui = new UI_DailyTaskUI();
-            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_DailyTaskUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_DailyTaskUI();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_listReward = (GList)comp.GetChild("listReward");
-            m_txtDesc0 = (GTextField)comp.GetChild("txtDesc0");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc1 = (GTextField)comp.GetChild("txtDesc1");
-            m_list = (GList)comp.GetChild("list");
-            m_btnGetAll = (UI_Button3)UI_Button3.Create(comp.GetChild("btnGetAll"));
-            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
-            m_btnback = (GButton)comp.GetChild("btnback");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            m_listReward = null;
-            m_txtDesc0 = null;
-            m_loaIcon = null;
-            m_txtDesc1 = null;
-            m_list = null;
-            m_btnGetAll.Dispose();
-            m_btnGetAll = null;
-            m_comValueBar = null;
-            m_btnback = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs

@@ -1,92 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyTask
-{
-    public partial class UI_ListItem
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public Controller m_c2;
-        public GTextField m_txtDesc;
-        public GButton m_btnGet;
-        public GButton m_btnGo;
-        public GButton m_btnGot;
-        public GTextField m_txtCount;
-        public GList m_listTaskReward;
-        public const string URL = "ui://5mpsibzzlh8v5";
-        public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "ListItem";
-        private static UI_ListItem _proxy;
-
-        public static UI_ListItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListItem();
-            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_ListItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_btnGo = (GButton)comp.GetChild("btnGo");
-            m_btnGot = (GButton)comp.GetChild("btnGot");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_c2 = null;
-            m_txtDesc = null;
-            m_btnGet = null;
-            m_btnGo = null;
-            m_btnGot = null;
-            m_txtCount = null;
-            m_listTaskReward = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListTaskRewardItem.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyTask
-{
-    public partial class UI_ListTaskRewardItem
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtNum;
-        public const string URL = "ui://5mpsibzzwet22j";
-        public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "ListTaskRewardItem";
-        private static UI_ListTaskRewardItem _proxy;
-
-        public static UI_ListTaskRewardItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListTaskRewardItem();
-            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_ListTaskRewardItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListTaskRewardItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtNum = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListTaskRewardItem.cs.meta

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

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

@@ -7,10 +7,11 @@ namespace UI.Task
     public partial class UI_BattlePassRewardUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
         public GTextField m_LeftTime;
-        public GList m_RewardList;
+        public UI_ExpProcess m_LevelProcess;
         public GButton m_btnOpen;
+        public GList m_RewardList;
+        public UI_BattlePassRewardItem m_NowReward;
         public GButton m_btnGetAll;
         public const string URL = "ui://5mpsibzznd173r";
         public const string PACKAGE_NAME = "Task";
@@ -59,18 +60,22 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
-            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_NowReward = (UI_BattlePassRewardItem)UI_BattlePassRewardItem.Create(comp.GetChild("NowReward"));
             m_btnGetAll = (GButton)comp.GetChild("btnGetAll");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
             m_LeftTime = null;
-            m_RewardList = null;
+            m_LevelProcess.Dispose();
+            m_LevelProcess = null;
             m_btnOpen = null;
+            m_RewardList = null;
+            m_NowReward.Dispose();
+            m_NowReward = null;
             m_btnGetAll = null;
             if(disposeTarget && target != null)
             {

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Task
-{
-    public partial class UI_Button3
-    {
-        public GButton target;
-        public Controller m_c1;
-        public const string URL = "ui://5mpsibzzwet22k";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "Button3";
-        private static UI_Button3 _proxy;
-
-        public static UI_Button3 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button3();
-            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_Button3 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button3();
-            }
-            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/Task/UI_Button3.cs.meta

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

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

@@ -1,90 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Task
-{
-    public partial class UI_ComTask
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GList m_listReward;
-        public GTextField m_txtDesc0;
-        public GLoader m_loaIcon;
-        public GTextField m_txtDesc1;
-        public GList m_list;
-        public UI_Button3 m_btnGetAll;
-        public const string URL = "ui://5mpsibzzfqor2p";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "ComTask";
-        private static UI_ComTask _proxy;
-
-        public static UI_ComTask Create(GObject gObject = null)
-        {
-            var ui = new UI_ComTask();
-            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_ComTask Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComTask();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_listReward = (GList)comp.GetChild("listReward");
-            m_txtDesc0 = (GTextField)comp.GetChild("txtDesc0");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc1 = (GTextField)comp.GetChild("txtDesc1");
-            m_list = (GList)comp.GetChild("list");
-            m_btnGetAll = (UI_Button3)UI_Button3.Create(comp.GetChild("btnGetAll"));
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_listReward = null;
-            m_txtDesc0 = null;
-            m_loaIcon = null;
-            m_txtDesc1 = null;
-            m_list = null;
-            m_btnGetAll.Dispose();
-            m_btnGetAll = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ComTask.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListBoxRewardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_CombTaskUI.cs

@@ -2,22 +2,23 @@
 
 using FairyGUI;
 
-namespace UI.DailyTask
+namespace UI.Task
 {
-    public partial class UI_ListBoxRewardItem
+    public partial class UI_CombTaskUI
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextField m_txtNum;
-        public GTextField m_txtTitle;
-        public const string URL = "ui://5mpsibzzlh8v6";
-        public const string PACKAGE_NAME = "DailyTask";
-        public const string RES_NAME = "ListBoxRewardItem";
-        private static UI_ListBoxRewardItem _proxy;
+        public UI_LivenessRewardProcess m_LivenessProcess;
+        public GList m_TaskList;
+        public GButton m_GetAll;
+        public const string URL = "ui://5mpsibzzfqor2p";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "CombTaskUI";
+        private static UI_CombTaskUI _proxy;
 
-        public static UI_ListBoxRewardItem Create(GObject gObject = null)
+        public static UI_CombTaskUI Create(GObject gObject = null)
         {
-            var ui = new UI_ListBoxRewardItem();
+            var ui = new UI_CombTaskUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +27,11 @@ namespace UI.DailyTask
             return ui;
         }
 
-        public static UI_ListBoxRewardItem Proxy(GObject gObject = null)
+        public static UI_CombTaskUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListBoxRewardItem();
+                _proxy = new UI_CombTaskUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,14 +59,17 @@ namespace UI.DailyTask
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_LivenessProcess = (UI_LivenessRewardProcess)UI_LivenessRewardProcess.Create(comp.GetChild("LivenessProcess"));
+            m_TaskList = (GList)comp.GetChild("TaskList");
+            m_GetAll = (GButton)comp.GetChild("GetAll");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtNum = null;
-            m_txtTitle = null;
+            m_LivenessProcess.Dispose();
+            m_LivenessProcess = null;
+            m_TaskList = null;
+            m_GetAll = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_CombTaskUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5c7b6ebf5276cbc40a83c7a1dc270b48
+guid: 750116f77ae474359879d9162da29ed5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,96 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Task
-{
-    public partial class UI_DailyTaskUI
-    {
-        public GComponent target;
-        public GLoader m_loaBg;
-        public GList m_listReward;
-        public GTextField m_txtDesc0;
-        public GLoader m_loaIcon;
-        public GTextField m_txtDesc1;
-        public GList m_list;
-        public UI_Button3 m_btnGetAll;
-        public GComponent m_comValueBar;
-        public GButton m_btnback;
-        public const string URL = "ui://5mpsibzzlh8v27";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "DailyTaskUI";
-        private static UI_DailyTaskUI _proxy;
-
-        public static UI_DailyTaskUI Create(GObject gObject = null)
-        {
-            var ui = new UI_DailyTaskUI();
-            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_DailyTaskUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_DailyTaskUI();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_listReward = (GList)comp.GetChild("listReward");
-            m_txtDesc0 = (GTextField)comp.GetChild("txtDesc0");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc1 = (GTextField)comp.GetChild("txtDesc1");
-            m_list = (GList)comp.GetChild("list");
-            m_btnGetAll = (UI_Button3)UI_Button3.Create(comp.GetChild("btnGetAll"));
-            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
-            m_btnback = (GButton)comp.GetChild("btnback");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            m_listReward = null;
-            m_txtDesc0 = null;
-            m_loaIcon = null;
-            m_txtDesc1 = null;
-            m_list = null;
-            m_btnGetAll.Dispose();
-            m_btnGetAll = null;
-            m_comValueBar = null;
-            m_btnback = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_DailyTaskUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ListBoxRewardItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ListItem.cs.meta

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

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

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Task
-{
-    public partial class UI_ListTaskRewardItem
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtNum;
-        public const string URL = "ui://5mpsibzzwet22j";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "ListTaskRewardItem";
-        private static UI_ListTaskRewardItem _proxy;
-
-        public static UI_ListTaskRewardItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListTaskRewardItem();
-            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_ListTaskRewardItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListTaskRewardItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtNum = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ListTaskRewardItem.cs.meta

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

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

@@ -0,0 +1,88 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_LivenessRewardProcess
+    {
+        public GProgressBar target;
+        public UI_LivenessRewardProcessItem m_Reward20;
+        public UI_LivenessRewardProcessItem m_Reward40;
+        public UI_LivenessRewardProcessItem m_Reward60;
+        public UI_LivenessRewardProcessItem m_Reward80;
+        public UI_LivenessRewardProcessItem m_Reward100;
+        public const string URL = "ui://5mpsibzzids449";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "LivenessRewardProcess";
+        private static UI_LivenessRewardProcess _proxy;
+
+        public static UI_LivenessRewardProcess Create(GObject gObject = null)
+        {
+            var ui = new UI_LivenessRewardProcess();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LivenessRewardProcess Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LivenessRewardProcess();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_Reward20 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward20"));
+            m_Reward40 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward40"));
+            m_Reward60 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward60"));
+            m_Reward80 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward80"));
+            m_Reward100 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward100"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_Reward20.Dispose();
+            m_Reward20 = null;
+            m_Reward40.Dispose();
+            m_Reward40 = null;
+            m_Reward60.Dispose();
+            m_Reward60 = null;
+            m_Reward80.Dispose();
+            m_Reward80 = null;
+            m_Reward100.Dispose();
+            m_Reward100 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_Button3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_LivenessRewardProcess.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c7e7b25a294e5ea458569d12c2b592b0
+guid: c23db90161fd0484b9c23e8564ffda26
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ListBoxRewardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_LivenessRewardProcessItem.cs

@@ -4,20 +4,19 @@ using FairyGUI;
 
 namespace UI.Task
 {
-    public partial class UI_ListBoxRewardItem
+    public partial class UI_LivenessRewardProcessItem
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextField m_txtNum;
-        public GTextField m_txtTitle;
-        public const string URL = "ui://5mpsibzzlh8v6";
+        public GTextField m_text;
+        public const string URL = "ui://5mpsibzzids44c";
         public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "ListBoxRewardItem";
-        private static UI_ListBoxRewardItem _proxy;
+        public const string RES_NAME = "LivenessRewardProcessItem";
+        private static UI_LivenessRewardProcessItem _proxy;
 
-        public static UI_ListBoxRewardItem Create(GObject gObject = null)
+        public static UI_LivenessRewardProcessItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListBoxRewardItem();
+            var ui = new UI_LivenessRewardProcessItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +25,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_ListBoxRewardItem Proxy(GObject gObject = null)
+        public static UI_LivenessRewardProcessItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListBoxRewardItem();
+                _proxy = new UI_LivenessRewardProcessItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,14 +57,12 @@ namespace UI.Task
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_text = (GTextField)comp.GetChild("text");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtNum = null;
-            m_txtTitle = null;
+            m_text = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_LivenessRewardProcessItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 87bcfc53df6436a4b9606213b8b34ff2
+guid: 16cc299771c64499aa5203f94126eb09
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskListItem.cs

@@ -4,25 +4,24 @@ using FairyGUI;
 
 namespace UI.Task
 {
-    public partial class UI_ListItem
+    public partial class UI_TaskListItem
     {
         public GComponent target;
         public Controller m_c1;
-        public Controller m_c2;
         public GTextField m_txtDesc;
-        public GButton m_btnGet;
-        public GButton m_btnGo;
-        public GButton m_btnGot;
         public GTextField m_txtCount;
         public GList m_listTaskReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ComeBt;
+        public GButton m_HadGet;
         public const string URL = "ui://5mpsibzzlh8v5";
         public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "ListItem";
-        private static UI_ListItem _proxy;
+        public const string RES_NAME = "TaskListItem";
+        private static UI_TaskListItem _proxy;
 
-        public static UI_ListItem Create(GObject gObject = null)
+        public static UI_TaskListItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListItem();
+            var ui = new UI_TaskListItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -31,11 +30,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_ListItem Proxy(GObject gObject = null)
+        public static UI_TaskListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListItem();
+                _proxy = new UI_TaskListItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -63,24 +62,22 @@ namespace UI.Task
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_btnGo = (GButton)comp.GetChild("btnGo");
-            m_btnGot = (GButton)comp.GetChild("btnGot");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_HadGet = (GButton)comp.GetChild("HadGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_c2 = null;
             m_txtDesc = null;
-            m_btnGet = null;
-            m_btnGo = null;
-            m_btnGot = null;
             m_txtCount = null;
             m_listTaskReward = null;
+            m_GetRewardBt = null;
+            m_ComeBt = null;
+            m_HadGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListBoxRewardItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 064bc031d6a29f74a899f7b3a20210e8
+guid: 8738dbc55acf3418c8a76d66c77c227f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -11,7 +11,6 @@ namespace UI.Task
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
-        public UI_ComTask m_comTask;
         public const string URL = "ui://5mpsibzzfqor2n";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskUI";
@@ -63,7 +62,6 @@ namespace UI.Task
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comTask = (UI_ComTask)UI_ComTask.Create(comp.GetChild("comTask"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,8 +69,6 @@ namespace UI.Task
             m_loaBg = null;
             m_comValueBar = null;
             m_btnBack = null;
-            m_comTask.Dispose();
-            m_comTask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,12 +9,7 @@ namespace ET
     {
         protected override async ETTask Run(Session session, M2C_DailyTaskInfoChange message)
         {
-            TaskInfo taskInfo = new TaskInfo();
-            taskInfo.id = message.TaskInfo.Id;
-            taskInfo.state = message.TaskInfo.Status;
-            taskInfo.progress = message.TaskInfo.Progress;
-            DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
-            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            //移到了 M2C_TaskInfoChangeHandler
             await ETTask.CompletedTask;
         }
     }
@@ -38,87 +33,67 @@ namespace GFGGame
     {
         public static async ETTask<bool> ReqDailyTaskInfos()
         {
-            M2C_GetDailyTaskInfos response = null;
+            M2C_GetDailyTaskInfos response;
             response = (M2C_GetDailyTaskInfos)await MessageHelper.SendToServer(new C2M_GetDailyTaskInfos());
-            if (response != null)
+            if (response == null) return false;
+            if (response.Error != ErrorCode.ERR_Success) return false;
+            foreach (var t in response.TaskList)
             {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    for (int i = 0; i < response.TaskList.Count; i++)
-                    {
-                        TaskInfo taskInfo = new TaskInfo();
-                        taskInfo.id = response.TaskList[i].Id;
-                        taskInfo.state = response.TaskList[i].Status;
-                        taskInfo.progress = response.TaskList[i].Progress;
-                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
-                    }
-                    for (int i = 0; i < response.kLivenessBox.Count; i++)
-                    {
-                        DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.kLivenessBox[i], response.vLivenessBox[i]);
-                    }
-
-                    return true;
-                }
+                TaskInfo taskInfo = new TaskInfo();
+                taskInfo.ID = t.Id;
+                taskInfo.State = t.Status;
+                taskInfo.Progress = t.Progress;
+                TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
             }
-            return false;
+            for (var i = 0; i < response.kLivenessBox.Count; i++)
+            {
+                DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.kLivenessBox[i], response.vLivenessBox[i]);
+            }
+
+            return true;
         }
         public static async ETTask<bool> ReqDailyTaskBonus(int taskId)
         {
-            M2C_GetDailyTaskBonus response = null;
+            M2C_GetDailyTaskBonus response;
             response = (M2C_GetDailyTaskBonus)await MessageHelper.SendToServer(new C2M_GetDailyTaskBonus() { Id = taskId });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    DailyTaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);
-                    int[][] bonus = DailyTaskCfgArray.Instance.GetCfg(response.Id).rewardsArr;
-                    BonusController.TryShowBonusList(bonus);
-                    return true;
-                }
-            }
-            return false;
+            if (response == null) return false;
+            if (response.Error != ErrorCode.ERR_Success) return false;
+            TaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);
+            int[][] bonus = DailyTaskCfgArray.Instance.GetCfg(response.Id).rewardsArr;
+            BonusController.TryShowBonusList(bonus);
+            return true;
         }
         public static async ETTask<bool> ReqAllDailyTaskBonus()
         {
             M2C_GetAllDailyTaskBonus response = null;
             response = (M2C_GetAllDailyTaskBonus)await MessageHelper.SendToServer(new C2M_GetAllDailyTaskBonus());
-            if (response != null)
+            if (response == null) return false;
+            if (response.Error != ErrorCode.ERR_Success) return false;
+            // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+            foreach (var t in response.TaskList)
             {
-                if (response.Error == ErrorCode.ERR_Success)
+                var taskInfo = new TaskInfo
                 {
-                    // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
-                    for (int i = 0; i < response.TaskList.Count; i++)
-                    {
-                        TaskInfo taskInfo = new TaskInfo();
-                        taskInfo.id = response.TaskList[i].Id;
-                        taskInfo.state = response.TaskList[i].Status;
-                        taskInfo.progress = response.TaskList[i].Progress;
-                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
-                    }
-                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.BonusList);
-                    BonusController.TryShowBonusList(itemDatas);
-                    return true;
-                }
+                    ID = t.Id,
+                    State = t.Status,
+                    Progress = t.Progress
+                };
+                TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
             }
-            return false;
+            var itemDatas = ItemUtil.CreateItemDataList(response.BonusList);
+            BonusController.TryShowBonusList(itemDatas);
+            return true;
         }
         public static async ETTask<bool> ReqLivenessBox(int boxId)
         {
-            M2C_GetLivenessBox response = null;
+            M2C_GetLivenessBox response;
             response = (M2C_GetLivenessBox)await MessageHelper.SendToServer(new C2M_GetLivenessBox() { Id = boxId });
-            if (response != null)
-            {
-                if (response.Error == ErrorCode.ERR_Success)
-                {
-                    // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
-                    DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.Id, response.Status);
-                    int[][] bonus = DailyActiveRewardCfgArray.Instance.GetCfg(response.Id).rewardsArr;
-                    BonusController.TryShowBonusList(bonus);
-
-                    return true;
-                }
-            }
-            return false;
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            // BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+            DailyTaskDataManager.Instance.UpdateLivenessBoxInfo(response.Id, response.Status);
+            var bonus = DailyActiveRewardCfgArray.Instance.GetCfg(response.Id).rewardsArr;
+            BonusController.TryShowBonusList(bonus);
+            return true;
         }
     }
 }

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

@@ -18,10 +18,10 @@ namespace GFGGame
                     for (int i = 0; i < response.TaskList.Count; i++)
                     {
                         TaskInfo taskInfo = new TaskInfo();
-                        taskInfo.id = response.TaskList[i].Id;
-                        taskInfo.state = response.TaskList[i].Status;
-                        taskInfo.progress = response.TaskList[i].Progress;
-                        DailyTaskDataManager.Instance.UpdateTaskInfo(taskInfo.id, taskInfo);
+                        taskInfo.ID = response.TaskList[i].Id;
+                        taskInfo.State = response.TaskList[i].Status;
+                        taskInfo.Progress = response.TaskList[i].Progress;
+                        TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
                     }
                     for (int i = 0; i < response.kLivenessBox.Count; i++)
                     {

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

@@ -0,0 +1,71 @@
+using ET;
+using GFGGame;
+
+namespace ET
+{
+    //M2C_TaskInfoChange
+    public class M2C_TaskInfoChangeHandler : AMHandler<M2C_TaskInfoChange>
+    {
+        protected override async ETTask Run(Session session, M2C_TaskInfoChange message)
+        {
+            // Log.Info($"M2C_TaskInfoChangeHandler");
+            var taskInfo = new TaskInfo();
+            taskInfo.ID = message.TaskInfo.Id;
+            taskInfo.State = message.TaskInfo.Status;
+            taskInfo.Progress = message.TaskInfo.Progress;
+            TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            await ETTask.CompletedTask;
+        }
+    }
+}
+
+namespace GFGGame
+{
+    public static class TaskSProxy
+    {
+        //获取所有类型的任务信息
+        public static void GetTaskInfos()
+        {
+            for (var i = TaskType.Day7; i < TaskType.TaskMax; i++) GetTaskInfos(i).Coroutine();
+        }
+
+        //C2M_GetTaskInfos
+        private static async ETTask<bool> GetTaskInfos(int taskType)
+        {
+            //C2M_GetTaskInfos
+            var response = (M2C_GetTaskInfos)await MessageHelper.SendToServer(new C2M_GetTaskInfos { Type = taskType });
+            return response.Error == ErrorCode.ERR_Success;
+        }
+
+        //C2M_GetTaskBonus
+        public static async ETTask<bool> GetTaskBonus(int taskId)
+        {
+            //C2M_GetTaskBonus
+            var response = (M2C_GetTaskBonus)await MessageHelper.SendToServer(new C2M_GetTaskBonus
+            {
+            });
+            if (response.Error != ErrorCode.ERR_Success)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        //C2M_GetAllTaskBonus
+        public static async ETTask<bool> GetAllTaskBonus()
+        {
+            //C2M_GetAllTaskBonus
+            var response = (M2C_GetAllTaskBonus)await MessageHelper.SendToServer(new C2M_GetAllTaskBonus
+            {
+            });
+            if (response.Error != ErrorCode.ERR_Success)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/TaskSProxy.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 80a6f20f24094eee8c8aee5b031bbf5f
+timeCreated: 1684466672

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

@@ -297,7 +297,7 @@ namespace GFGGame
                     isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.DAILY_TASK:
-                    isJump = ViewManager.Show<DailyTaskView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<CombTaskView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
                     isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);

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

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using FairyGUI;
 using UI.CommonGame;
-using UI.DailyTask;
-using UnityEngine;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -1,195 +0,0 @@
-
-using System.Collections.Generic;
-using ET;
-using FairyGUI;
-using UI.DailyTask;
-using UnityEngine;
-
-namespace GFGGame
-{
-    public class DailyTaskView : BaseWindow
-    {
-        private UI_DailyTaskUI _ui;
-        private ValueBarController _valueBarController;
-
-        private List<DailyTaskCfg> _cfgs;
-        private List<DailyActiveRewardCfg> _rewardCfgs;
-
-        public override void Dispose()
-        {
-            base.Dispose();
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-
-            packageName = UI_DailyTaskUI.PACKAGE_NAME;
-            _ui = UI_DailyTaskUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _valueBarController = new ValueBarController(_ui.m_comValueBar);
-
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
-            _ui.m_btnGetAll.target.onClick.Add(OnBtnGetAllClick);
-            _ui.m_list.itemRenderer = ListItemRender;
-            _ui.m_listReward.itemRenderer = ListBoxRewardItemRender;
-            _ui.m_listReward.onClickItem.Add(OnBoxRewardItemClick);
-        }
-
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("mrqd_bjbj");
-
-            _valueBarController.OnShown();
-            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
-            UpdateList();
-            UpdateReward();
-            _ui.m_list.ScrollToView(0);
-
-        }
-
-        protected override void OnHide()
-        {
-            _valueBarController.OnHide();
-            base.OnHide();
-        }
-
-        private void UpdateList()
-        {
-            _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
-
-            _ui.m_list.numItems = _cfgs.Count;
-
-        }
-        private void UpdateReward()
-        {
-            _ui.m_listReward.numItems = _rewardCfgs.Count;
-            _ui.m_txtDesc0.text = string.Format("今日活跃度{0}", RoleDataManager.Liveness);
-            _ui.m_txtDesc1.text = string.Format(",满{0}活跃度可领奖", DailyTaskDataManager.Instance.GetShowLivenessBoxNum());
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(ConstItemID.LIVENESS);
-            _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-            bool canGet = DailyTaskDataManager.Instance.GetTaskStateById(_cfgs[0].id) == ConstBonusStatus.CAN_GET;
-            _ui.m_btnGetAll.m_c1.selectedIndex = canGet ? 1 : 0;//第一个不可领说明没有可领奖的任务
-            _ui.m_btnGetAll.target.touchable = canGet;
-        }
-        private void ListItemRender(int index, GObject obj)
-        {
-            UI_ListItem item = UI_ListItem.Proxy(obj);
-            item.m_c1.selectedIndex = DailyTaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
-            item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1;
-            item.m_txtDesc.text = DailyTaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
-            item.m_txtCount.text = string.Format("{0}/{1}", DailyTaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id), _cfgs[index].count);
-            if (item.m_btnGet.data == null)
-            {
-                item.m_btnGet.onClick.Add(OnBtnGetClick);
-            }
-            item.m_btnGet.data = _cfgs[index].id;
-            if (item.m_btnGo.data == null)
-            {
-                item.m_btnGo.onClick.Add(OnBtnGoClick);
-            }
-            item.m_btnGo.data = _cfgs[index].jumpId;
-
-            if (item.m_listTaskReward.data == null)
-            {
-                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
-            }
-            item.m_listTaskReward.data = _cfgs[index].rewardsArr;
-            item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
-            UI_ListItem.ClearProxy();
-        }
-        private void ListTaskRewardItemRender(int index, GObject obj)
-        {
-
-            UI_ListTaskRewardItem item = UI_ListTaskRewardItem.Proxy(obj);
-            int[][] rewards = (int[][])item.target.parent.data;
-
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
-            item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-            item.m_txtNum.text = string.Format("x{0}", rewards[index][1]);
-            UI_ListTaskRewardItem.ProxyEnd();
-        }
-        private async void OnBtnGetClick(EventContext context)
-        {
-            GObject btnGet = context.sender as GObject;
-            bool result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data);
-            if (result)
-            {
-                UpdateList();
-                UpdateReward();
-                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
-
-            }
-        }
-        private void OnBtnGoClick(EventContext context)
-        {
-            this.Hide();
-            GObject btnGo = context.sender as GObject;
-            ViewManager.Show(string.Format("GFGGame.{0}", btnGo.data), null, new object[] { typeof(DailyTaskView).FullName, this.viewData }, true);
-        }
-
-        private void ListBoxRewardItemRender(int index, GObject obj)
-        {
-            UI_ListBoxRewardItem item = UI_ListBoxRewardItem.Proxy(obj);
-            DailyActiveRewardCfg cfg = _rewardCfgs[index];
-            int state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
-            item.m_c1.selectedIndex = state;
-            item.m_txtNum.text = cfg.count.ToString();
-            RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 12, 4);
-
-            item.target.data = _rewardCfgs[index];
-            UI_ListBoxRewardItem.ClearProxy();
-        }
-
-        private async void OnBoxRewardItemClick(EventContext context)
-        {
-            GObject item = context.data as GObject;
-            DailyActiveRewardCfg cfg = item.data as DailyActiveRewardCfg;
-
-            if (DailyTaskDataManager.Instance.GetBoxStateById(cfg.id) == ConstBonusStatus.CAN_GET)
-            {
-                bool result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                if (result)
-                {
-                    UpdateReward();
-
-                }
-            }
-            else
-            {
-                List<ItemData> rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", string.Format("满足{0}活跃度可领取", cfg.count) });
-            }
-        }
-
-        private void OnBtnBackClick()
-        {
-            ViewManager.GoBackFrom(typeof(DailyTaskView).FullName);
-        }
-        private async void OnBtnGetAllClick()
-        {
-            bool result = await DailyTaskSProxy.ReqAllDailyTaskBonus();
-            if (result)
-            {
-                UpdateList();
-                UpdateReward();
-                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
-
-            }
-
-        }
-    }
-}

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

@@ -5,7 +5,7 @@ using UI.Task;
 
 namespace GFGGame
 {
-    public class BattlePassTaskView : BaseView
+    public class BattlePassTaskView : BaseWindow
     {
         private UI_BattlePassRewardUI _ui;
 
@@ -29,6 +29,7 @@ namespace GFGGame
             _ui = UI_BattlePassRewardUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            clickBlankToClose = false;
 
             _ui.m_btnOpen.onClick.Add(OnBtnOpenClick);
             // _ui.m_btnGet.onClick.Add(OnBtnGetClick);
@@ -42,7 +43,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("scsc_bjbj");
             //获取通行证奖励配置
             //TODO 获取赛季id
             var SeaseonId = 1;

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

@@ -0,0 +1,193 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class CombTaskView : BaseWindow
+    {
+        private UI_CombTaskUI _ui;
+        private List<TaskCfg> _cfgs;
+        private List<DailyActiveRewardCfg> _rewardCfgs;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_CombTaskUI.PACKAGE_NAME;
+            _ui = UI_CombTaskUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            clickBlankToClose = false;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
+            UpdateLivenessProcess();
+        }
+
+        //更新活跃度进度条
+        private void UpdateLivenessProcess()
+        {
+            var liveness = RoleDataManager.Liveness;
+            DailyTaskDataManager.Instance.GetShowLivenessBoxNum();
+            _ui.m_LivenessProcess.target.max = 100;
+            _ui.m_LivenessProcess.target.value = liveness;
+            var cfgs = DailyActiveRewardCfgArray.Instance.dataArray;
+            for (var i = 0; i < cfgs.Length; i++)
+            {
+                var boxId = i + 1;
+                var state = DailyTaskDataManager.Instance.GetBoxStateById(boxId);
+                var index = state == ConstBonusStatus.CAN_GET ? 0 : 1;
+                switch (boxId)
+                {
+                    case 1:
+                        _ui.m_LivenessProcess.m_Reward20.m_c1.selectedIndex = index;
+                        break;
+                    case 2:
+                        _ui.m_LivenessProcess.m_Reward40.m_c1.selectedIndex = index;
+                        break;
+                    case 3:
+                        _ui.m_LivenessProcess.m_Reward60.m_c1.selectedIndex = index;
+                        break;
+                    case 4:
+                        _ui.m_LivenessProcess.m_Reward80.m_c1.selectedIndex = index;
+                        break;
+                    case 5:
+                        _ui.m_LivenessProcess.m_Reward100.m_c1.selectedIndex = index;
+                        break;
+                }
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void UpdateList()
+        {
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.Daily);
+        }
+
+        private void UpdateReward()
+        {
+        }
+
+        private void ListItemRender(int index, GObject obj)
+        {
+            // var item = UI_ListItem.Proxy(obj);
+            // item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            // item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1;
+            // item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
+            // item.m_txtCount.text = string.Format("{0}/{1}", TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id), _cfgs[index].count);
+            // if (item.m_btnGet.data == null)
+            // {
+            //     item.m_btnGet.onClick.Add(OnBtnGetClick);
+            // }
+            // item.m_btnGet.data = _cfgs[index].id;
+            // if (item.m_btnGo.data == null)
+            // {
+            //     item.m_btnGo.onClick.Add(OnBtnGoClick);
+            // }
+            // item.m_btnGo.data = _cfgs[index].jumpId;
+            //
+            // if (item.m_listTaskReward.data == null)
+            // {
+            //     item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            // }
+            // item.m_listTaskReward.data = _cfgs[index].rewardsArr;
+            // item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
+            // UI_ListItem.ClearProxy();
+        }
+
+        private void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            // var item = UI_ListTaskRewardItem.Proxy(obj);
+            // var rewards = (int[][])item.target.parent.data;
+            //
+            // var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
+            // item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+            // item.m_txtNum.text = $"x{rewards[index][1]}";
+            // UI_ListTaskRewardItem.ProxyEnd();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            var btnGet = context.sender as GObject;
+            var result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data);
+            if (!result) return;
+            UpdateList();
+            UpdateReward();
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            Hide();
+            var btnGo = context.sender as GObject;
+            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(CombTaskView).FullName, viewData }, true);
+        }
+
+        private void ListBoxRewardItemRender(int index, GObject obj)
+        {
+            // var item = UI_ListBoxRewardItem.Proxy(obj);
+            // var cfg = _rewardCfgs[index];
+            // var state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
+            // item.m_c1.selectedIndex = state;
+            // item.m_txtNum.text = cfg.count.ToString();
+            // RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 12, 4);
+            //
+            // item.target.data = _rewardCfgs[index];
+            // UI_ListBoxRewardItem.ClearProxy();
+        }
+
+        private async void OnBoxRewardItemClick(EventContext context)
+        {
+            var item = context.data as GObject;
+            var cfg = item.data as DailyActiveRewardCfg;
+
+            if (DailyTaskDataManager.Instance.GetBoxStateById(cfg.id) == ConstBonusStatus.CAN_GET)
+            {
+                var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                if (result)
+                {
+                    UpdateReward();
+                }
+            }
+            else
+            {
+                var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                ViewManager.Show<RewardPreView>(new object[]
+                    { rewards, "活跃度奖励", string.Format("满足{0}活跃度可领取", cfg.count) });
+            }
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(CombTaskView).FullName);
+        }
+
+        private async void OnBtnGetAllClick()
+        {
+            var result = await DailyTaskSProxy.ReqAllDailyTaskBonus();
+            if (!result) return;
+            UpdateList();
+            UpdateReward();
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+        }
+    }
+}

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

@@ -30,7 +30,7 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_TaskUI.PACKAGE_NAME;
             _ui = UI_TaskUI.Create();
-            this.viewCom = _ui.target;
+            viewCom = _ui.target;
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
@@ -75,7 +75,7 @@ namespace GFGGame
             switch (_ui.m_c1.selectedIndex)
             {
                 case 1:
-                    ViewManager.Show<DailyTaskView>();
+                    ViewManager.Show<CombTaskView>();
                     break;
                 case 2:
                     ViewManager.Show<BattlePassTaskView>();