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

FGUIProject/assets/CommonGame/components/BtnTab.xml

@@ -2,7 +2,7 @@
 <component size="290,70" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0">
+    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0" size="290,70">
       <gearDisplay controller="button" pages="1,6"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/League/components/Button11.xml → FGUIProject/assets/CommonGame/components/Button11.xml

@@ -2,10 +2,10 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="images/lm_an_yellow.png" xy="0,0">
+    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="imagesNew/lm_an_yellow.png" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -285,9 +285,22 @@
     <image id="wm603g" name="lm_an__3weixuan.png" path="/imagesNew/" exported="true"/>
     <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
+    <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
+    <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
+    <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"/>
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
+  <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/LeagueAnsweringUI.xml

@@ -30,13 +30,13 @@
     <image id="n45_9jv6" name="n45" src="9jv66q" fileName="images/lm_dt_cy_db.png" xy="25,724">
       <relation target="" sidePair="height-height"/>
     </image>
-    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128" pkg="eg2y0ldp"/>
     <component id="n5_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <text id="n7_pvb4" name="txtTime" xy="706,713" size="275,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ceb188" text="活动剩余时间 00:00"/>
     <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="663,718" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
@@ -122,7 +122,7 @@
     <image id="n47_9jv6" name="n47" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665" group="n56_miy3"/>
     <image id="n48_9jv6" name="n48" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779" group="n56_miy3"/>
     <text id="n35_pvb4" name="txtChat" xy="110,1784" size="653,44" group="n56_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
-    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3">
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3" pkg="eg2y0ldp">
       <Button title="发送"/>
     </component>
     <group id="n56_miy3" name="n56" xy="0,1665" size="1080,255" advanced="true">

FGUIProject/assets/League/LeagueApplyUI.xml

@@ -7,7 +7,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="642,86" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <list id="n4_rv09" name="list" xy="140,165" size="820,531" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
       <item/>

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/LeagueConstructUI.xml

@@ -5,7 +5,7 @@
     <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
     <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
     <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
-    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09"/>
+    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09" pkg="eg2y0ldp"/>
     <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
     <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,48" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
@@ -23,7 +23,7 @@
     <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
     <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
     <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
-    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh"/>
+    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh" pkg="eg2y0ldp"/>
     <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
     <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,48" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
@@ -46,11 +46,11 @@
     <group id="n56_o9gh" name="n56" xy="424,487" size="259,140" group="n17_rv09" advanced="true" layout="vt" excludeInvisibles="true"/>
     <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="454,792" group="n17_rv09"/>
     <component id="n68_o9gh" name="btnTips" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="631,235" size="36,37" group="n17_rv09">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
-    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh"/>
+    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh" pkg="eg2y0ldp"/>
     <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
     <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,48" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
@@ -65,7 +65,7 @@
     <group id="n28_rv09" name="n28" xy="706,187" size="295,736" group="n67_o9gh"/>
     <group id="n67_o9gh" name="n67" xy="118,187" size="883,736" advanced="true"/>
     <component id="n69_o9gh" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="344,968" size="36,37" group="n72_o9gh">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n70_o9gh" name="n70" xy="389,966" size="202,35" group="n72_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#8d817a" text="雅集每日维护资金"/>
     <component id="n71_o9gh" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="607,960" group="n72_o9gh" controller="c1,1"/>

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>
@@ -23,9 +23,9 @@
     </component>
     <group id="n6_pvb4" name="n6" xy="613,88" size="304,63"/>
     <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="920,101" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
-    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697">
+    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="一键领取"/>

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/LeagueUI.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37" visible="false">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
       <Button title="雅集成员"/>

FGUIProject/assets/League/components/Button20.xml

@@ -2,10 +2,10 @@
 <component size="189,58" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="3"/>
   <displayList>
-    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
+    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0" pkg="eg2y0ldp">
       <gearDisplay controller="button" pages="4"/>
     </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://tw70qm9do9gh4k" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://eg2y0ldpo9gh4k" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="64,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#683c28" align="center" vars="true" text="升级">

