feat 通行证修改

FGUIProject/assets/CommonGame/package.xml

@@ -296,6 +296,8 @@
     <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
+    <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,647">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
     <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="895,25" size="111,96"/>
     <image id="n6_pvb4" name="n6" src="9jv66i" fileName="images/lm_biaotizi_13.png" xy="260,96"/>
     <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="143,153" size="293,56" group="n5_pvb4"/>

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,647">
   <displayList>
-    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
     <image id="n17_9jv6" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="74,491"/>
     <component id="n9_9jv6" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
     <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -35,7 +35,7 @@
       <Button title="修改"/>
     </component>
     <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="442,915" size="237,46"/>
-    <image id="n12_wm60" name="n12" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,290"/>
+    <image id="n12_wm60" name="n12" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,290" pkg="eg2y0ldp"/>
     <image id="n14_wm60" name="n14" src="wm603l" fileName="images/biaotizi_5.png" xy="202,130"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueChangeNoticeUI.xml

@@ -10,6 +10,6 @@
       <Button title="保存"/>
     </component>
     <image id="n4_wm60" name="n4" src="wm603n" fileName="images/biaotizi_3.png" xy="203,75"/>
-    <image id="n7_wm60" name="n7" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="140,691"/>
+    <image id="n7_wm60" name="n7" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="140,691" pkg="eg2y0ldp"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -10,7 +10,7 @@
     </image>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>
     <image id="n2_pvb4" name="n2" src="9jv669" fileName="images/biaotizi_11.png" xy="203,222" size="673,62"/>
-    <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649">
+    <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -6,7 +6,7 @@
   </controller>
   <controller name="c2" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647"/>
+    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647" pkg="eg2y0ldp"/>
     <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
     <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="911,26"/>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88" size="36,37">
@@ -36,6 +36,6 @@
     <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
       <Button title="请离雅集"/>
     </component>
-    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480"/>
+    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480" pkg="eg2y0ldp"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListRankItem.xml

@@ -9,7 +9,7 @@
     <image id="n28_9jv6" name="n28" src="9jv65u" fileName="images/lm_phb_dk.png" xy="0,1">
       <gearDisplay controller="c2" pages="1"/>
     </image>
-    <image id="n26_9jv6" name="n26" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="64,121" group="n25_9jv6">
+    <image id="n26_9jv6" name="n26" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="64,121" group="n25_9jv6" pkg="eg2y0ldp">
       <gearDisplay controller="c2" pages="0"/>
     </image>
     <loader id="n19_pvb4" name="loaRank" xy="37,14" size="83,83" group="n25_9jv6" url="ui://tw70qm9d9jv65x" autoSize="true">

FGUIProject/assets/League/package.xml

@@ -76,14 +76,12 @@
     <image id="wm603n" name="biaotizi_3.png" path="/images/"/>
     <image id="wm603q" name="lm_yeqian_xuanzhong.png" path="/images/"/>
     <component id="wm603r" name="ComHeadIcon.xml" path="/components/"/>
-    <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="wm603u" name="lm_chenghao_1.png" path="/images/" exported="true"/>
     <image id="wm603v" name="lm_chenghao_2.png" path="/images/" exported="true"/>
     <image id="wm603w" name="lm_chenghao_3.png" path="/images/" exported="true"/>
     <component id="wm603x" name="Button111.xml" path="/components/"/>
     <component id="wm603y" name="ListIconSmallItem.xml" path="/components/"/>
     <image id="o9gh3z" name="an_close.png" path="/images/"/>
-    <image id="o9gh40" name="tanchuang.png" path="/images/" scale="9grid" scale9grid="255,165,510,239"/>
     <image id="o9gh41" name="lm_zjm_zykuang_2.png" path="/images/" scale="9grid" scale9grid="57,11,114,22"/>
     <image id="o9gh42" name="lm_zjm_zykuang.png" path="/images/"/>
     <image id="o9gh44" name="lm_zjm_mzkuang.png" path="/images/"/>

FGUIProject/assets/RoleInfo/GMPanelUI.xml

@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="600,600">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="0,0" size="600,600" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
+    <loader id="n0_d4iw" name="bg" xy="0,0" size="600,730" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
     <component id="n11_c5sc" name="ComBtn" src="lqp0dm" fileName="components/ComBtn.xml" xy="45,51"/>
-    <richtext id="n3_c5sc" name="n3" xy="70,472" size="130,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
+    <richtext id="n3_c5sc" name="n3" xy="70,472" size="134,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
     <graph id="n5_c5sc" name="n5" xy="249,467" size="219,42" group="n14_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n4_c5sc" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
     <text id="n4_c5sc" name="inputItem" xy="249,467" size="219,42" group="n14_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 物品id 空格 个数[/size][/color]"/>
     <component id="n6_c5sc" name="btnAddItem" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,466" group="n14_g926"/>
     <group id="n14_g926" name="n14" xy="70,466" size="459,43"/>
-    <richtext id="n15_g926" name="n15" xy="70,535" size="130,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
+    <richtext id="n15_g926" name="n15" xy="70,535" size="134,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
     <graph id="n16_g926" name="n16" xy="249,530" size="219,42" group="n19_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n17_g926" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
     <text id="n17_g926" name="inputGM" xy="249,530" size="219,42" group="n19_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 指令 空格 状态[/size][/color]"/>
     <component id="n18_g926" name="btnGM" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,529" group="n19_g926"/>
     <group id="n19_g926" name="n19" xy="70,529" size="459,43"/>
+    <richtext id="n20_9qpb" name="n20" xy="34,591" size="134,36" group="n23_9qpb" fontSize="26" color="#999999" text="设置计数："/>
+    <text id="n22_9qpb" name="RoleNumType" xy="208,588" size="139,42" group="n23_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n21_9qpb" name="Num" xy="392,588" size="141,42" group="n23_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <component id="n28_9qpb" name="btnSetNum" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="548,588" group="n23_9qpb"/>
+    <group id="n23_9qpb" name="n23" xy="34,588" size="554,42"/>
+    <richtext id="n24_9qpb" name="n24" xy="37,652" size="134,36" group="n27_9qpb" fontSize="26" color="#999999" text="添加计数："/>
+    <text id="n25_9qpb" name="AddRoleNumType" xy="208,649" size="139,42" group="n27_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n26_9qpb" name="AddNum" xy="392,649" size="141,42" group="n27_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <component id="n29_9qpb" name="btnAddNum" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="548,649" group="n27_9qpb"/>
+    <group id="n27_9qpb" name="n27" xy="37,649" size="551,42"/>
   </displayList>
 </component>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
+  <controller name="c1" pages="0,打开购买,1,关闭购买" selected="0"/>
   <displayList>
-    <image id="n15_nd17" name="n15" src="nd172t" fileName="images/sj_dk.png" xy="0,240">
+    <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,241" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
@@ -10,19 +11,23 @@
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
+    <component id="n56_itts" name="btnBuyLevel" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="401,943">
+      <relation target="" sidePair="right-right"/>
+      <property target="text" propertyId="0" value="购买等级"/>
+    </component>
     <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
       <relation target="" sidePair="right-right"/>
     </component>
-    <image id="n33_nd17" name="n33" src="nd172z" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
-    <image id="n20_nd17" name="n20" src="nd173b" fileName="images/bt_db_dj.png" xy="14,694"/>
+    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
+    <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="nd173g" fileName="images/jdt_bg.png" xy="49,737"/>
-    <image id="n31_nd17" name="n31" src="nd172v" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
-    <image id="n32_nd17" name="n32" src="nd173d" fileName="images/bt_db_ptzz.png" xy="143,691"/>
+    <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="普通织造"/>
-    <image id="n22_nd17" name="n22" src="nd173i" fileName="images/jdt_pink_2.png" xy="61,750"/>
-    <image id="n27_nd17" name="n27" src="nd173c" fileName="images/bt_db_jlzz.png" xy="405,692"/>
-    <image id="n25_nd17" name="n25" src="nd172u" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
+    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,692"/>
+    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
     <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="锦罗织造"/>
     <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
     <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
