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

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -4,8 +4,8 @@
     <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
     <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
     <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
-    <image id="n1_v5no" name="n1" src="v5notm1" fileName="images/lm_dt_zsx1.png" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="v5notm2" fileName="images/lm_dt_zsx2.png" xy="587,71" group="n11_v5no"/>
+    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="243,72" group="n11_v5no"/>
+    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="587,71" pivot="0.5,0" group="n11_v5no" scale="-1,1"/>
     <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
     <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
     <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>

FGUIProject/assets/Bag/package.xml

@@ -12,8 +12,6 @@
     <image id="v5notly" name="back.png" path="/images/"/>
     <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
     <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
-    <image id="v5notm1" name="lm_dt_zsx1.png" path="/images/"/>
-    <image id="v5notm2" name="lm_dt_zsx2.png" path="/images/"/>
     <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
     <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -5,8 +5,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="width-width,height-height,top-top"/>
     </image>
+    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
     <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
@@ -14,10 +15,9 @@
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
-    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,195" size="987,1724">
+    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
       <relation target="" sidePair="height-height"/>
     </component>
-    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,54"/>
     <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>

FGUIProject/assets/LuckyBox/package.xml

@@ -72,6 +72,73 @@
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
     <component id="droitan" name="ComBagTime.xml" path="/components/"/>
+    <component id="volstao" name="ButtonTab1.xml" path="/components/"/>
+    <image id="volstap" name="zx_title_zi_star.png" path="/imageNews/"/>
+    <image id="volstaq" name="zx_title_zi_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstar" name="zx_tx_hengxiang.png" path="/imageNews/"/>
+    <image id="volstas" name="zx_tx_jiguang.png" path="/imageNews/"/>
+    <image id="volstat" name="zx_tx_qianjing.png" path="/imageNews/"/>
+    <image id="volstau" name="zx_tx_star.png" path="/imageNews/"/>
+    <image id="volstav" name="zx_tx_yuanquan.png" path="/imageNews/"/>
+    <image id="volstaw" name="zx_tx_zhongjian.png" path="/imageNews/"/>
+    <image id="volstax" name="zx_wp_baseboard.png" path="/imageNews/"/>
+    <image id="volstay" name="zx_wp_fen_bg.png" path="/imageNews/"/>
+    <image id="volstaz" name="zx_wp_fen_diguang.png" path="/imageNews/"/>
+    <image id="volstb0" name="zx_wp_fen_guangxiao.png" path="/imageNews/"/>
+    <image id="volstb1" name="zx_wp_fen_xian.png" path="/imageNews/"/>
+    <image id="volstb2" name="zx_wp_jin_bg.png" path="/imageNews/"/>
+    <image id="volstb3" name="zx_title_zi_guangxiao.png" path="/imageNews/"/>
+    <image id="volstb4" name="zx_wp_jin_diguang.png" path="/imageNews/"/>
+    <image id="volstb5" name="zx_wp_jin_jiaobiao.png" path="/imageNews/"/>
+    <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
+    <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
+    <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
+    <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
+    <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
+    <image id="volstbd" name="zx_yuan_tx_star.png" path="/imageNews/"/>
+    <image id="volstbe" name="zx_yuan_tx_waiquan.png" path="/imageNews/"/>
+    <image id="volstbf" name="zx_yulan_diaoshi.png" path="/imageNews/"/>
+    <image id="volstbg" name="zx_yulan_tubiao.png" path="/imageNews/"/>
+    <image id="volstbh" name="zx_yulan_tubiao_bg.png" path="/imageNews/"/>
+    <image id="volstbi" name="zx_yulan_xinggui.png" path="/imageNews/"/>
+    <image id="volstbj" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
+    <image id="volstbk" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
+    <image id="volstbl" name="zx_title_zi.png" path="/imageNews/"/>
+    <image id="volstbm" name="zx_title_guangdian.png" path="/imageNews/"/>
+    <image id="volstbn" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
+    <image id="volstbo" name="bt_tiaoguo.png" path="/imageNews/"/>
+    <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/"/>
+    <image id="volstbq" name="zx_bg_yueliang.png" path="/imageNews/"/>
+    <image id="volstbr" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstbs" name="zx_jindu_bg.png" path="/imageNews/"/>
+    <image id="volstbt" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstbu" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
+    <image id="volstbv" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
+    <image id="volstbw" name="zx_lianxian_huang_star_1.png" path="/imageNews/"/>
+    <image id="volstbx" name="zx_lianxian_huang_star_2.png" path="/imageNews/"/>
+    <image id="volstby" name="zx_lianxian_huang_star_3.png" path="/imageNews/"/>
+    <image id="volstbz" name="zx_lianxian_huang_xia.png" path="/imageNews/"/>
+    <image id="volstc0" name="zx_lianxian_huang_xian.png" path="/imageNews/"/>
+    <image id="volstc1" name="zx_title_xianding.png" path="/imageNews/"/>
+    <image id="volstc2" name="zx_lianxian_lan_guangquan.png" path="/imageNews/"/>
+    <image id="volstc3" name="zx_lianxian_lan_star_1.png" path="/imageNews/"/>
+    <image id="volstc4" name="zx_lianxian_lan_star_2.png" path="/imageNews/"/>
+    <image id="volstc5" name="zx_lianxian_lan_star_3.png" path="/imageNews/"/>
+    <image id="volstc6" name="zx_lianxian_lan_xia.png" path="/imageNews/"/>
+    <image id="volstc7" name="zx_lianxian_lan_xian.png" path="/imageNews/"/>
+    <image id="volstc8" name="zx_tc_bg.png" path="/imageNews/"/>
+    <image id="volstc9" name="zx_tc_piaodai_shang.png" path="/imageNews/"/>
+    <image id="volstca" name="zx_tc_piaodai_xia.png" path="/imageNews/"/>
+    <image id="volstcb" name="zx_tc_tab_bg.png" path="/imageNews/"/>
+    <image id="volstcc" name="zx_tc_tab_biankuang.png" path="/imageNews/"/>
+    <image id="volstcd" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
+    <image id="volstce" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
+    <image id="volstcf" name="zx_tc_title_zhuangshi.png" path="/imageNews/"/>
+    <image id="volstcg" name="zx_title_bg.png" path="/imageNews/"/>
+    <image id="volstch" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
+    <image id="volstci" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -46,8 +46,7 @@
     <group id="n88_ktf2" name="n88" xy="607,162" size="443,132" group="n52_qqat" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
