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

# Conflicts:
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

FGUIProject/assets/CommonGame/components/ComItemBlue.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,124" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true">
+      <property target="bg" propertyId="1" value="ui://eg2y0ldpuxxstma"/>
+      <property target="numBg" propertyId="1" value="ui://eg2y0ldpuxxstm5"/>
+    </component>
+    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComItemIconNew.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="124,124">
   <displayList>
-    <image id="n25_pu55" name="n25" src="l500tlv" fileName="imagesNew/wpk_db_1.png" xy="1,1" group="n30_9jv6"/>
+    <loader id="n25_pu55" name="bg" xy="1,1" size="123,123" group="n30_9jv6" url="ui://eg2y0ldpl500tlv"/>
     <loader id="n12_ehs9" name="loaIcon" xy="63,63" pivot="0.5,0.5" anchor="true" size="102,102" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
-    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="101,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="89,7" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
-    <image id="n31_l500" name="n31" src="l500tlw" fileName="imagesNew/wpk_sz_db.png" xy="7,86" group="n30_9jv6"/>
+    <loader id="n31_l500" name="numBg" xy="7,86" size="112,32" group="n30_9jv6" url="ui://eg2y0ldpl500tlw"/>
     <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
     <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
     <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="-18,42" size="160,40" group="n29_pu55"/>
@@ -15,4 +15,6 @@
     <group id="n27_pu55" name="grpGot" xy="6,6" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
     <group id="n30_9jv6" name="n30" xy="-27,1" size="178,229"/>
   </displayList>
+  <customProperty target="bg" propertyId="1"/>
+  <customProperty target="numBg" propertyId="1"/>
 </component>

FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1037,224">
-  <controller name="c1" pages="1,,2,,3," selected="2">
+  <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" pages="0,CanGo,1,NotGo" selected="0"/>
-  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="1"/>
+  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="0"/>
   <displayList>
     <image id="n13_ids4" name="n13" src="uxxstmj" fileName="imagesNew/mrrw_db.png" xy="-4,8"/>
     <image id="n12_ids4" name="n12" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
     <text id="n14_ids4" name="txtCount" xy="390,20" size="80,44" fontSize="32" color="#915e15" text="1/100"/>
-    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
+    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls" autoClearItems="true">
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="204,63">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>

FGUIProject/assets/CommonGame/package.xml

@@ -324,6 +324,9 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
+    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
     <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
     <component id="mbf1tn5" name="ComBg001.xml" path="/componentsBg/" exported="true"/>
     <image id="mbf1tn6" name="lm_biaotizi_14.png" path="/componentsBg/"/>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="0"/>
   <displayList>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
     </image>
     <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
-    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>

FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

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

FGUIProject/assets/Task/CombTaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="每日任务"/>
     <remark page="1" value="织造任务"/>
   </controller>
@@ -8,7 +8,7 @@
     <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">
+    <list id="n0_lh8v" name="TaskList" xy="0,937" size="1080,778" overflow="scroll" defaultItem="ui://eg2y0ldplh8v5" align="center" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>
       <item/>
@@ -18,13 +18,13 @@
       <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="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
+    <text id="n22_ids4" name="n22" xy="428,880" size="236,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="uxxstm8" 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"/>
+      <Button 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"/>
+      <Button checked="true" 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">

FGUIProject/assets/Task/OpenBattlePassUI.xml

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

FGUIProject/assets/Task/components/BattlePassReward.xml

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

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

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

FGUIProject/assets/Task/components/RewardIconBlue.xml

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

FGUIProject/assets/Task/package.xml

@@ -6,7 +6,6 @@
     <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
     <component id="nd173t" name="ExpProcess2.xml" path="/components/"/>
     <component id="nd173u" name="BattlePassRewardItem.xml" path="/components/"/>
-    <component id="nd1742" name="RewardIconBlue.xml" path="/components/"/>
     <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
     <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
     <component id="ids44e" name="TabButton.xml" path="/components/"/>
@@ -16,11 +15,9 @@
     <component id="or80tm1" name="BuyBattlePassLevelUI.xml" path="/" exported="true"/>
     <image id="uxxstm3" name="bt_db_ptzz.png" path="/images/"/>
     <image id="uxxstm4" name="wz_kqjlzz.png" path="/images/"/>