@@ -37,11 +42,13 @@
       <item/>
       <item/>
     </list>
-    <image id="n36_nd17" name="n36" src="nd173q" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
-    <image id="n26_nd17" name="n26" src="nd172w" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1538" size="1080,217"/>
-    <component id="n50_nd17" name="NowReward" src="nd173u" fileName="components/BattlePassRewardItem.xml" xy="3,1558" size="1080,152"/>
+    <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">
       <Button title="一键领取"/>
     </component>
+    <component id="n52_or80" name="n52" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577"/>
+    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548"/>
+    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" fontSize="32" color="#915e15" text="下个特别大奖"/>
   </displayList>
 </component>

FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1021,647" designImageOffsetY="-523">
+  <displayList>
+    <image id="n0_or80" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n1_or80" name="CloseBtn" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="903,25">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <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="n6" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n9_or80" name="n9" xy="447,558" size="171,39" fontSize="28" color="#b79f7d" vars="true" text="{startLeve=0}级提升至{endLevel=1}级"/>
+    <component id="n10_itts" name="n10" src="uxxstm2" fileName="components/AddReduceButton.xml" xy="367,498"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" opaque="false" designImage="ui://5mpsibzzids44d">
+<component size="1080,1920" opaque="false">
   <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="每日任务"/>
     <remark page="1" value="织造任务"/>
@@ -19,7 +19,7 @@
     </list>
     <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
     <text id="n22_ids4" name="n22" xy="438,880" size="215,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
-    <image id="n17_ids4" name="n17" src="nd1735" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
+    <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"/>
     </component>

FGUIProject/assets/Task/OpenBattlePassUI.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1021,647" designImageOffsetY="-523">
+  <displayList>
+    <image id="n0_or80" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n1_or80" name="CloseBtn" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="903,25">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <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="n6" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n8_or80" name="OpenBtn" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="411,510">
+      <Button title="68元"/>
+    </component>
+    <text id="n9_or80" name="n9" xy="419,572" size="241,39" fontSize="28" color="#b79f7d" text="可获得680会员积分"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/components/AddReduceButton.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="348,63" designImageOffsetX="-366" designImageOffsetY="-1020">
+  <displayList>
+    <image id="n1_uxxs" name="n1" src="uxxstm9" fileName="images/db_jiajian.png" xy="24,2"/>
+    <text id="n0_uxxs" name="n0" xy="145,8" size="123,48" fontSize="35" autoSize="none" text="" input="true"/>
+    <image id="n2_uxxs" name="n2" src="uxxstm6" fileName="images/an_jia.png" xy="287,2"/>
+    <image id="n3_uxxs" name="n3" src="uxxstmz" fileName="images/an_jian.png" xy="-4,3"/>
+    <image id="n4_uxxs" name="n4" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="106,17"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,153">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="0">
+    <remark page="0" value="未完成"/>
+    <remark page="1" value="可领取"/>
+    <remark page="2" value="已领取"/>
+    <remark page="3" value="继续领取"/>
+  </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"/>
+    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" 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" align="center" vAlign="middle">
+      <item url="ui://5mpsibzznd1743"/>
+      <item url="ui://5mpsibzznd1743"/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="3">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="1">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
     <remark page="3" value="继续领取"/>
   </controller>
-  <controller name="c2" pages="0,能前往,1,不能前往" selected="1"/>
+  <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="nd172x" fileName="images/txz_lvl_db.png" xy="9,10"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" 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://5mpsibzznd17tlv"/>
+      <Button title="前往" icon="ui://5mpsibzzittstn4"/>
     </component>
-    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="189,58">
+    <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://eg2y0ldpo9gh4k"/>
+      <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"/>
@@ -28,7 +28,7 @@
       <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,11" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
       <item url="ui://5mpsibzznd1743"/>
       <item url="ui://5mpsibzznd1743"/>
     </list>

FGUIProject/assets/Task/components/ButtonBuyBattlePassLevel.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="288,83" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nd17" name="n0" src="uxxstn0" fileName="images/cz_an_pink.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_itts" name="n2" src="ittstni" fileName="images/wz_gmzzdj.png" xy="51,21"/>
+  </displayList>
+  <Button/>
+  <customProperty target="text" propertyId="0"/>
+</component>

FGUIProject/assets/Task/components/ButtonOpenBattlePass.xml

@@ -2,10 +2,11 @@
 <component size="288,83" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_nd17" name="n0" src="nd173e" fileName="images/cz_an_pink.png" xy="0,0">
+    <image id="n0_nd17" name="n0" src="uxxstn0" fileName="images/cz_an_pink.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_nd17" name="n1" xy="52,18" size="184,44" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="center" autoSize="none" strokeColor="#e89999" shadowColor="#b36f6e" shadowOffset="3,1" text="开启锦罗织造"/>
+    <image id="n2_itts" name="n2" src="uxxstm4" fileName="images/wz_kqjlzz.png" xy="51,21"/>
   </displayList>
   <Button/>
+  <customProperty target="text" propertyId="0"/>
 </component>

FGUIProject/assets/Task/components/ComeBt.xml

@@ -2,10 +2,10 @@
 <component size="189,58" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_9qpb" name="n0" src="nd17tlv" fileName="imagesNew/lm_an_jujue_1.png" xy="0,0">
+    <image id="n0_9qpb" name="n0" src="ittstn4" fileName="images/lm_an_jujue_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_9qpb" name="title" xy="0,0" size="189,58" font="ui://eg2y0ldpa0cftky" fontSize="28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+    <text id="n1_9qpb" name="title" xy="0,0" size="189,58" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#465a7f" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="346,22" extention="ProgressBar">
   <displayList>
-    <image id="n0_nd17" name="n0" src="nd173k" fileName="images/jyt_dk_2.png" xy="0,0" size="346,22">
+    <image id="n0_nd17" name="n0" src="uxxstmw" fileName="images/jyt_dk_2.png" xy="0,0" size="346,22">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_nd17" name="ExpBar" src="nd1739" fileName="images/jyt_yellow.png" xy="0,1" size="346,19"/>
-    <image id="n2_nd17" name="n2" src="nd172x" fileName="images/txz_lvl_db.png" xy="-99,-50"/>
+    <image id="n1_nd17" name="ExpBar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,1" size="346,19"/>
+    <image id="n2_nd17" name="n2" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="-99,-50"/>
     <text id="n3_nd17" name="n3" xy="-51,-23" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n4_nd17" name="Level" xy="-50,-11" size="20,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="2"/>
     <text id="n5_nd17" name="NumProcess" xy="49,-43" size="76,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>

FGUIProject/assets/Task/components/LinessRewardProcessItemBt.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="114,119" extention="Button">
+  <controller name="c1" pages="0,NotGet,1,CanGet" selected="0"/>
+  <displayList>
+    <image id="n4_9qpb" name="n4" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="0,3" size="119,118"/>
+    <image id="n5_9qpb" name="n5" src="dhoatk2" fileName="imgItemIcon/hlhdjficon.png" pkg="eg2y0ldp" xy="10,19" size="99,86"/>
+    <image id="n6_9qpb" name="n6" src="uxxstmt" fileName="images/jyt_fgx.png" xy="54,123"/>
+    <image id="n7_9qpb" name="n7" src="uxxstmg" fileName="images/jyt_liang.png" xy="35,113">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n8_9qpb" name="text" xy="31,139" size="43,54" fontSize="40" color="#b46471" align="center" vAlign="middle" text="20"/>
+  </displayList>
+  <Button/>
+  <customProperty target="text" propertyId="0"/>
+</component>

FGUIProject/assets/Task/components/LivenessRewardProcess.xml

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

FGUIProject/assets/Task/components/LivenessRewardProcessItem.xml

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

FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -1,9 +1,13 @@
 <?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="nd1730" fileName="images/wpk_db_2.png" xy="0,0"/>