FGUIProject/assets/League/components/Button3.xml

@@ -7,7 +7,7 @@
       <gearSize controller="c1" pages="1" values="146,47,1,1" default="280,47,1,1"/>
     </image>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="168,61" aspect="true" url="ui://tw70qm9da0cf2v" fill="scale" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://tw70qm9da0cf2o|ui://tw70qm9da0cf2v"/>
+      <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpa0cf2o|ui://tw70qm9da0cf2v"/>
     </loader>
     <text id="n7_a0cf" name="txtCount" xy="173,10" pivot="0.5,0" size="78,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=30}/{maxValue=30}">
       <gearXY controller="c1" pages="0,1" values="264,10|173,10"/>

FGUIProject/assets/League/components/Button4.xml

@@ -2,7 +2,7 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://eg2y0ldpa0cf2o" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="67,11" pivot="0.5,0" size="116,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="搜索雅集">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

FGUIProject/assets/League/components/ComPary.xml

@@ -6,7 +6,7 @@
   </controller>
   <displayList>
     <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
-    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66"/>
+    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66" pkg="eg2y0ldp"/>
     <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
     <loader id="n2_rv09" name="LoaIcon" xy="74,109" pivot="0.5,0" size="128,128" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
     <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,48" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>

FGUIProject/assets/League/components/ListApplyItem.xml

@@ -7,7 +7,7 @@
       <Button title="同意"/>
     </component>
     <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39" pkg="eg2y0ldp">
-      <Button title="拒绝" icon="ui://tw70qm9do9gh4o"/>
+      <Button title="拒绝" icon="ui://eg2y0ldpo9gh4o"/>
     </component>
     <image id="n5_o9gh" name="n5" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="0,108" size="816,12"/>
   </displayList>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,8 +4,8 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="126,588" group="n22_9jv6">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
+     <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
+      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/> 
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
     <list id="n13_pvb4" name="listGift" xy="-113,485" pivot="0.5,0" size="601,132" group="n22_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">

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

@@ -32,7 +32,6 @@
     <component id="rv091l" name="Button10.xml" path="/components/"/>
     <component id="rv091m" name="ComLeader.xml" path="/components/"/>
     <component id="rv091n" name="ListMemberItem.xml" path="/components/"/>
-    <component id="rv091o" name="Button11.xml" path="/components/"/>
     <component id="rv091r" name="Button14.xml" path="/components/"/>
     <component id="rv091s" name="Button15.xml" path="/components/"/>
     <component id="rv091z" name="ListApplyItem.xml" path="/components/"/>
@@ -46,10 +45,8 @@
     <image id="a0cf2e" name="lm_db.png" path="/images/"/>
     <image id="a0cf2f" name="lm_db2.png" path="/images/"/>
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
-    <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
     <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
     <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
-    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
     <image id="a0cf2q" name="lm_db_chang.png" path="/images/" scale="9grid" scale9grid="0,486,1080,275"/>
     <image id="a0cf2r" name="lm_kuang_1.png" path="/images/"/>
@@ -79,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/"/>
@@ -96,18 +91,13 @@
     <image id="o9gh48" name="lm_zjm_gnkuang.png" path="/images/"/>
     <image id="o9gh49" name="lm_zjm_djs.png" path="/images/"/>
     <image id="o9gh4a" name="lm_zjm_chkuang.png" path="/images/"/>
-    <image id="o9gh4b" name="lm_tb_tishi.png" path="/images/"/>
     <image id="o9gh4c" name="lm_tb_db_weixuan.png" path="/images/"/>
     <image id="o9gh4d" name="lm_tb_db.png" path="/images/"/>
     <image id="o9gh4e" name="tb_gou.png" path="/images/"/>
     <image id="o9gh4f" name="lm_kuang_qifu_name.png" path="/images/"/>