-    <image id="uxxstm5" name="wpk_sz_db2.png" path="/images/"/>
     <image id="uxxstm6" name="an_jia.png" path="/images/"/>
     <image id="uxxstm8" name="yeqian_db.png" path="/images/"/>
     <image id="uxxstm9" name="db_jiajian.png" path="/images/"/>
-    <image id="uxxstma" name="wpk_db_2.png" path="/images/"/>
     <image id="uxxstmc" name="txz_jlzz_db_jlzz.png" path="/images/"/>
     <image id="uxxstmd" name="jyt_pink.png" path="/images/"/>
     <image id="uxxstme" name="txz_nr_db.png" path="/images/"/>

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

@@ -240,6 +240,7 @@ namespace GFGGame
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
+            BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();
             // RechargeSProxy.ReqRechargeInfo().Coroutine();
             // RechargeSProxy.ReqExchangeInfo().Coroutine();
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();

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

@@ -0,0 +1,12 @@
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityDay7DataManager : SingletonBase<ActivityDay7DataManager>
+    {
+        public int GetActivityDay7Day()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7Activity);
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 25cb38549cc4495eb8a8992d9d955477
+timeCreated: 1685517339

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

@@ -23,7 +23,7 @@ namespace GFGGame
         private HashSet<int> SuperRewards = new HashSet<int>();
 
         //所有特别奖励
-        private List<KeyValuePair<int, long>> tempItems = new List<KeyValuePair<int, long>>();
+        private List<KeyValuePair<int, int>> tempItems = new List<KeyValuePair<int, int>>();
 
         public int GetSeasonId()
         {
@@ -124,7 +124,7 @@ namespace GFGGame
         }
 
         //获取所有特别奖励
-        public List<KeyValuePair<int, long>> GetAllSpecialCfg()
+        public List<KeyValuePair<int, int>> GetAllSpecialCfg()
         {
             return tempItems;
         }