+    <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="nd1732" fileName="images/wpk_sz_db2.png" xy="5,85"/>
+    <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">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/Task/components/RewardIconYellow.xml

@@ -1,9 +1,13 @@
 <?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="nd1736" fileName="images/wpk_db_1.png" xy="0,0"/>
+    <image id="n0_nd17" name="n0" src="uxxstmb" fileName="images/wpk_db_1.png" xy="0,0"/>
     <loader id="n3_vixc" name="loaIcon" xy="61,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="nd1731" fileName="images/wpk_sz_db.png" xy="5,85"/>
+    <image id="n1_nd17" name="n1" src="uxxstmy" fileName="images/wpk_sz_db.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="72,-8">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/Task/components/TabButton.xml

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

FGUIProject/assets/Task/components/TaskListItem.xml

@@ -7,8 +7,8 @@
   </controller>
   <controller name="c2" pages="0,CanGo,1,NotGo" selected="0"/>
   <displayList>
-    <image id="n13_ids4" name="n13" src="nd172s" fileName="images/mrrw_db.png" xy="-4,8"/>
-    <image id="n12_ids4" name="n12" src="nd172y" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
+    <image id="n13_ids4" name="n13" src="uxxstmj" fileName="images/mrrw_db.png" xy="-4,8"/>
+    <image id="n12_ids4" name="n12" src="uxxstmq" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
     <text id="n14_ids4" name="txtCount" xy="390,20" size="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://5mpsibzznd1743" autoClearItems="true">

FGUIProject/assets/Task/package.xml

@@ -2,56 +2,8 @@
 <packageDescription id="5mpsibzz">
   <resources>
     <component id="lh8v5" name="TaskListItem.xml" path="/components/"/>
-    <image id="wet228" name="mrqd_ylq.png" path="/images/"/>
-    <image id="wet229" name="mrqd_1.png" path="/images/"/>
-    <image id="wet22a" name="mrqd_2.png" path="/images/"/>
-    <image id="wet22b" name="mrqd_3.png" path="/images/"/>
-    <image id="wet22c" name="mrqd_anniu_1.png" path="/images/"/>
-    <image id="wet22d" name="mrqd_anniu_2.png" path="/images/"/>
-    <image id="wet22e" name="mrqd_anniu_3.png" path="/images/"/>
-    <image id="wet22f" name="mrqd_anniu_4.png" path="/images/"/>
-    <image id="wet22g" name="mrqd_bjbj.jpg" path="/images/"/>
-    <image id="wet22h" name="mrqd_kdi.png" path="/images/"/>
-    <image id="wet22l" name="mrqd_xian.png" path="/images/"/>
-    <image id="slkg2m" name="mrqd_anniu_5.png" path="/images/"/>
     <component id="fqor2n" name="TaskUI.xml" path="/" exported="true"/>
     <component id="fqor2p" name="CombTaskUI.xml" path="/" exported="true"/>
-    <image id="nd172r" name="an_jia.png" path="/images/"/>
-    <image id="nd172s" name="mrrw_db.png" path="/images/"/>
-    <image id="nd172t" name="sj_dk.png" path="/images/"/>
-    <image id="nd172u" name="txz_jlzz_db_jlzz.png" path="/images/"/>
-    <image id="nd172v" name="txz_jlzz_db_pt.png" path="/images/"/>
-    <image id="nd172w" name="txz_jlzz_tbdj_db.png" path="/images/"/>
-    <image id="nd172x" name="txz_lvl_db.png" path="/images/"/>
-    <image id="nd172y" name="mrrw_bq_qb.png" path="/images/"/>
-    <image id="nd172z" name="txz_nr_db.png" path="/images/"/>
-    <image id="nd1730" name="wpk_db_2.png" path="/images/"/>
-    <image id="nd1731" name="wpk_sz_db.png" path="/images/"/>
-    <image id="nd1732" name="wpk_sz_db2.png" path="/images/"/>
-    <image id="nd1733" name="wpk_zz.png" path="/images/"/>
-    <image id="nd1734" name="wz_kqjlzz.png" path="/images/"/>
-    <image id="nd1735" name="yeqian_db.png" path="/images/"/>
-    <image id="nd1736" name="wpk_db_1.png" path="/images/"/>
-    <image id="nd1737" name="lm_biaotizi_13.png" path="/images/"/>
-    <image id="nd1738" name="lm_biaotizi_12.png" path="/images/"/>
-    <image id="nd1739" name="jyt_yellow.png" path="/images/"/>
-    <image id="nd173a" name="an_jian.png" path="/images/"/>
-    <image id="nd173b" name="bt_db_dj.png" path="/images/"/>
-    <image id="nd173c" name="bt_db_jlzz.png" path="/images/"/>
-    <image id="nd173d" name="bt_db_ptzz.png" path="/images/"/>
-    <image id="nd173e" name="cz_an_pink.png" path="/images/"/>
-    <image id="nd173f" name="db_jiajian.png" path="/images/"/>
-    <image id="nd173g" name="jdt_bg.png" path="/images/"/>
-    <image id="nd173h" name="jdt_bk.png" path="/images/"/>
-    <image id="nd173i" name="jdt_pink_2.png" path="/images/"/>
-    <image id="nd173j" name="jlzz_djbg.png" path="/images/"/>
-    <image id="nd173k" name="jyt_dk_2.png" path="/images/"/>
-    <image id="nd173l" name="jyt_dk.png" path="/images/"/>
-    <image id="nd173m" name="jyt_fgx.png" path="/images/"/>
-    <image id="nd173n" name="jyt_liang.png" path="/images/"/>
-    <image id="nd173o" name="jyt_pink.png" path="/images/"/>
-    <image id="nd173p" name="yeqian_xz.png" path="/images/" exported="true"/>
-    <image id="nd173q" name="zsx_flower.png" path="/images/"/>
     <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
     <component id="nd173t" name="ExpProcess.xml" path="/components/"/>
     <component id="nd173u" name="BattlePassRewardItem.xml" path="/components/"/>
@@ -59,10 +11,65 @@
     <component id="nd1743" name="RewardIconYellow.xml" path="/components/"/>
     <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
     <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
-    <component id="ids44c" name="LivenessRewardProcessItem.xml" path="/components/"/>
     <component id="ids44e" name="TabButton.xml" path="/components/"/>
     <component id="9qpb4h" name="ComeBt.xml" path="/components/"/>