-    <image id="o9gh4g" name="lm_kuang_icon.png" path="/images/"/>
     <image id="o9gh4h" name="lm_kuang_3.png" path="/images/"/>
     <image id="o9gh4i" name="lm_db_2.png" path="/images/"/>
     <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
-    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/images/"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/images/"/>
-    <image id="o9gh4o" name="lm_an_jujue.png" path="/images/"/>
     <image id="o9gh4p" name="biaotizi_9.png" path="/images/"/>
     <image id="o9gh4q" name="biaotizi_8.png" path="/images/"/>
     <image id="o9gh4r" name="biaotizi_7.png" path="/images/"/>
@@ -136,7 +126,6 @@
     <image id="9jv65j" name="biaotizi12.png" path="/images/"/>
     <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
     <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
-    <image id="9jv65m" name="lm_dt_zsx1.png" path="/images/"/>
     <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
     <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
     <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
@@ -160,10 +149,8 @@
     <image id="9jv669" name="biaotizi_11.png" path="/images/"/>
     <image id="9jv66a" name="fannao.png" path="/images/"/>
     <image id="9jv66b" name="liuhan.png" path="/images/"/>
-    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/images/"/>
     <image id="9jv66g" name="lm_biaoqian_ylq.png" path="/images/"/>
     <image id="9jv66i" name="lm_biaotizi_13.png" path="/images/"/>
-    <image id="9jv66j" name="lm_zsx0.png" path="/images/"/>
     <image id="9jv66k" name="lm_bq_dcm.png" path="/images/"/>
     <image id="9jv66l" name="lm_bq_xxcm.png" path="/images/"/>
     <image id="9jv66m" name="lm_ch_dcm.png" path="/images/"/>
@@ -212,5 +199,5 @@
     <component id="miy37v" name="ListSkillScore.xml" path="/"/>
     <component id="miy37w" name="Button124.xml" path="/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
+  <displayList>
+    <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
+      <relation target="" sidePair="left-right"/>
+    </image>
+    <text id="n19_nd17" name="LeftTime" xy="59,241" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="n18_nd17" name="LevelProcess" src="nd173t" fileName="components/ExpProcess.xml" xy="107,601">
+      <relation target="" sidePair="left-left"/>
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="1"/>
+      <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">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <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="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="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"/>
+    <list id="n48_nd17" name="RewardList" xy="2,748" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
+    <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
+    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">
+      <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/ComBattle.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="普通织造"/>
-    <remark page="1" value="特别织造"/>
-  </controller>
-  <displayList>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="普通织造" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="特别织造" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/ComTask.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="每日任务"/>
-    <remark page="1" value="织造任务"/>
-  </controller>
-  <displayList>
-    <list id="n1_lh8v" name="listReward" xy="16,333" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="今日任务" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="织造任务" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="0,542" size="940,884" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="每日任务"/>
+    <remark page="1" value="织造任务"/>
+  </controller>
+  <displayList>
+    <component id="n15_ids4" name="LivenessProcess" src="ids449" fileName="components/LivenessRewardProcess.xml" xy="70,717" size="949,53">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <list id="n0_lh8v" name="TaskList" xy="0,937" size="1080,778" overflow="scroll" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
+      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
+    <text id="n22_ids4" name="n22" xy="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="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>
+    <component id="n26_ids4" name="n26" src="ids44e" fileName="components/TabButton.xml" xy="555,805" group="n27_ids4">
+      <Button title="织造任务" controller="c1" page="1"/>
+    </component>
+    <group id="n27_ids4" name="n27" xy="294,805" size="522,72" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <component id="n18_ids4" name="GetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="405,1779" size="273,59">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="一键领取" titleColor="#915e15"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Task/DailyTaskUI.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <list id="n1_lh8v" name="listReward" xy="82,273" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="246,494" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="262,501" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="471,501" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="512,501" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="262,501" size="550,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="246,494" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="70,659" size="940,1040" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="697,1748">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
-      <relation target="" sidePair="right-right,top-top"/>
-    </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,152">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-  </displayList>
-</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/TaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="2">
+  <controller name="c1" pages="2,,0,,1," selected="1">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
@@ -8,24 +8,18 @@
     <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="2,36" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,170">