-      <relation target="" sidePair="right-right,top-top"/>
+    <list id="n41_wg7t" name="list" xy="942,321" size="108,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" scrollItemToViewOnClick="false" foldInvisibleItems="true">
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
@@ -63,7 +62,9 @@
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="995,1597" pivot="0.5,0" anchor="true" size="102,117" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true"/>
+    <group id="n57_oju1" name="grpList" xy="942,321" size="108,1397" group="n52_qqat" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
     <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>

FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="448,590">
   <displayList>
-    <image id="n48_r9ri" name="n48" src="r9ri15" fileName="images/grxx_zyjiah.png" xy="0,0"/>
+    <image id="n48_r9ri" name="n48" src="volsgh" fileName="images/grxc_db.png" xy="0,0"/>
+    <image id="n50_vols" name="n50" src="volsgi" fileName="images/tb_jiahao.png" xy="122,193"/>
     <component id="n49_r9ri" name="comPhoto" src="r9ri1o" fileName="components/ComPhoto.xml" xy="2,2" size="444,586"/>
+    <image id="n55_vols" name="n55" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="202,249" group="n54_vols"/>
+    <image id="n51_vols" name="n51" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="13,287" group="n54_vols"/>
+    <text id="n52_vols" name="txtLock" xy="163,274" pivot="0.5,0" size="122,42" group="n54_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#d7c09f" align="center" vAlign="middle" leading="1" text="金卡开启"/>
+    <image id="n53_vols" name="n53" src="volsgj" fileName="componentsBg/lm_dt_zsx2.png" xy="305,287" group="n54_vols"/>
+    <group id="n54_vols" name="grpLock" xy="13,249" size="422,66" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -48,7 +48,6 @@
     <image id="r9ri12" name="grxx_zyddt.png" path="/images/" scale="9grid" scale9grid="267,350,534,700"/>
     <image id="r9ri13" name="grxx_zydik.png" path="/images/"/>
     <image id="r9ri14" name="grxx_zygrxc.png" path="/images/"/>
-    <image id="r9ri15" name="grxx_zyjiah.png" path="/images/"/>
     <image id="r9ri16" name="grxx_zyshul.png" path="/images/"/>
     <image id="r9ri17" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri18" name="grxx_grxcxc.png" path="/images/"/>