-    <image id="nd17tlv" name="lm_an_jujue_1.png" path="/images/"/>
+    <component id="9qpb4j" name="LinessRewardProcessItemBt.xml" path="/components/"/>
+    <component id="or80tlw" name="BattlePassReward.xml" path="/components/"/>
+    <component id="or80tlx" name="OpenBattlePassUI.xml" path="/" exported="true"/>
+    <component id="or80tm1" name="BuyBattlePassLevelUI.xml" path="/" exported="true"/>
+    <component id="uxxstm2" name="AddReduceButton.xml" path="/components/"/>
+    <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="uxxstm7" name="txz_lvl_db.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="uxxstmb" name="wpk_db_1.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/"/>
+    <image id="uxxstmf" name="sj_dk.png" path="/images/"/>
+    <image id="uxxstmg" name="jyt_liang.png" path="/images/"/>
+    <image id="uxxstmh" name="jdt_bg.png" path="/images/"/>
+    <image id="uxxstmi" name="jyt_yellow.png" path="/images/"/>
+    <image id="uxxstmj" name="mrrw_db.png" path="/images/"/>
+    <image id="uxxstmk" name="yeqian_xz.png" path="/images/"/>
+    <image id="uxxstml" name="bt_db_jlzz.png" path="/images/"/>
+    <image id="uxxstmm" name="wpk_zz.png" path="/images/"/>
+    <image id="uxxstmn" name="txz_jlzz_tbdj_db.png" path="/images/"/>
+    <image id="uxxstmo" name="jdt_bk.png" path="/images/"/>
+    <image id="uxxstmp" name="txz_jlzz_db_pt.png" path="/images/"/>
+    <image id="uxxstmq" name="mrrw_bq_qb.png" path="/images/"/>
+    <image id="uxxstmr" name="jlzz_djbg.png" path="/images/"/>
+    <image id="uxxstms" name="lm_biaotizi_13.png" path="/images/"/>
+    <image id="uxxstmt" name="jyt_fgx.png" path="/images/"/>
+    <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="uxxstmy" name="wpk_sz_db.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/"/>
+    <image id="uxxstn2" name="jyt_dk.png" path="/images/"/>
+    <image id="uxxstn3" name="txz_tb_ylq.png" path="/images/"/>
+    <image id="ittstn4" name="lm_an_jujue_1.png" path="/images/"/>
+    <image id="ittstn5" name="mrqd_3.png" path="/images/"/>
+    <image id="ittstn6" name="mrqd_anniu_4.png" path="/images/"/>
+    <image id="ittstn7" name="mrqd_anniu_5.png" path="/images/"/>
+    <image id="ittstn8" name="mrqd_2.png" path="/images/"/>
+    <image id="ittstn9" name="mrqd_ylq.png" path="/images/"/>
+    <image id="ittstna" name="mrqd_1.png" path="/images/"/>
+    <image id="ittstnb" name="mrqd_bjbj.jpg" path="/images/"/>
+    <image id="ittstnc" name="mrqd_anniu_2.png" path="/images/"/>
+    <image id="ittstnd" name="mrqd_anniu_3.png" path="/images/"/>
+    <image id="ittstne" name="mrqd_anniu_1.png" path="/images/"/>
+    <image id="ittstnf" name="mrqd_kdi.png" path="/images/"/>
+    <image id="ittstng" name="mrqd_xian.png" path="/images/"/>
+    <image id="ittstni" name="wz_gmzzdj.png" path="/images/"/>
+    <component id="ittstnj" name="ButtonBuyBattlePassLevel.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -10,7 +10,7 @@ namespace GFGGame
         public const string ITEM_CHANGED = "ITEM_CHANGED";
         public const string ITEM_ATTRIBUTE_CHANGED = "ITEM_ATTRIBUTE_CHANGED";
 
-        public const string STORY_LEVEL_CHANGE = "STORY_LEVEL_CHANGE";//通关新剧情或新关卡
+        public const string STORY_LEVEL_CHANGE = "STORY_LEVEL_CHANGE";//通锟斤拷锟铰撅拷锟斤拷锟斤拷鹿乜锟�
 
         public const string SUIT_BOX_STATUS_CHANGED = "SUIT_BOX_STATUS_CHANGED";
         public const string CJ_FINISH = "CJ_FINISH";
@@ -38,6 +38,7 @@ namespace GFGGame
 
         public const string CARD_UP_SKILL = "CARD_UP_SKILL";
         public const string NUMERIC_CHANGE = "NUMERIC_CHANGE";
+        public const string LIVENESS_CHANGE = "LIVENESS_CHANGE";
 
 
         public const string GET_SUIT_INFOS = "GET_SUIT_INFOS";
@@ -45,13 +46,13 @@ namespace GFGGame
         public const string GET_MAINTAIN_SUIT_BONUS = "GET_MAINTAIN_SUIT_BONUS";
         public const string MAKE_NEW_SUIT = "MAKE_NEW_SUIT";
 
-        //剧情战斗快速完成，展示奖励
+        //锟斤拷锟斤拷战锟斤拷锟斤拷锟斤拷锟斤拷桑锟秸故撅拷锟斤拷锟�
         public const string STORY_FIGHT_QUICKLY_SUCCESS = "STORY_FIGHT_QUICKLY_SUCCESS";
 
-        public const string NOTICE_LIMIT_CHANGED = "NOTICE_LIMIT_CHANGED";//限制次数变化通知
+        public const string NOTICE_LIMIT_CHANGED = "NOTICE_LIMIT_CHANGED";//锟斤拷锟狡达拷锟斤拷锟戒化通知
 
-        public const string FILING_SCORE_CHANGE = "FILING_SCORE_CHANGE";//查阅建档分数奖励变化
-        public const string FILLING_CHANGE_CHAPTER = "FILLING_CHANGE_CHAPTER";//查阅建档切换npc
+        public const string FILING_SCORE_CHANGE = "FILING_SCORE_CHANGE";//锟斤拷锟侥斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟戒化
+        public const string FILLING_CHANGE_CHAPTER = "FILLING_CHANGE_CHAPTER";//锟斤拷锟侥斤拷锟斤拷锟叫伙拷npc
 
 
         public const string NOTICE_MAINSTORY_BOXBONUS_STATE = "NOTICE_MAINSTORY_BOXBONUS_STATE";
@@ -60,61 +61,61 @@ namespace GFGGame
 
         public const string LUCKY_BOX = "LUCKY_BOX";
 
-        public const string BUY_RECHARGE_SUCCESS = "BUY_RECHARGE_SUCCESS";//充值成功
-        public const string BUY_GIFT_SUCCESS = "BUY_GIFT_SUCCESS";//购买礼包成功
-        public const string BUY_EXCHANGE_SUCCESS = "BUY_EXCHANGE_SUCCESS";//商城兑换成功
+        public const string BUY_RECHARGE_SUCCESS = "BUY_RECHARGE_SUCCESS";//锟斤拷值锟缴癸拷
+        public const string BUY_GIFT_SUCCESS = "BUY_GIFT_SUCCESS";//锟斤拷锟斤拷锟斤拷锟斤拷晒锟�
+        public const string BUY_EXCHANGE_SUCCESS = "BUY_EXCHANGE_SUCCESS";//锟教城兑伙拷锟缴癸拷
 
-        public const string LOGIN_SUCCESS = "LOGIN_SUCCESS";//登录成功
-        public const string LOGIN_FAIL = "LOGIN_FAIL";//登录失败
-        public const string SERVER_CHANGE = "SERVER_CHANGE";//更换区服
+        public const string LOGIN_SUCCESS = "LOGIN_SUCCESS";//锟斤拷录锟缴癸拷
+        public const string LOGIN_FAIL = "LOGIN_FAIL";//锟斤拷录失锟斤拷
+        public const string SERVER_CHANGE = "SERVER_CHANGE";//锟斤拷锟斤拷锟斤拷锟斤拷
 
-        public const string FIELD_RESULT = "FIELD_RESULT";//田野结算
-        public const string FIELD_TASK = "FIELD_TASK";//田野任务
+        public const string FIELD_RESULT = "FIELD_RESULT";//锟斤拷野锟斤拷锟斤拷
+        public const string FIELD_TASK = "FIELD_TASK";//锟斤拷野锟斤拷锟斤拷
 
-        public const string NOTICE_SYSTOM_ADD = "NOTICE_SYSTOM_ADD";//新增公告
-        public const string NOTICE_SYSTOM_REMOVE = "NOTICE_SYSTOM_REMOVE";//删除公告
+        public const string NOTICE_SYSTOM_ADD = "NOTICE_SYSTOM_ADD";//锟斤拷锟斤拷锟斤拷锟斤拷
+        public const string NOTICE_SYSTOM_REMOVE = "NOTICE_SYSTOM_REMOVE";//删锟斤拷锟斤拷锟斤拷
 
-        public const string SUIT_GUIDE_BOX_BONUS = "SUIT_GUIDE_BOX_BONUS";//领取套装收集奖励
-        public const string JUMP_TO_SOURCE = "JUMP_TO_SOURCE";//跳转到来源
+        public const string SUIT_GUIDE_BOX_BONUS = "SUIT_GUIDE_BOX_BONUS";//锟斤拷取锟斤拷装锟秸硷拷锟斤拷锟斤拷
+        public const string JUMP_TO_SOURCE = "JUMP_TO_SOURCE";//锟斤拷转锟斤拷锟斤拷源
 