@@ -133,7 +133,7 @@ namespace GFGGame
         {
             tempItems.Clear();
             var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByid(GetSeasonId());
-            var items = new Dictionary<int, long>();
+            var items = new Dictionary<int, int>();
             foreach (var itemsInfo in battlePassCfgs.SelectMany(battlePassCfg => battlePassCfg.bonusSpecialArr))
             {
                 items.TryGetValue(itemsInfo[0], out var num);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs

@@ -2,22 +2,22 @@
 
 using FairyGUI;
 
-namespace UI.Task
+namespace UI.CommonGame
 {
-    public partial class UI_RewardIconYellow
+    public partial class UI_ComItemBlue
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
-        public GTextField m_num;
-        public const string URL = "ui://5mpsibzznd1743";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "RewardIconYellow";
-        private static UI_RewardIconYellow _proxy;
+        public UI_ComItemIconNew m_comItemIcon;
+        public GTextField m_txtCount;
+        public GTextField m_txtName;
+        public const string URL = "ui://eg2y0ldpmdmdtn5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemBlue";
+        private static UI_ComItemBlue _proxy;
 
-        public static UI_RewardIconYellow Create(GObject gObject = null)
+        public static UI_ComItemBlue Create(GObject gObject = null)
         {
-            var ui = new UI_RewardIconYellow();
+            var ui = new UI_ComItemBlue();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_RewardIconYellow Proxy(GObject gObject = null)
+        public static UI_ComItemBlue Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RewardIconYellow();
+                _proxy = new UI_ComItemBlue();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,15 +57,16 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_num = (GTextField)comp.GetChild("num");
+            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaIcon = null;
-            m_num = null;
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtCount = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc2c40ade55094709b2e9bf36d0e73f6
+guid: b37e991627d2d46ca8f4e2ecc8288820
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -7,9 +7,11 @@ namespace UI.CommonGame
     public partial class UI_ComItemIconNew
     {
         public GComponent target;
+        public GLoader m_bg;
         public GLoader m_loaIcon;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
+        public GLoader m_numBg;
         public GImage m_imgHas;
         public GImage m_imgNotHas;
         public GImage m_imgShowTong;
@@ -61,9 +63,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_numBg = (GLoader)comp.GetChild("numBg");
             m_imgHas = (GImage)comp.GetChild("imgHas");
             m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
             m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
@@ -71,9 +75,11 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_loaIcon = null;
             m_txtHasCount = null;
             m_loaRarity = null;
+            m_numBg = null;
             m_imgHas = null;
             m_imgNotHas = null;
             m_imgShowTong = null;

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

@@ -9,7 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public UI_RewardIconBlue m_NormalReward;
+        public GComponent m_NormalReward;
         public GTextField m_Level;
         public GList m_RewardList;
         public const string URL = "ui://5mpsibzzor80tlw";
@@ -61,7 +61,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_Level = (GTextField)comp.GetChild("Level");
             m_RewardList = (GList)comp.GetChild("RewardList");
         }
@@ -69,7 +69,6 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
-            m_NormalReward.Dispose();
             m_NormalReward = null;
             m_Level = null;
             m_RewardList = null;

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

@@ -9,7 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public UI_RewardIconBlue m_NormalReward;
+        public GComponent m_NormalReward;
         public GButton m_ComeBt;
         public GButton m_GetRewardBt;
         public GButton m_HadGet;
@@ -65,7 +65,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
             m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
             m_HadGet = (GButton)comp.GetChild("HadGet");
@@ -77,7 +77,6 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
-            m_NormalReward.Dispose();
             m_NormalReward = null;
             m_ComeBt = null;
             m_GetRewardBt = null;

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

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GTextField m_LeftTime;
+        public GButton m_tip;
         public UI_ExpProcess m_LevelProcess;
         public GButton m_btnBuyLevel;
         public GButton m_btnOpen;
@@ -64,6 +65,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_tip = (GButton)comp.GetChild("tip");
             m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
             m_btnBuyLevel = (GButton)comp.GetChild("btnBuyLevel");
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
@@ -75,6 +77,7 @@ namespace UI.Task
         {
             m_c1 = null;
             m_LeftTime = null;
+            m_tip = null;
             m_LevelProcess.Dispose();
             m_LevelProcess = null;
             m_btnBuyLevel = null;

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

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

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

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

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

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

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

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

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

@@ -320,5 +320,14 @@ namespace GFGGame
             }
             return result;
         }
+
+        public static void CreateItemView(int[] item, GComponent component)
+        {
+            var itemData = createItemData(item);
+            component.data ??= new ItemView(component);
+            (component.data as ItemView)?.SetData(itemData);
+            (component.data as ItemView)?.ChangeTxtCountStyle();
+        }
+        
     }
 }

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

@@ -1,5 +1,7 @@
+using ET;
 using FairyGUI;
 using UI.ActivityDay7;
+using UI.CommonGame;
 using UI.Task;
 
 namespace GFGGame
@@ -15,7 +17,7 @@ namespace GFGGame
         private Activity7DaysCfg[] activity7DaysCfgs;
 
         //选中的天数index 天数=index+1
-        private int onClickIndex = 0;
+        private int onClickDayIndex;
 
         public override void Dispose()
         {
@@ -49,6 +51,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            onClickDayIndex = ActivityDay7DataManager.Instance.GetActivityDay7Day() - 1;
             SetScoreList();
             SetDayList();
         }
@@ -70,26 +73,72 @@ namespace GFGGame
                 item.target.onClick.Add(OnClickDay);
             }
             //设置按钮状态
-            item.target.selected = index == onClickIndex;
+            item.target.selected = index == onClickDayIndex;
             UI_ButtonDay.ProxyEnd();
         }
 
         //选中天数
         private void OnClickDay(EventContext context)
         {
-            onClickIndex = (int)context.data;
-            _ui.m_TaskList.numItems = cfgDataArray.Length;
-            //TODO 刷新天数任务列表
+            if (!(context.sender is GObject typeItem)) return;
+            onClickDayIndex = (int)typeItem.data;
+            var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
+            _ui.m_TaskList.data = activity7DaysTaskCfg.taskIdArr;
+            _ui.m_TaskList.numItems = activity7DaysTaskCfg.taskIdArr.Length;
+            //设置其他按钮选中状态
+            SetDayList();
         }
 
         //TaskListRenderer
         private void TaskListRenderer(int index, GObject obj)
         {
             var item = UI_TaskListItem.Proxy(obj);
-
+            var tasks = (int[])obj.parent.data;
+            var taskId = tasks[index];
+            var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskId);
+            item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
+            item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
+            item.m_txtCount.text =
+                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.count}";
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
+            item.m_GetRewardBt.data = taskCfg.id;
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            }
+            item.m_ComeBt.data = taskCfg.jumpId;
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+            item.m_listTaskReward.data = taskCfg.rewardsArr;
+            item.m_listTaskReward.numItems = taskCfg.rewardsArr.Length;
             UI_TaskListItem.ProxyEnd();
         }
 