+    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,105">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="167,187" group="n17_fqor">
-      <Button title="今日任务" controller="c1" page="0"/>
+    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="246,118" group="n17_fqor">
+      <Button checked="true" title="今日任务" controller="c1" page="0"/>
     </component>
-    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="457,187" group="n17_fqor">
-      <Button checked="true" title="锦罗织造" controller="c1" page="1"/>
-    </component>
-    <group id="n17_fqor" name="n17" xy="167,187" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n1_lh8v" name="comTask" src="fqor2p" fileName="ComTask.xml" xy="66,290" size="947,1558">
-      <gearDisplay controller="c1" pages="0"/>
-    </component>
-    <component id="n18_fqor" name="comBattle" src="fqor2q" fileName="ComBattle.xml" xy="66,290">
-      <gearDisplay controller="c1" pages="1"/>
+    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,118" group="n17_fqor">
+      <Button title="锦罗织造" controller="c1" page="1"/>
     </component>
+    <group id="n17_fqor" name="n17" xy="246,118" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
   </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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,153">
+  <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="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"/>
+    <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://5mpsibzzittstn4"/>
+    </component>
+    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
+    </component>
+    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
+    </component>
+    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+      <gearDisplay controller="c1" pages="3"/>
+      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
+    </component>
+    <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">
+      <item url="ui://5mpsibzznd1743"/>
+      <item url="ui://5mpsibzznd1743"/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/Task/components/Button1.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="224,76" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n4_wet2" name="n4" src="wet22c" fileName="images/mrqd_anniu_1.png" xy="0,0"/>
-    <loader id="n5_wet2" name="icon" xy="0,0" size="224,76"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Task/components/Button2.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="224,76" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n4_wet2" name="n4" src="wet22d" fileName="images/mrqd_anniu_2.png" xy="0,0"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Task/components/Button3.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="320,100" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <image id="n0_wet2" name="n0" src="wet22f" fileName="images/mrqd_anniu_4.png" xy="-11,-12">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_slkg" name="n1" src="slkg2m" fileName="images/mrqd_anniu_5.png" xy="-11,-12">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-  </displayList>
-  <Button/>
-</component>

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

@@ -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="uxxstm4" fileName="images/wz_kqjlzz.png" xy="51,21"/>
+  </displayList>
+  <Button/>
+  <customProperty target="text" propertyId="0"/>
+</component>