-        public const string FINSH_GUIDE_INDEX = "FINSH_GUIDE_INDEX";//完成一步引导
-        public const string RED_CHANGE = "RED_CHANGE";//红点变化，新增或删除
+        public const string FINSH_GUIDE_INDEX = "FINSH_GUIDE_INDEX";//锟斤拷锟揭伙拷锟斤拷锟斤拷锟�
+        public const string RED_CHANGE = "RED_CHANGE";//锟斤拷锟戒化锟斤拷锟斤拷锟斤拷锟斤拷删锟斤拷
 
-        public const string FRIEND_REFRESH = "FRIEND_REFRESH";//刷新好友列表
-        public const string FRIEND_ADD = "FRIEND_ADD";//新增好友
-        public const string FRIEND_REMOVE = "FRIEND_REMOVE";//删除好友
-        public const string FRIEND_APPLY_CHANGE = "FRIEND_APPLY_CHANGE";//好友申请列表变化
+        public const string FRIEND_REFRESH = "FRIEND_REFRESH";//刷锟铰猴拷锟斤拷锟叫憋拷
+        public const string FRIEND_ADD = "FRIEND_ADD";//锟斤拷锟斤拷锟斤拷锟斤拷
+        public const string FRIEND_REMOVE = "FRIEND_REMOVE";//删锟斤拷锟斤拷锟斤拷
+        public const string FRIEND_APPLY_CHANGE = "FRIEND_APPLY_CHANGE";//锟斤拷锟斤拷锟斤拷锟斤拷锟叫憋拷锟戒化
 
-        public const string ITEM_READ = "ITEM_READ";//物品已读回复
+        public const string ITEM_READ = "ITEM_READ";//锟斤拷品锟窖讹拷锟截革拷
 
-        public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE";//相册数据变化
+        public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE";//锟斤拷锟斤拷锟斤拷荼浠�
 
-        public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME";//修改玩家名称
-        public const string CHANGE_ROLE_HEAD = "CHANGE_ROLE_HEAD";//修改玩家头像、头像框
+        public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME";//锟睫革拷锟斤拷锟斤拷锟斤拷锟�
+        public const string CHANGE_ROLE_HEAD = "CHANGE_ROLE_HEAD";//锟睫革拷锟斤拷锟酵凤拷锟酵凤拷锟斤拷
 
-        public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE";//游历状态变化
+        public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE";//锟斤拷锟斤拷状态锟戒化
 
-        public const string GALLERY_DATA_CHANGE = "GALLERY_DATA_CHANGE";//画廊数据变化
-        public const string GALLERY_RANK_DATA_CHANGE = "GALLERY_RANK_DATA_CHANGE";//画廊排行榜数据变化
+        public const string GALLERY_DATA_CHANGE = "GALLERY_DATA_CHANGE";//锟斤拷锟斤拷锟斤拷锟捷变化
+        public const string GALLERY_RANK_DATA_CHANGE = "GALLERY_RANK_DATA_CHANGE";//锟斤拷锟斤拷锟斤拷锟叫帮拷锟斤拷锟捷变化
 
-        public const string DOWNLOAD_FINISH = "DOWNLOAD_FINISH";//下载完成
-        public const string DOWNLOAD_FINISH_ONE = "DOWNLOAD_FINISH_ONE";//下载完成一个
+        public const string DOWNLOAD_FINISH = "DOWNLOAD_FINISH";//锟斤拷锟斤拷锟斤拷锟�
+        public const string DOWNLOAD_FINISH_ONE = "DOWNLOAD_FINISH_ONE";//锟斤拷锟斤拷锟斤拷锟揭伙拷锟�
 
-        public const string ARENA_FIGHT_RESULT = "ARENA_FIGHT_RESULT";//竞技场战斗结算
+        public const string ARENA_FIGHT_RESULT = "ARENA_FIGHT_RESULT";//锟斤拷锟斤拷锟斤拷战锟斤拷锟斤拷锟斤拷
 
-        public const string LEAGUE_MEMBER_CHANGE = "LEAGUE_MEMBER_CHANGE";//联盟成员变化
-        // public const string LEAGUE_MEMBER_POS_CHANGE = "LEAGUE_MEMBER_POS_CHANGE";//联盟成员职位变化
-        public const string LEAGUE_LOG_CHANGE = "LEAGUE_LOG_CHANGE";//联盟日志变化
-        public const string LEAGUE_INFO_CHANGE = "LEAGUE_INFO_CHANGE";//联盟信息变化
-        public const string LEAGUE_NUMBERIC_CHANGE = "LEAGUE_NUMBERIC_CHANGE";//联盟数值变化
-        public const string LEAGUE_ANSWER_MEMBER_CHANGE = "LEAGUE_ANSWER_MEMBER_CHANGE";//有人加入退出答对题目
-        public const string LEAGUE_ANSWER_RESULT_CHANGE = "LEAGUE_ANSWER_RESULT_CHANGE";//联盟有人答对题目
-        public const string LEAGUE_ANSWER_START = "LEAGUE_ANSWER_START";//联盟新一轮答题开始
-        public const string LEAGUE_ANSWER_END = "LEAGUE_ANSWER_END";//联盟本轮答题结束
-        // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//联盟答题状态更新
-        public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE";//其他玩家信息变化
-        public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE";//通知聊天信息
-        public const string ACTIVE_SKILL = "ACTIVE_SKILL";//技能激活
+        public const string LEAGUE_MEMBER_CHANGE = "LEAGUE_MEMBER_CHANGE";//锟斤拷锟剿筹拷员锟戒化
+        // public const string LEAGUE_MEMBER_POS_CHANGE = "LEAGUE_MEMBER_POS_CHANGE";//锟斤拷锟剿筹拷员职位锟戒化
+        public const string LEAGUE_LOG_CHANGE = "LEAGUE_LOG_CHANGE";//锟斤拷锟斤拷锟斤拷志锟戒化
+        public const string LEAGUE_INFO_CHANGE = "LEAGUE_INFO_CHANGE";//锟斤拷锟斤拷锟斤拷息锟戒化
+        public const string LEAGUE_NUMBERIC_CHANGE = "LEAGUE_NUMBERIC_CHANGE";//锟斤拷锟斤拷锟斤拷值锟戒化
+        public const string LEAGUE_ANSWER_MEMBER_CHANGE = "LEAGUE_ANSWER_MEMBER_CHANGE";//锟斤拷锟剿硷拷锟斤拷锟剿筹拷锟斤拷锟斤拷锟侥�
+        public const string LEAGUE_ANSWER_RESULT_CHANGE = "LEAGUE_ANSWER_RESULT_CHANGE";//锟斤拷锟斤拷锟斤拷锟剿达拷锟斤拷锟侥�
+        public const string LEAGUE_ANSWER_START = "LEAGUE_ANSWER_START";//锟斤拷锟斤拷锟斤拷一锟街达拷锟解开始
+        public const string LEAGUE_ANSWER_END = "LEAGUE_ANSWER_END";//锟斤拷锟剿憋拷锟街达拷锟斤拷锟斤拷锟�
+        // public const string LEAGUE_ANSWER_STATE_CHANGE = "LEAGUE_ANSWER_STATE_CHANGE";//锟斤拷锟剿达拷锟斤拷状态锟斤拷锟斤拷
+        public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE";//锟斤拷锟斤拷锟斤拷锟斤拷锟较�拷浠�
+        public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE";//通知锟斤拷锟斤拷锟斤拷息
+        public const string ACTIVE_SKILL = "ACTIVE_SKILL";//锟斤拷锟杰硷拷锟斤拷
 
     }
 }

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

@@ -28,12 +28,22 @@ namespace GFGGame
 
         /// <summary>
         /// 根据宝箱id获取宝箱状态