@@ -75,6 +74,9 @@
     <component id="v95qg2" name="OtherRoleInfoUI.xml" path="/" exported="true"/>
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
+    <image id="volsgh" name="grxc_db.png" path="/images/"/>
+    <image id="volsgi" name="tb_jiahao.png" path="/images/"/>
+    <image id="volsgj" name="lm_dt_zsx2.png" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="346,22" extention="ProgressBar">
+  <controller name="c1" pages="0,未满,1,已满" selected="1"/>
   <displayList>
     <image id="n0_e3m1" name="n0" src="uxxstn2" fileName="images/jyt_dk.png" xy="0,0" size="346,22">
       <relation target="" sidePair="width-width,height-height"/>
@@ -8,8 +9,14 @@
     <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"/>
+    <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" group="n8_cj0b" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
+    <loader id="n7_e3m1" name="icon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
+    <group id="n8_cj0b" name="n8" xy="2,-47" size="119,44" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <text id="n9_cj0b" name="n9" xy="20,-46" size="101,42" fontSize="30" color="#7a4e22" autoSize="none" text="已满级">
+      <gearDisplay controller="c1" pages="1"/>
+    </text>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/Task/components/TabButton.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="261,72" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_ids4" name="n0" src="uxxstmk" fileName="images/yeqian_xz.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem.cs

@@ -8,6 +8,8 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public UI_ComPhoto m_comPhoto;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://374k3dwvr9ri1m";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListPhotoItem";
@@ -56,11 +58,15 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_comPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("comPhoto"));
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comPhoto.Dispose();
             m_comPhoto = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,8 +7,10 @@ namespace UI.Task
     public partial class UI_ExpProcess
     {
         public GProgressBar target;
+        public Controller m_c1;
         public GTextField m_Level;
         public GTextField m_NumProcess;
+        public GLoader m_icon;
         public const string URL = "ui://5mpsibzze3m1tnl";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "ExpProcess";
@@ -56,13 +58,17 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_Level = (GTextField)comp.GetChild("Level");
             m_NumProcess = (GTextField)comp.GetChild("NumProcess");
+            m_icon = (GLoader)comp.GetChild("icon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_Level = null;
             m_NumProcess = null;
+            m_icon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using GFGGame;
@@ -102,7 +103,7 @@ namespace GFGGame
         }
 
         //C2S_GetAllBattlePassReward
-        public static async ETTask<bool> GetAllBattlePassReward()
+        public static async ETTask<bool> GetAllBattlePassReward(Action onSuccess = null)
         {
             var response =
                 (S2C_GetAllBattlePassReward)await MessageHelper.SendToServer(new C2S_GetAllBattlePassReward());
@@ -131,7 +132,7 @@ namespace GFGGame
                     dataManager.AddSuperReward(level);
                 }
             }
-            BonusController.TryShowBonusList(bonusList);
+            BonusController.TryShowBonusList(bonusList, onSuccess);
             return true;
         }
 

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

@@ -38,6 +38,8 @@ namespace GFGGame
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300012;
+            _ui.m_LevelProcess.m_NumProcess.icon =
+                ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.BATTLE_PASS_CURRENCY).res);
         }
 
         protected override void OnHide()
@@ -103,25 +105,32 @@ namespace GFGGame
         }
 
         //继续领取
-        private async void OnBtnContinueClick(EventContext context)
+        private void OnBtnContinueClick(EventContext context)
         {
-            if (!(context.sender is GObject obj)) return;
-            var id = (int)obj.data;
-            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
-            if (!isBuy)
-            {
-                ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
-                return;
-            }
-            var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
-            if (!get) return;
-            SetBattlePassLevel();
+            // if (!(context.sender is GObject obj)) return;
+            // var id = (int)obj.data;
+            // var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            // if (!isBuy)
+            // {
+            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+            // return;
+            // }
+            // var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
+            // if (!get) return;
+            // SetBattlePassLevel();
         }
 
         //领取全部奖励
         private async void OnBtnGetAllClick(EventContext context)
         {
-            var get = await BattlePassTaskSProxy.GetAllBattlePassReward();
+            var get = await BattlePassTaskSProxy.GetAllBattlePassReward(onSuccess: () =>
+            {
+                var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+                if (isBuy) return;
+                ViewManager.Show<BuyBattlePassLevelView>(null,
+                    new object[] { typeof(BattlePassTaskView).FullName, null });
+            });
+            SetBattlePassLevel();
             if (!get) return;
             SetBattlePassLevel();
         }