FGUIProject/assets/Task/components/ComeBt.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,58" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <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" color="#465a7f" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="346,22" extention="ProgressBar">
+  <displayList>
+    <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="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}"/>
+    <image id="n6_nd17" name="n6" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="6,-36"/>
+  </displayList>
+  <ProgressBar titleType="valueAndmax"/>
+</component>

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/ListBoxRewardItem.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="150,200">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <image id="n2_lh8v" name="n2" src="wet22a" fileName="images/mrqd_2.png" xy="0,-183" aspect="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n3_lh8v" name="n3" src="wet22b" fileName="images/mrqd_3.png" xy="0,-172" aspect="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n4_lh8v" name="n4" src="wet229" fileName="images/mrqd_1.png" xy="0,-172" aspect="true">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <text id="n6_wet2" name="txtNum" xy="70,44" pivot="0.5,0" size="61,62" fontSize="46" color="#f7fcd6" text="50">
-      <gearColor controller="c1" pages="0,2" values="#f7fcd6,#000000|#7c7b6c,#000000" default="#fff0c6,#000000"/>
-    </text>
-    <text id="n7_wet2" name="txtTitle" xy="27,132" size="100,44" fontSize="32" color="#76844b" text="活跃度">
-      <gearColor controller="c1" pages="0,2" values="#76844b,#000000|#8f8d64,#000000" default="#b88a45,#000000"/>
-    </text>
-    <image id="n5_wet2" name="n5" src="wet228" fileName="images/mrqd_ylq.png" xy="45,72">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/ListItem.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="940,160">
-  <controller name="c1" pages="1,,2,,3," selected="2">
-    <remark page="0" value="未完成"/>
-    <remark page="1" value="可领取"/>
-    <remark page="2" value="已领取"/>
-  </controller>
-  <controller name="c2" alias="是否跳转" pages="0,,1," selected="0"/>
-  <displayList>
-    <text id="n1_lh8v" name="txtDesc" xy="29,2" size="305,51" fontSize="38" color="#f4e2a9" text="任务描述任务描述"/>
-    <component id="n3_lh8v" name="btnGet" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://5mpsibzzwet22c"/>
-    </component>
-    <component id="n4_lh8v" name="btnGo" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="1" condition="0"/>
-      <Button icon="ui://5mpsibzzwet22d"/>
-    </component>
-    <component id="n6_wet2" name="btnGot" src="lh8v3" fileName="components/Button1.xml" xy="680,53">
-      <gearDisplay controller="c1" pages="3"/>
-      <Button icon="ui://5mpsibzzwet22e"/>
-    </component>
-    <text id="n5_lh8v" name="txtCount" xy="760,0" pivot="0.5,0" size="58,41" fontSize="30" color="#f4e2a9" align="center" text="0/5"/>
-    <list id="n7_wet2" name="listTaskReward" xy="52,80" size="361,53" layout="row" colGap="50" defaultItem="ui://5mpsibzzwet22j" autoClearItems="true">
-      <item/>
-      <item/>
-    </list>
-    <image id="n11_wet2" name="n11" src="wet22l" fileName="images/mrqd_xian.png" xy="1,150"/>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/ListTaskRewardItem.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="141,43">
-  <displayList>
-    <loader id="n9_wet2" name="loaIcon" xy="0,0" size="42,42" url="ui://eg2y0ldply9g8m" autoSize="true"/>
-    <text id="n10_wet2" name="txtNum" xy="65,1" size="76,42" fontSize="30" color="#f3d26d" text="x200"/>
-  </displayList>
-</component>

FGUIProject/assets/Task/components/LivenessRewardProcess.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="949,53" extention="ProgressBar" designImageOffsetX="-11" designImageOffsetY="-716">
+  <displayList>
+    <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="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="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="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="9qpb4j" fileName="components/LinessRewardProcessItemBt.xml" xy="867,-108" size="124,190">
+      <property target="text" propertyId="0" value="100"/>
+    </component>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -0,0 +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="uxxstma" fileName="images/wpk_db_2.png" xy="0,0"/>
+    <loader id="n3_vixc" name="loaIcon" xy="64,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
+    <image id="n1_nd17" name="n1" src="uxxstm5" fileName="images/wpk_sz_db2.png" xy="5,85"/>
+    <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
+    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Task/components/RewardIconYellow.xml

@@ -0,0 +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="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="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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="261,72" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <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>
+    <text id="n1_ids4" name="title" xy="0,0" size="261,72" fontSize="40" color="#915e15" align="center" vAlign="middle" autoSize="none" singleLine="true" text="每日任务">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Task/components/TaskListItem.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1037,224">
+  <controller name="c1" pages="1,,2,,3," selected="0">
+    <remark page="0" value="未完成"/>
+    <remark page="1" value="可领取"/>
+    <remark page="2" value="已领取"/>
+  </controller>
+  <controller name="c2" pages="0,CanGo,1,NotGo" selected="0"/>
+  <displayList>
+    <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">
+      <item/>
+      <item/>
+    </list>
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,82" size="189,58">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
+    </component>
+    <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/ComeBt.xml" xy="804,81" size="189,58">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <Button title="前往" icon="ui://5mpsibzznd17tlv"/>
+    </component>
+    <component id="n18_ids4" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
+      <gearDisplay controller="c1" pages="3"/>
+      <Button title="领取" icon="ui://eg2y0ldpo9gh4l"/>
+    </component>
+  </displayList>
+</component>