-        /// </summary>0未完成，1可领取，2已领取
+        /// </summary>0不可领取，1可领取，2已领取
         /// <param name="boxId"></param>
         /// <returns></returns>
         public int GetBoxStateById(int boxId)
         {
-            return !_livenessBoxInfos.ContainsKey(boxId) ? 0 : _livenessBoxInfos[boxId];
+            //已领取
+            if (_livenessBoxInfos.ContainsKey(boxId) && _livenessBoxInfos[boxId] == ConstBonusStatus.GOT) return 2;
+            //获取宝箱配置
+            var cfg = DailyActiveRewardCfgArray.Instance.GetCfg(boxId);
+            if (cfg == null)
+            {
+                Log.Error($"出现了没有配置的宝箱id{boxId}");
+                return ConstBonusStatus.CAN_NOT_GET;
+            }
+            //判断是否满足领取条件
+            return RoleDataManager.Liveness >= cfg.count ? ConstBonusStatus.CAN_GET : ConstBonusStatus.CAN_NOT_GET;
         }
 
         /// <summary>

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

@@ -11,7 +11,6 @@ namespace GFGGame
         public long Progress; //进度
     }
 
-
     public class TaskDataManager : SingletonBase<TaskDataManager>
     {
         //解锁的任务列表
@@ -37,7 +36,6 @@ namespace GFGGame
                 Log.Error($"出现了没有配置的任务id{taskId}");
                 return;
             }
-
             TaskInfosDic.TryGetValue(taskId, out var taskInfo);
             if (taskInfo == null)
             {
@@ -48,7 +46,6 @@ namespace GFGGame
                     taskIds = new List<int>();
                     TaskType2TaskIdListDic.Add(cfg.type, taskIds);
                 }
-
                 taskIds.Add(taskId);
             }
             else
@@ -91,7 +88,6 @@ namespace GFGGame
             return cfgs;
         }
 
-
         /// <summary>
         /// 根据任务id获取任务状态
         /// </summary>0未完成，1可领取，2已领取
@@ -112,7 +108,6 @@ namespace GFGGame
             return !TaskInfosDic.ContainsKey(taskId) ? 0 : TaskInfosDic[taskId].Progress;
         }
 