+        private static void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            var item = UI_RewardIconYellow.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_num.text = $"{rewards[index][1]}";
+            UI_RewardIconYellow.ProxyEnd();
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            Hide();
+            var btnGo = context.sender as GObject;
+            if (btnGo == null) return;
+            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(ActivityDay7View).FullName, viewData },
+                true);
+        }
+
         //设置积分列表
         private void SetScoreList()
         {
@@ -126,5 +175,37 @@ namespace GFGGame
             cfgDataArray = Activity7DaysCfgArray.Instance.dataArray;
             _ui.m_DayList.numItems = cfgDataArray.Length;
         }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
+        }
+
+
+        private async ETTask OnClickReward(int id)
+        {
+            var cfg = DailyActiveRewardCfgArray.Instance.GetCfg(id);
+            var state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
+            switch (state)
+            {
+                case ConstBonusStatus.CAN_NOT_GET:
+                {
+                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                    break;
+                }
+                case ConstBonusStatus.CAN_GET:
+                {
+                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                    // if (result) UpdateLivenessProcess();
+                    break;
+                }
+                case ConstBonusStatus.GOT:
+                    //领取完毕
+                    break;
+            }
+        }
     }
 }

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

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

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using ET;
 using FairyGUI;
 using UI.Task;
@@ -35,6 +36,9 @@ namespace GFGGame
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
             _ui.m_RewardList.SetVirtual();
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
+            _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
+            //TODO 替换成新加的
+            _ui.m_tip.data = 300002;
         }
 
         protected override void OnHide()
@@ -52,6 +56,15 @@ namespace GFGGame
             SetBattlePassLevel();
             SetOpenBattlePassBtnStatus();
             FreshSpecialReward(oldLevel);
+            var battlePassCfgs =
+                BattlePassCfgArray.Instance.GetCfgsByid(BattlePassTaskDataManager.Instance.GetSeasonId());
+            var minLevel =
+                (from battlePassCfg in battlePassCfgs
+                    let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
+                    where battlePassCfg.level != 0 && state != 2
+                    select battlePassCfg.level).FirstOrDefault();
+            // var index = _ui.m_RewardList.ItemIndexToChildIndex(minLevel - 1);
+            _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
 
         protected override void AddEventListener()
@@ -129,12 +142,10 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
-                var itemCfg = ItemCfgArray.Instance.GetCfg(bonusNormalArr[0][0]);
-                if (itemCfg != null)
-                {
-                    item.m_NormalReward.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                    item.m_NormalReward.m_num.text = bonusNormalArr[0][1].ToString();
-                }
+                var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
+                item.m_NormalReward.data ??= new ItemView(item.m_NormalReward);
+                (item.m_NormalReward.data as ItemView)?.SetData(itemData);
+                (item.m_NormalReward.data as ItemView)?.ChangeTxtCountStyle();
             }
             if (item.m_RewardList.data == null)
             {
@@ -145,7 +156,7 @@ namespace GFGGame
             //获取玩家当前的通行证等级
             var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
             //设置按钮状态
-            SetBtnState(item, battlePassCfg.id, state);
+            SetBtnState(item, battlePassCfg.level, state);
             item.target.data = battlePassCfg;
             UI_BattlePassRewardItem.ProxyEnd();
             FreshSpecialReward(level);
@@ -154,18 +165,12 @@ namespace GFGGame
         //SpecialRewardRender
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var item = UI_RewardIconYellow.Proxy(obj);
             var parentData = (int[][])obj.parent.data;
             var itemInfo = parentData[index];
-            var itemId = itemInfo[0];
-            var num = itemInfo[1];
-            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg != null)
-            {
-                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                item.m_num.text = num.ToString();
-            }
-            UI_RewardIconYellow.ProxyEnd();
+            var itemData = ItemUtil.createItemData(itemInfo);
+            obj.data ??= new ItemView(obj as GComponent);
+            (obj.data as ItemView)?.SetData(itemData);
+            (obj.data as ItemView)?.ChangeTxtCountStyle();
         }
 
         //根据状态设置按钮
