任务

FGUIProject/assets/CommonGame/components/BtnStyle002.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="wm603f" fileName="imagesNew/an__3xuanzhong.png" xy="0,0" size="189,63">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="189,63" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle007.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesNew/an__xuanzhong_qifu.png" xy="0,0" size="189,63">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="189,63" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml

@@ -3,8 +3,8 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603g" fill="scale" autoSize="true"/>
-    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="center-center"/>
+    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0.5" 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>
   <Button/>

FGUIProject/assets/CommonGame/components/Button14.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="273,77" 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="imagesNew/an_yellow.png" xy="0,0" size="273,76">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <text id="n3_u2u3" name="title" xy="105,11" pivot="0.5,0" size="61,54" font="ui://eg2y0ldpa0cftky" fontSize="40" color="#915e15" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -16,11 +16,11 @@
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="204,63">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
+      <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
     </component>
-    <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/ComeBt.xml" xy="804,81" size="189,58">
+    <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/BtnStyle001.xml" xy="804,81" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
       <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
@@ -28,7 +28,7 @@
     <text id="n19_jttb" name="n19" xy="883,22" size="126,43" fontSize="28" color="#8e4b2a" autoSize="none" text="积分+20">
       <gearDisplay controller="c3" pages="1"/>
     </text>
-    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
+    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
     <text id="n21_jttb" name="n21" xy="870,91" size="88,39" group="n22_jttb" fontSize="28" color="#683c28" text="已领取"/>
     <group id="n22_jttb" name="n22" xy="788,86" size="233,51" advanced="true">
       <gearDisplay controller="c1" pages="3"/>

FGUIProject/assets/CommonGame/package.xml

@@ -285,13 +285,13 @@
     <image id="wm603f" name="an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="an__tongyi.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66c" name="an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="51,15,102,30"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="an_jujue.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4l" name="an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
-    <image id="a0cf2o" name="an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
+    <image id="a0cf2o" name="an_yellow.png" path="/imagesNew/" exported="true" 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"/>
     <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
@@ -370,6 +370,9 @@
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>
+    <component id="jx6ztod" name="Button14.xml" path="/components/" exported="true"/>
+    <component id="jx6ztoe" name="BtnStyle007.xml" path="/components/" exported="true"/>
+    <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -50,15 +50,15 @@
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
     <group id="n59_emat" name="n59" xy="0,670" size="1082,1312"/>
-    <image id="n26_nd17" name="n26" src="uxxstmn" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1538" group="n57_emat"/>
-    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70" group="n57_emat">
+    <image id="n26_nd17" name="n26" src="uxxstmn" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1536" group="n57_emat"/>
+    <component id="n51_nd17" name="btnGetAll" src="jx6ztod" fileName="components/Button14.xml" pkg="eg2y0ldp" xy="403,1785" group="n57_emat">
       <Button title="一键领取"/>
     </component>
-    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577" group="n57_emat"/>
-    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548" group="n57_emat"/>
-    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" group="n57_emat" fontSize="32" color="#915e15" text="下个特别大奖"/>
-    <group id="n57_emat" name="n57" xy="1,1538" size="1084,313" advanced="true">
-      <relation target="" sidePair="bottom-bottom"/>
+    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1575" group="n57_emat"/>
+    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1546" group="n57_emat"/>
+    <text id="n54_or80" name="n54" xy="412,1547" size="196,44" group="n57_emat" fontSize="32" color="#915e15" text="下个特别大奖"/>
+    <group id="n57_emat" name="n57" xy="1,1536" size="1084,326" advanced="true">
+      <relation target="n48_nd17" sidePair="top-bottom"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="2">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="1">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -14,15 +14,15 @@
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="领取" icon="ui://eg2y0ldpittstn4"/>
+      <Button title="领取" titleColor="#465a7f" icon="ui://eg2y0ldpittstn4"/>
     </component>
-    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
+    <component id="n10_nd17" name="GetRewardBt" src="jx6ztof" fileName="components/BtnStyle002.xml" pkg="eg2y0ldp" xy="822,44">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
-    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="204,63">
+    <component id="n11_nd17" name="ContinueBt" src="jx6ztoe" fileName="components/BtnStyle007.xml" pkg="eg2y0ldp" xy="822,44">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
+      <Button title="继续领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
     <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="800,47" group="n21_vnby"/>
     <text id="n20_vnby" name="n20" xy="882,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>

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

@@ -61,9 +61,9 @@ namespace GFGGame
                 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();
+                 let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
+                 where battlePassCfg.level != 0 && state != 2
+                 select battlePassCfg.level).FirstOrDefault();
             _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
 
@@ -258,7 +258,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
         }
 
         private void SetBattlePassLevel()