-
         public string GetTaskDesc(int taskId)
         {
             var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberUI.cs

@@ -16,7 +16,7 @@ namespace UI.League
         public UI_Button14 m_btnRecruit;
         public GButton m_btnApplyList;
         public GButton m_btnMemberLog;
-        public GButton m_btnExit;
+        public GComponent m_btnExit;
         public GButton m_btnExit1;
         public const string URL = "ui://tw70qm9du2u35";
         public const string PACKAGE_NAME = "League";
@@ -74,7 +74,7 @@ namespace UI.League
             m_btnRecruit = (UI_Button14)UI_Button14.Create(comp.GetChild("btnRecruit"));
             m_btnApplyList = (GButton)comp.GetChild("btnApplyList");
             m_btnMemberLog = (GButton)comp.GetChild("btnMemberLog");
-            m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnExit = (GComponent)comp.GetChild("btnExit");
             m_btnExit1 = (GButton)comp.GetChild("btnExit1");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -13,6 +13,12 @@ namespace UI.RoleInfo
         public GButton m_btnAddItem;
         public GTextInput m_inputGM;
         public GButton m_btnGM;
+        public GTextInput m_RoleNumType;
+        public GTextInput m_Num;
+        public GButton m_btnSetNum;
+        public GTextInput m_AddRoleNumType;
+        public GTextInput m_AddNum;
+        public GButton m_btnAddNum;
         public const string URL = "ui://374k3dwvd4iw6q";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "GMPanelUI";
@@ -66,6 +72,12 @@ namespace UI.RoleInfo
             m_btnAddItem = (GButton)comp.GetChild("btnAddItem");
             m_inputGM = (GTextInput)comp.GetChild("inputGM");
             m_btnGM = (GButton)comp.GetChild("btnGM");
+            m_RoleNumType = (GTextInput)comp.GetChild("RoleNumType");
+            m_Num = (GTextInput)comp.GetChild("Num");
+            m_btnSetNum = (GButton)comp.GetChild("btnSetNum");
+            m_AddRoleNumType = (GTextInput)comp.GetChild("AddRoleNumType");
+            m_AddNum = (GTextInput)comp.GetChild("AddNum");
+            m_btnAddNum = (GButton)comp.GetChild("btnAddNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +88,12 @@ namespace UI.RoleInfo
             m_btnAddItem = null;
             m_inputGM = null;
             m_btnGM = null;
+            m_RoleNumType = null;
+            m_Num = null;
+            m_btnSetNum = null;
+            m_AddRoleNumType = null;
+            m_AddNum = null;
+            m_btnAddNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_BattlePassReward
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public UI_RewardIconBlue m_NormalReward;
+        public GTextField m_Level;
+        public GList m_RewardList;
+        public const string URL = "ui://5mpsibzzor80tlw";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "BattlePassReward";
+        private static UI_BattlePassReward _proxy;
+
+        public static UI_BattlePassReward Create(GObject gObject = null)
+        {
+            var ui = new UI_BattlePassReward();
+            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_BattlePassReward Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BattlePassReward();
+            }
+            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_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_NormalReward.Dispose();
+            m_NormalReward = null;
+            m_Level = null;
+            m_RewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

@@ -4,19 +4,18 @@ using FairyGUI;
 
 namespace UI.Task
 {
-    public partial class UI_LivenessRewardProcessItem
+    public partial class UI_BuyBattlePassLevelUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public GTextField m_text;
-        public const string URL = "ui://5mpsibzzids44c";
+        public GButton m_CloseBtn;
+        public const string URL = "ui://5mpsibzzor80tm1";
         public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "LivenessRewardProcessItem";
-        private static UI_LivenessRewardProcessItem _proxy;
+        public const string RES_NAME = "BuyBattlePassLevelUI";
+        private static UI_BuyBattlePassLevelUI _proxy;
 
-        public static UI_LivenessRewardProcessItem Create(GObject gObject = null)
+        public static UI_BuyBattlePassLevelUI Create(GObject gObject = null)
         {
-            var ui = new UI_LivenessRewardProcessItem();
+            var ui = new UI_BuyBattlePassLevelUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +24,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_LivenessRewardProcessItem Proxy(GObject gObject = null)
+        public static UI_BuyBattlePassLevelUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_LivenessRewardProcessItem();
+                _proxy = new UI_BuyBattlePassLevelUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +55,11 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_text = (GTextField)comp.GetChild("text");
+            m_CloseBtn = (GButton)comp.GetChild("CloseBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_text = null;
+            m_CloseBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_LinessRewardProcessItemBt
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_text;
+        public const string URL = "ui://5mpsibzz9qpb4j";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "LinessRewardProcessItemBt";
+        private static UI_LinessRewardProcessItemBt _proxy;
+
+        public static UI_LinessRewardProcessItemBt Create(GObject gObject = null)
+        {
+            var ui = new UI_LinessRewardProcessItemBt();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LinessRewardProcessItemBt Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LinessRewardProcessItemBt();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_text = (GTextField)comp.GetChild("text");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_text = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,11 +7,11 @@ namespace UI.Task
     public partial class UI_LivenessRewardProcess
     {
         public GProgressBar target;
-        public UI_LivenessRewardProcessItem m_Reward20;
-        public UI_LivenessRewardProcessItem m_Reward40;
-        public UI_LivenessRewardProcessItem m_Reward60;
-        public UI_LivenessRewardProcessItem m_Reward80;
-        public UI_LivenessRewardProcessItem m_Reward100;
+        public UI_LinessRewardProcessItemBt m_Reward20;
+        public UI_LinessRewardProcessItemBt m_Reward40;
+        public UI_LinessRewardProcessItemBt m_Reward60;
+        public UI_LinessRewardProcessItemBt m_Reward80;
+        public UI_LinessRewardProcessItemBt m_Reward100;
         public const string URL = "ui://5mpsibzzids449";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "LivenessRewardProcess";
@@ -59,11 +59,11 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_Reward20 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward20"));
-            m_Reward40 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward40"));
-            m_Reward60 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward60"));
-            m_Reward80 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward80"));
-            m_Reward100 = (UI_LivenessRewardProcessItem)UI_LivenessRewardProcessItem.Create(comp.GetChild("Reward100"));
+            m_Reward20 = (UI_LinessRewardProcessItemBt)UI_LinessRewardProcessItemBt.Create(comp.GetChild("Reward20"));
+            m_Reward40 = (UI_LinessRewardProcessItemBt)UI_LinessRewardProcessItemBt.Create(comp.GetChild("Reward40"));
+            m_Reward60 = (UI_LinessRewardProcessItemBt)UI_LinessRewardProcessItemBt.Create(comp.GetChild("Reward60"));
+            m_Reward80 = (UI_LinessRewardProcessItemBt)UI_LinessRewardProcessItemBt.Create(comp.GetChild("Reward80"));
+            m_Reward100 = (UI_LinessRewardProcessItemBt)UI_LinessRewardProcessItemBt.Create(comp.GetChild("Reward100"));
         }
         public void Dispose(bool disposeTarget = false)
         {

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_OpenBattlePassUI
+    {
+        public GComponent target;
+        public GButton m_CloseBtn;
+        public GButton m_OpenBtn;
+        public const string URL = "ui://5mpsibzzor80tlx";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "OpenBattlePassUI";
+        private static UI_OpenBattlePassUI _proxy;
+
+        public static UI_OpenBattlePassUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenBattlePassUI();
+            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_OpenBattlePassUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenBattlePassUI();
+            }
+            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_CloseBtn = (GButton)comp.GetChild("CloseBtn");
+            m_OpenBtn = (GButton)comp.GetChild("OpenBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_CloseBtn = null;
+            m_OpenBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,6 +7,7 @@ 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";
@@ -56,11 +57,13 @@ 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");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_num = null;
             if(disposeTarget && target != null)

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

@@ -7,6 +7,7 @@ namespace UI.Task
     public partial class UI_RewardIconYellow
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_num;
         public const string URL = "ui://5mpsibzznd1743";
@@ -56,11 +57,13 @@ 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");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_num = null;
             if(disposeTarget && target != null)

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

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using ET;
 using GFGGame;
 
@@ -80,7 +79,7 @@ namespace GFGGame
             var response =
                 (S2C_GetBattlePassReward)await MessageHelper.SendToServer(new C2S_GetBattlePassReward { Id = level });
             if (!(response is { Error: ErrorCode.ERR_Success })) return;
-            var responseGetType = response.GetType;
+            var responseGetType = response.Type;
             //获取通行证奖励配置
             var passCfg =
                 BattlePassCfgArray.Instance.GetCfgByidAndlevel(BattlePassTaskDataManager.Instance.GetSeasonId(), level);

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

@@ -19,6 +19,9 @@ namespace ET
                 case NumericType.Power:
                     RoleDataManager.powerTimeServerLock = false;
                     break;
+                case NumericType.Liveness:
+                    EventAgent.DispatchEvent(ConstMessage.LIVENESS_CHANGE);
+                    break;
             }
             EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE, message.NumericType);
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE, message.NumericType);

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

@@ -10,10 +10,12 @@ namespace ET
         protected override async ETTask Run(Session session, M2C_TaskInfoChange message)
         {
             // Log.Info($"M2C_TaskInfoChangeHandler");
-            var taskInfo = new TaskInfo();
-            taskInfo.ID = message.TaskInfo.Id;
-            taskInfo.State = message.TaskInfo.Status;
-            taskInfo.Progress = message.TaskInfo.Progress;
+            var taskInfo = new TaskInfo
+            {
+                ID = message.TaskInfo.Id,
+                State = message.TaskInfo.Status,
+                Progress = message.TaskInfo.Progress
+            };
             TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             await ETTask.CompletedTask;
@@ -36,6 +38,16 @@ namespace GFGGame
         {
             //C2M_GetTaskInfos
             var response = (M2C_GetTaskInfos)await MessageHelper.SendToServer(new C2M_GetTaskInfos { Type = taskType });
+            response.TaskList.ForEach(proto =>
+            {
+                var taskInfo = new TaskInfo
+                {
+                    ID = proto.Id,
+                    State = proto.Status,
+                    Progress = proto.Progress
+                };
+                TaskDataManager.Instance.UpdateTaskInfo(taskInfo.ID, taskInfo);
+            });
             return response.Error == ErrorCode.ERR_Success;
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -41,6 +41,8 @@ namespace GFGGame
             _ui.m_ComBtn.m_btnLeagueSkill.onClick.Add(OnClickBtnLeagueSkill);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
+            _ui.m_btnAddNum.onClick.Add(OnClickBtnAddCount);
+            _ui.m_btnSetNum.onClick.Add(OnClickBtnSetCount);
         }
 
         protected override void OnShown()
@@ -97,6 +99,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("请按照指定格式输入物品信息", MessageType.ERR);
             }
         }
+
         private void OnClickBtnSetLv()
         {
             int tmp;
@@ -110,19 +113,23 @@ namespace GFGGame
 
             GMController.SendGMCommand("lv " + lv, messageSuc).Coroutine();
         }
+
         private void OnClickBtnSetChapter()
         {
             int tmp;
             int tmp1;
-            if (!int.TryParse(_ui.m_ComBtn.m_txtChapter.text, out tmp) || !int.TryParse(_ui.m_ComBtn.m_txtChapterLv.text, out tmp1))
+            if (!int.TryParse(_ui.m_ComBtn.m_txtChapter.text, out tmp) ||
+                !int.TryParse(_ui.m_ComBtn.m_txtChapterLv.text, out tmp1))
             {
                 PromptController.Instance.ShowFloatTextPrompt("请输入数字");
                 return;
             }
             string content = _ui.m_ComBtn.m_txtChapter.text + " " + _ui.m_ComBtn.m_txtChapterLv.text;
-            string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text, _ui.m_ComBtn.m_txtChapterLv.text);
+            string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text,
+                _ui.m_ComBtn.m_txtChapterLv.text);
             GMController.SendGMCommand("chapter " + content, messageSuc).Coroutine();
         }
+
         private async void OnClickBtnSkipCheckOpen()
         {
             int isSkip = GameGlobal.skipCheckOpen == false ? 1 : 0;
@@ -131,12 +138,13 @@ namespace GFGGame
             {
                 GameGlobal.skipCheckOpen = !GameGlobal.skipCheckOpen;
                 PromptController.Instance.ShowFloatTextPrompt("已开启跳过功能开启检测");
-
             }
         }
+
         private async void OnClickBtnArenaGrade()
         {
-            string gm = string.Format("SetArenaRank|{0}|{1}", _ui.m_ComBtn.m_txtArenaGrade.text, _ui.m_ComBtn.m_txtArenaRank.text);
+            string gm = string.Format("SetArenaRank|{0}|{1}", _ui.m_ComBtn.m_txtArenaGrade.text,
+                _ui.m_ComBtn.m_txtArenaRank.text);
             bool result = await GMController.SendGMCommand(gm, "修改成功");
             if (result)
             {
@@ -150,14 +158,17 @@ namespace GFGGame
         {
             GMController.SendGMCommand("League|StartQuestion", "开始答题").Coroutine();
         }
+
         private void OnClickBtnEnd()
         {
             GMController.SendGMCommand("League|EndQuestion", "结束答题").Coroutine();
         }
+
         private void OnClickBtnActiveEnd()
         {
             GMController.SendGMCommand("League|CloseQuestion", "活动结束").Coroutine();
         }
+
         private async void OnClickBtnLeagueSkill()
         {
             int _type = int.Parse(_ui.m_ComBtn.m_txtskillType.text);
@@ -165,7 +176,8 @@ namespace GFGGame
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 int skillId = skillCfgs[i].id;
-                if (SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) && SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillId) >= 0)
+                if (SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) &&
+                    SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillId) >= 0)
                 {
                     continue;
                 }
@@ -189,6 +201,7 @@ namespace GFGGame
             }
             PromptController.Instance.ShowFloatTextPrompt("学习结束");
         }
+
         private async void OnClickBtnAll()
         {
             bool result = await StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_SKIP_GUIDE, 2);