@@ -208,7 +213,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_LeftTime.text = TimeUtil.FormattingTime(TimeHelper.ServerNow(), seasonEndTime);
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_HHmmss((int)(seasonEndTime - TimeHelper.ServerNow()));
         }
 
         private void SetBattlePassLevel()
@@ -260,12 +265,10 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
-                var itemCfg = ItemCfgArray.Instance.GetCfg(bonusNormalArr[0][0]);
-                if (itemCfg != null)
-                {
-                    uiBattlePassReward.m_NormalReward.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                    uiBattlePassReward.m_NormalReward.m_num.text = bonusNormalArr[0][1].ToString();
-                }
+                var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
+                var item = new ItemView(uiBattlePassReward.m_NormalReward);
+                item.SetData(itemData);
+                item.ChangeTxtCountStyle();
             }
             uiBattlePassReward.m_RewardList.data = battlePassCfg.bonusSpecialArr;
             uiBattlePassReward.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;

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

@@ -1,4 +1,5 @@
 using FairyGUI;
+using UI.CommonGame;
 using UI.Task;
 
 namespace GFGGame
@@ -42,23 +43,9 @@ namespace GFGGame
 
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var item = UI_RewardIconYellow.Proxy(obj);
             var itemInfos = (int[][])obj.parent.data;
-            // if (!(obj.parent.data is int[][] parentData))
-            // {
-            //     UI_RewardIconYellow.ClearProxy();
-            //     return;
-            // }
             var itemInfo = itemInfos[index];
-            var itemId = itemInfo[0];
-            var num = itemInfo[1];
-            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg != null)
-            {
-                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                item.m_num.text = num.ToString();
-            }
-            UI_RewardIconYellow.ProxyEnd();
+            ItemUtil.CreateItemView(itemInfo, obj as GComponent);
         }
 
         private void SetLevel()

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

@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Task;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -44,6 +46,10 @@ namespace GFGGame
             base.OnShown();
             UpdateLivenessProcess();
             UpdateTask();
+            if (_ui.m_TaskList.numItems > 0)
+            {
+                _ui.m_TaskList.ScrollToView(0);
+            }
         }
 
         protected override void AddEventListener()
@@ -144,11 +150,12 @@ namespace GFGGame
 
         private static void ListTaskRewardItemRender(int index, GObject obj)
         {
-            var item = UI_RewardIconYellow.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_num.text = $"{rewards[index][1]}";
+            var rewards = (int[][])obj.parent.data;
+            var itemData = ItemUtil.createItemData(rewards[index]);
+            var item = new ItemView(obj as GComponent);
+            obj.data = item;
+            item.SetData(itemData);
+            item.ChangeTxtCountStyle();
             UI_RewardIconYellow.ProxyEnd();
         }
 
@@ -165,8 +172,7 @@ namespace GFGGame
         private void OnBtnGoClick(EventContext context)
         {
             Hide();
-            var btnGo = context.sender as GObject;
-            if (btnGo == null) return;
+            if (!(context.sender is GObject btnGo)) return;
             ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
         }
 
@@ -196,7 +202,7 @@ namespace GFGGame
                 case ConstBonusStatus.CAN_GET:
                 {
                     var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateTask();
+                    if (result) UpdateLivenessProcess();
                     break;
                 }
                 case ConstBonusStatus.GOT:

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Task;
 
 namespace GFGGame
@@ -48,23 +49,9 @@ namespace GFGGame
 
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var item = UI_RewardIconYellow.Proxy(obj);
-            var itemInfos = (List<KeyValuePair<int, long>>)obj.parent.data;
-            // if (!(obj.parent.data is int[][] parentData))
-            // {
-            //     UI_RewardIconYellow.ClearProxy();
-            //     return;
-            // }
+            var itemInfos = (List<KeyValuePair<int, int>>)obj.parent.data;
             var itemInfo = itemInfos[index];
-            var itemId = itemInfo.Key;
-            var num = itemInfo.Value;
-            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if (itemCfg != null)
-            {
-                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                item.m_num.text = num.ToString();
-            }
-            UI_RewardIconYellow.ProxyEnd();
+            ItemUtil.CreateItemView(new[]{itemInfo.Key,itemInfo.Value}, obj as GComponent);
         }
         private void SetPrizeData()
         {

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

@@ -36,7 +36,6 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
-            BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();
         }
 
         private void OnBtnBackClick()