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

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -24,7 +24,6 @@
     <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,691"/>
     <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="uxxstmh" fileName="images/jdt_bg.png" xy="49,737"/>
-    <image id="n22_nd17" name="n22" src="uxxstmx" fileName="images/jdt_pink_2.png" xy="61,750"/>
     <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,691"/>
     <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
     <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
@@ -33,7 +32,10 @@
     <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,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u"/>
+    <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <item/>
+      <item/>
+    </list>
     <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
     <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
     <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">

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="0">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="2">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -8,25 +8,27 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
+    <image id="n19_8pak" name="imageProgress" src="8paktno" fileName="images/jdt_pink_2.jpg" xy="60,-45" size="22,164"/>
     <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="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItem001_1.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"/>
-      <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
+      <Button title="领取" icon="ui://eg2y0ldpittstn4"/>
     </component>
     <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
-    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
-      <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="204,63">
       <gearDisplay controller="c1" pages="3"/>
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
+    <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="844,47" group="n21_vnby"/>
+    <text id="n20_vnby" name="n20" xy="926,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>
+    <group id="n21_vnby" name="n21" xy="844,47" size="233,51" advanced="true">
+      <gearDisplay controller="c1" pages="2"/>
+    </group>
     <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://eg2y0ldp9jv6tls" align="center" vAlign="middle">
       <item/>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -5,9 +5,9 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
-    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-103,-54" pkg="eg2y0ldp"/>
-    <text id="n4_e3m1" name="n4" xy="-55,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
-    <text id="n5_e3m1" name="Level" xy="-54,-15" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
+    <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-103,-54"/>
+    <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
+    <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
     <image id="n7_e3m1" name="n7" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="2,-40"/>
   </displayList>

FGUIProject/assets/Task/package.xml

@@ -37,7 +37,6 @@
     <image id="uxxstmu" name="zsx_flower.png" path="/images/"/>
     <image id="uxxstmv" name="lm_biaotizi_12.png" path="/images/"/>
     <image id="uxxstmw" name="jyt_dk_2.png" path="/images/"/>
-    <image id="uxxstmx" name="jdt_pink_2.png" path="/images/"/>
     <image id="uxxstmz" name="an_jian.png" path="/images/"/>
     <image id="uxxstn0" name="cz_an_pink.png" path="/images/"/>
     <image id="uxxstn1" name="bt_db_dj.png" path="/images/"/>
@@ -60,6 +59,7 @@
     <component id="e3m1tnl" name="ExpProcess.xml" path="/components/"/>
     <component id="e3m1tnm" name="ButtonAdd.xml" path="/components/"/>
     <component id="e3m1tnn" name="ButtonReduce.xml" path="/components/"/>
+    <image id="8paktno" name="jdt_pink_2.jpg" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -9,10 +9,10 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public GImage m_imageProgress;
         public GComponent m_NormalReward;
         public GButton m_ComeBt;
         public GButton m_GetRewardBt;
-        public GButton m_HadGet;
         public GButton m_ContinueBt;
         public GTextField m_Level;
         public GList m_RewardList;
@@ -65,10 +65,10 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_imageProgress = (GImage)comp.GetChild("imageProgress");
             m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
             m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
-            m_HadGet = (GButton)comp.GetChild("HadGet");
             m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
             m_Level = (GTextField)comp.GetChild("Level");
             m_RewardList = (GList)comp.GetChild("RewardList");
@@ -77,10 +77,10 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
+            m_imageProgress = null;
             m_NormalReward = null;
             m_ComeBt = null;
             m_GetRewardBt = null;
-            m_HadGet = null;
             m_ContinueBt = null;
             m_Level = null;
             m_RewardList = null;

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

@@ -127,19 +127,21 @@ namespace GFGGame
         }
 
         //前往
-        private void OnBtnGoClick(EventContext context)
-        {
-            Hide();
-            var btnGo = context.sender as GObject;
-            if (btnGo == null) return;
-            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
-        }
+        // private void OnBtnGoClick(EventContext context)
+        // {
+        //     Hide();
+        //     var btnGo = context.sender as GObject;
+        //     if (btnGo == null) return;
+        //     ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
+        // }
 
 
         private void ListBoxRewardItemRender(int index, GObject obj)
         {
             var item = UI_BattlePassRewardItem.Proxy(obj);
             var level = index + 1;
+            //设置进度
+            item.m_imageProgress.visible = BattlePassTaskDataManager.Instance.GetBattlePassLevel() >= level;
             //这里跳过为0的第一个配置
             var battlePassCfg = _rewardCfgs[level];
             //设置等级
@@ -197,7 +199,7 @@ namespace GFGGame
             //前往
             if (item.m_ComeBt.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.enabled = false;
             }
             item.m_ComeBt.data = id;
         }