@@ -140,6 +149,7 @@ namespace GFGGame
         {
             var item = UI_BattlePassRewardItem.Proxy(obj);
             var level = index + 1;
+
             //设置进度
             item.m_imageProgress.visible = BattlePassTaskDataManager.Instance.GetBattlePassLevel() >= level;
             //这里跳过为0的第一个配置
@@ -150,16 +160,25 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
+                item.m_NormalReward.visible = true;
                 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();
+                var itemView = new ItemView(item.m_NormalReward);
+                item.m_NormalReward.data ??= itemView;
+                itemView.SetData(itemData);
+                itemView.ChangeTxtCountStyle();
+                itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
+            }
+            else
+            {
+                item.m_NormalReward.data = null;
+                item.m_NormalReward.visible = false;
             }
             if (item.m_RewardList.data == null)
             {
                 item.m_RewardList.itemRenderer = SpecialRewardRender;
             }
-            item.m_RewardList.data = battlePassCfg.bonusSpecialArr;
+            var superLevelRewardGet = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            item.m_RewardList.data = (battlePassCfg.bonusSpecialArr, superLevelRewardGet);
             item.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
             //获取玩家当前的通行证等级
             var state = BattlePassTaskDataManager.Instance.GetRewardState(level);
@@ -173,12 +192,14 @@ namespace GFGGame
         //SpecialRewardRender
         private static void SpecialRewardRender(int index, GObject obj)
         {
-            var parentData = (int[][])obj.parent.data;
-            var itemInfo = parentData[index];
+            var keyValuePair = ((int[][], bool))obj.parent.data;
+            var itemInfo = keyValuePair.Item1[index];
             var itemData = ItemUtil.createItemData(itemInfo);
-            obj.data ??= new ItemView(obj as GComponent);
-            (obj.data as ItemView)?.SetData(itemData);
-            (obj.data as ItemView)?.ChangeTxtCountStyle();
+            var itemView = new ItemView(obj as GComponent);
+            obj.data ??= itemView;
+            itemView.SetData(itemData);
+            itemView.ChangeTxtCountStyle();
+            itemView.GrpGotVisible = keyValuePair.Item2;
         }
 
         //根据状态设置按钮
@@ -235,14 +256,24 @@ namespace GFGGame
             //获取当前等级的经验
             var battlePassCfg =
                 BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel());
-            uiExpProcess.target.max = battlePassCfg.value;
-            uiExpProcess.target.value = dataManager.GetBattlePassExp();
-            uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
-                .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
-            //刷新奖励列表
-            _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
-            //去掉第一个为0的配置
-            _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            if (battlePassCfg == null)
+            {
+                //已经超过了最大等级
+                uiExpProcess.target.max = 100;
+                uiExpProcess.target.value = 0;
+                uiExpProcess.m_c1.selectedIndex = 1;
+            }
+            else
+            {
+                uiExpProcess.target.max = battlePassCfg.value;
+                uiExpProcess.target.value = dataManager.GetBattlePassExp();
+                uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
+                    .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
+                //刷新奖励列表
+                _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
+                //去掉第一个为0的配置
+                _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            }
         }
 
         private void SetOpenBattlePassBtnStatus()
@@ -273,12 +304,18 @@ namespace GFGGame
             var bonusNormalArr = battlePassCfg.bonusNormalArr;
             if (bonusNormalArr != null && bonusNormalArr.Length > 0)
             {
+                uiBattlePassReward.m_NormalReward.visible = true;
                 var itemData = ItemUtil.createItemData(bonusNormalArr[0]);
                 var item = new ItemView(uiBattlePassReward.m_NormalReward);
                 item.SetData(itemData);
                 item.ChangeTxtCountStyle();
             }
-            uiBattlePassReward.m_RewardList.data = battlePassCfg.bonusSpecialArr;
+            else
+            {
+                uiBattlePassReward.m_NormalReward.visible = false;
+            }
+            var state = BattlePassTaskDataManager.Instance.CheckSuperLevelRewardGet(level);
+            uiBattlePassReward.m_RewardList.data = (battlePassCfg.bonusSpecialArr, state);
             uiBattlePassReward.m_RewardList.numItems = battlePassCfg.bonusSpecialArr.Length;
         }
     }