@@ -218,14 +231,13 @@ namespace GFGGame
             switch (infos[0])
             {
                 case "log":
-                    if (infos[1] == "1")//开启日志按钮
+                    if (infos[1] == "1") //开启日志按钮
                     {
                         LogController.Instance.SetBtnLogVisable(true);
                     }
-                    else if (infos[1] == "0")//关闭日志按钮
+                    else if (infos[1] == "0") //关闭日志按钮
                     {
                         LogController.Instance.SetBtnLogVisable(false);
-
                     }
                     else
                     {
@@ -254,9 +266,27 @@ namespace GFGGame
                 default:
                     GMController.SendGMCommand(content, "设置成功").Coroutine();
                     break;
-
             }
         }
 
+        //设置计数值
+        private void OnClickBtnSetCount(EventContext context)
+        {
+            var roleNumType = _ui.m_RoleNumType.text;
+            if (string.IsNullOrEmpty(roleNumType)) return;
+            var num = _ui.m_Num.text;
+            if (string.IsNullOrEmpty(num)) return;
+            GMController.SendGMCommand($"setNum {roleNumType} {num}", "").Coroutine();
+        }
+
+        //添加计数值
+        private void OnClickBtnAddCount(EventContext context)
+        {
+            var roleNumType = _ui.m_AddRoleNumType.text;
+            if (string.IsNullOrEmpty(roleNumType)) return;
+            var num = _ui.m_AddNum.text;
+            if (string.IsNullOrEmpty(num)) return;
+            GMController.SendGMCommand($"addNum {roleNumType} {num}", "").Coroutine();
+        }
     }
 }

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;
@@ -39,6 +40,7 @@ namespace GFGGame
             _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
         }
+        
 
         protected override void OnShown()
         {
@@ -46,15 +48,19 @@ namespace GFGGame
             //获取通行证奖励配置
             var seasonId = BattlePassTaskDataManager.Instance.GetSeasonId();
             _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
-            _ui.m_RewardList.numItems = _rewardCfgs.Count;
-            _ui.m_RewardList.ScrollToView(0);
+            //去掉第一个为0的配置
+            _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
         }
+        
 
         //开启通行证
         private void OnBtnOpenClick(EventContext context)
         {
-            //TODO
-            Log.Debug("开启通行证");
+        }
+
+        private void OnBtnBuyLevel(EventContext context)
+        {
+            
         }
 
         //领取奖励
@@ -90,7 +96,8 @@ namespace GFGGame
         private void ListBoxRewardItemRender(int index, GObject obj)
         {
             var item = UI_BattlePassRewardItem.Proxy(obj);
-            var battlePassCfg = _rewardCfgs[index];
+            //这里跳过为0的第一个配置
+            var battlePassCfg = _rewardCfgs[index + 1];
             //设置等级
             item.m_Level.text = battlePassCfg.level.ToString();
             //设置奖励
@@ -171,5 +178,12 @@ namespace GFGGame
 
             item.m_GetRewardBt.data = id;
         }
+        
+        //刷新特别大奖展示
+        private void FreshSpecialReward()
+        {
+            
+        }
+        
     }
 }

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

@@ -9,8 +9,6 @@ namespace GFGGame
     {
         private UI_CombTaskUI _ui;
         private List<TaskCfg> _cfgs;
-        private List<DailyActiveRewardCfg> _rewardCfgs;
-
         private int taskType = TaskType.Daily;
 
         public override void Dispose()
@@ -20,7 +18,6 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-
             base.Dispose();
         }
 
@@ -34,16 +31,31 @@ namespace GFGGame
             clickBlankToClose = false;
             _ui.m_c1.onChanged.Add(OnCtrlChange);
             _ui.m_TaskList.itemRenderer = TaskItemRender;
+            _ui.m_LivenessProcess.m_Reward20.target.onClick.Add(() => { OnClickReward(1).Coroutine(); });
+            _ui.m_LivenessProcess.m_Reward40.target.onClick.Add(() => { OnClickReward(2).Coroutine(); });
+            _ui.m_LivenessProcess.m_Reward60.target.onClick.Add(() => { OnClickReward(3).Coroutine(); });
+            _ui.m_LivenessProcess.m_Reward80.target.onClick.Add(() => { OnClickReward(4).Coroutine(); });
+            _ui.m_LivenessProcess.m_Reward100.target.onClick.Add(() => { OnClickReward(5).Coroutine(); });
+            _ui.m_GetAll.onClick.Add(OnBtnGetAllClick);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
             UpdateLivenessProcess();
             UpdateTask();
         }
 
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.LIVENESS_CHANGE, UpdateLivenessProcess);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.LIVENESS_CHANGE, UpdateLivenessProcess);
+        }
+
         //切换任务类型
         private void OnCtrlChange()
         {
@@ -73,7 +85,7 @@ namespace GFGGame
             {
                 var boxId = i + 1;
                 var state = DailyTaskDataManager.Instance.GetBoxStateById(boxId);
-                var index = state == ConstBonusStatus.CAN_GET ? 0 : 1;
+                var index = state == ConstBonusStatus.CAN_GET ? 1 : 0;
                 switch (boxId)
                 {
                     case 1:
@@ -115,20 +127,16 @@ namespace GFGGame
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
             }
-
             item.m_GetRewardBt.data = _cfgs[index].id;
             if (item.m_ComeBt.data == null)
             {
                 item.m_ComeBt.onClick.Add(OnBtnGoClick);
             }
-
             item.m_ComeBt.data = _cfgs[index].jumpId;
-
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
             }
-
             item.m_listTaskReward.data = _cfgs[index].rewardsArr;
             item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
             UI_TaskListItem.ProxyEnd();
@@ -146,10 +154,9 @@ namespace GFGGame
 
         private async void OnBtnGetClick(EventContext context)
         {
-            var btnGet = context.sender as GObject;
-            //TODO 通用任务领奖
-            // var result = await DailyTaskSProxy.ReqDailyTaskBonus((int)btnGet.data);
-            // if (!result) return;
+            if (!(context.sender is GObject btnGet)) return;
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
             UpdateLivenessProcess();
             UpdateTask();
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
@@ -159,34 +166,10 @@ namespace GFGGame
         {
             Hide();
             var btnGo = context.sender as GObject;
+            if (btnGo == null) return;
             ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
         }
 
-        private async void OnBoxRewardItemClick(EventContext context)
-        {
-            var item = context.data as GObject;
-            var cfg = item.data as DailyActiveRewardCfg;
-
-            if (DailyTaskDataManager.Instance.GetBoxStateById(cfg.id) == ConstBonusStatus.CAN_GET)
-            {
-                var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                if (result)
-                {
-                    UpdateTask();
-                }
-            }
-            else
-            {
-                var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-            }
-        }
-
-        private void OnBtnBackClick()
-        {
-            ViewManager.GoBackFrom(typeof(CombTaskView).FullName);
-        }
-
         private async void OnBtnGetAllClick()
         {
             //通用任务一键领奖
@@ -196,5 +179,30 @@ namespace GFGGame
             UpdateTask();
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
         }
+
+
+        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) UpdateTask();
+                    break;
+                }
+                case ConstBonusStatus.GOT:
+                    //领取完毕
+                    break;
+            }
+        }
     }
 }

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

@@ -0,0 +1,42 @@
+using UI.Task;
+
+namespace GFGGame
+{
+    public class OpenBattlePassView : BaseWindow
+    {
+        private UI_OpenBattlePassUI _ui;
+
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_OpenBattlePassUI.PACKAGE_NAME;
+            _ui = UI_OpenBattlePassUI.Create();
+            viewCom = _ui.target;
+            // isfullScreen = true;
+            clickBlankToClose = false;
+        }
+
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            SetPrizeData();
+        }
+
+        private void SetPrizeData()
+        {
+            
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c272b5015b15475dacc349cfd8063b69
+timeCreated: 1684746279

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

@@ -32,12 +32,11 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             bringToFontOnClick = false;
-
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _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()