Merge branch 'yujie' of http://10.108.64.190:3000/gfg/Client into yujie

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5,,6,,7,,8,,9,,10,,11,,12,,13,,14," selected="0"/>
-  <controller name="c2" pages="0,,1," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <controller name="c3" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="282,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
     </image>
-    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="219,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
+    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="213,39" group="n92_jcej" fontSize="28" color="#a07943" vars="true" text="飞花令战力：{value=000}"/>
     <component id="n108_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="10,13" size="29,29" group="n92_jcej">
-      <Button checked="true" icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <group id="n92_jcej" name="n92" xy="0,0" size="282,56"/>
     <image id="n83_jcej" name="n83" src="jcej3s" fileName="imagesExport/dz_hz_fsk_1.png" pkg="eg2y0ldp" xy="1,70" size="248,57" group="n86_jcej"/>
@@ -22,7 +22,7 @@
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
     <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="15,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="18,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <text id="n89_jcej" name="txtTagScore" xy="177,187" pivot="0.5,0" size="16,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
     <image id="n96_jcej" name="n96" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="16,229" group="n101_jcej"/>
     <image id="n97_jcej" name="n97" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="32,229" group="n101_jcej"/>
     <image id="n98_jcej" name="n98" src="jcej2m" fileName="imagesExport/jjsy_xx_2.png" pkg="eg2y0ldp" xy="48,229" group="n101_jcej"/>

FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -11,7 +11,7 @@
     <remark page="1" value="胜利"/>
   </controller>
   <displayList>
-    <text id="n4_psph" name="txtTime" xy="50,0" pivot="0.5,0" size="193,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
+    <text id="n4_psph" name="txtTime" xy="51,0" pivot="0.5,0" size="190,36" group="n11_psph" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
     <image id="n13_jcej" name="n13" src="jcej1u" fileName="images/bpjly_xixian.png" xy="18,13" size="862,14" group="n11_psph"/>
     <loader id="n1_psph" name="loaResult" xy="5,47" size="888,151" group="n11_psph" url="ui://4lc5fhlbjcej2y" autoSize="true">
       <gearIcon controller="ctrResult" pages="1" values="ui://4lc5fhlbjcej2x" default="ui://4lc5fhlbjcej2y"/>
@@ -21,9 +21,9 @@
     </loader>
     <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
-    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="133,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
+    <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="116,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>
-    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="219,39" group="n11_psph" fontSize="28" color="#c09c6d" text="竞技场战力：999"/>
+    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="213,39" group="n11_psph" fontSize="28" color="#c09c6d" text="飞花令战力：999"/>
     <component id="n15_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="509,90" size="58,59" group="n11_psph"/>
     <component id="n9_psph" name="btnShow" src="psph14" fileName="components/BtnShow.xml" xy="832,97" size="37,46" group="n11_psph">
       <Button controller="c1" page="1"/>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -2,19 +2,19 @@
 <component size="888,151">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="19,41" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
     <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
     <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="188,9" group="n35_v461"/>
     <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
-    <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
+    <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="331,20" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="331,20" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="330,71" group="n29_jcej"/>
-    <text id="n15_psph" name="txtFightScore" xy="331,78" size="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
+    <text id="n15_psph" name="txtFightScore" xy="331,78" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="飞花令战力：--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="729,24" size="122,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="764,58" pivot="0.5,0" size="52,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="760,58" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="19,-18" size="832,230"/>
   </displayList>

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,970">
+  <displayList>
+    <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
+    <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
+    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
+    <image id="n1_v5no" name="n1" src="v5notm1" fileName="images/lm_dt_zsx1.png" xy="243,72" group="n11_v5no"/>
+    <image id="n2_v5no" name="n2" src="v5notm2" fileName="images/lm_dt_zsx2.png" xy="587,71" group="n11_v5no"/>
+    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
+    <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
+    <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>
+    <text id="n5_v5no" name="txtTotalNum" xy="725,86" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有：1940"/>
+    <loader id="n7_v5no" name="loaIcon" xy="171,252" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
+    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,456"/>
+    <image id="n18_v5no" name="n18" src="v5notm4" fileName="images/lm_zsx0.png" xy="117,423" group="n21_v5no"/>
+    <text id="n19_v5no" name="n19" xy="378,422" size="206,44" group="n21_v5no" fontSize="32" color="#b69566" align="center" leading="1" autoSize="none" text="自选道具"/>
+    <list id="n20_v5no" name="list" xy="43,494" size="875,241" group="n21_v5no" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://2bsz6nelv5notmb" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n21_v5no" name="n21" xy="43,422" size="875,313"/>
+    <image id="n22_v5no" name="n22" src="v5notm3" fileName="images/lm_zhuangshixian_duan.png" xy="73,766" group="n27_v5no"/>
+    <text id="n24_v5no" name="txtSelRewardStr" xy="357,783" size="247,44" group="n27_v5no" fontSize="28" color="#915e15" align="center" leading="1" autoSize="none" text="已选奖励：0/8"/>
+    <component id="n30_cu9w" name="btnSub" src="cu9wtme" fileName="components/BtnSub.xml" xy="348,845" group="n27_v5no"/>
+    <group id="n27_v5no" name="n27" xy="73,766" size="816,161"/>
+  </displayList>
+  <transition name="t0"/>
+</component>

FGUIProject/assets/Bag/components/BtnAdd.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="51,50" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_cu9w" name="n0" src="v5notlw" fileName="images/an_jia.png" xy="0,0" size="51,50">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_cu9w" name="title" xy="0,0" size="51,50" fontSize="30" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/BtnCancel.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="88,82" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_cu9w" src="v5notly" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_cu9w" name="title" xy="0,0" size="88,82" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/Bag/components/BtnReduce.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="51,50" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_cu9w" name="n0" src="v5notlx" fileName="images/an_jian.png" xy="0,0" size="51,50">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_cu9w" name="title" xy="0,0" size="51,50" fontSize="30" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/BtnShowItemTips.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="172,172" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <graph id="n0_cu9w" name="n0" xy="0,0" size="172,172" type="rect" lineSize="0" fillColor="#F0F0F0" touchable="false">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+    <graph id="n1_cu9w" name="n1" xy="0,0" size="172,172" type="rect" lineSize="0" fillColor="#FAFAFA" touchable="false">
+      <gearDisplay controller="button" pages="2"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+    <graph id="n2_cu9w" name="n2" xy="0,0" size="172,172" type="rect" lineSize="0" fillColor="#CCCCCC" touchable="false">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width,height"/>
+    </graph>
+    <text id="n3_cu9w" name="title" xy="0,0" size="172,172" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/Bag/components/BtnSub.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="265,82" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_cu9w" name="n0" src="v5notlz" fileName="images/lm_an__xuanzhong_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="SourceHanSerifCN-Regular" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Bag/components/ComItemNumBag.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,45" overflow="hidden">
+  <displayList>
+    <image id="n1_v5no" name="n1" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="-21,0" size="208,45"/>
+    <text id="n2_v5no" name="txtNum" xy="29,3" size="107,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
+  </displayList>
+</component>

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="172,241" overflow="hidden">
+  <displayList>
+    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1"/>
+    <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
+    <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" autoSize="none" text="0"/>
+    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" fill="scale"/>
+    <component id="n12_v5no" name="comItemNumBag" src="v5notmd" fileName="components/ComItemNumBag.xml" xy="8,120" size="155,45"/>
+    <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
+    <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
+  </displayList>
+</component>

FGUIProject/assets/Bag/package.xml

@@ -5,7 +5,30 @@
     <image id="si5zti3" name="wpbb_zi.png" path="/images/"/>
     <image id="si5zti4" name="wpbb_di.png" path="/images/"/>
     <image id="si5zti6" name="wpbb_xtxt.png" path="/images/"/>
-    <component id="si5zti7" name="ListItem.xml" path="/components/"/>
+    <component id="si5zti7" name="ListItem.xml" path="/components/" exported="true"/>
+    <component id="u85qtlv" name="GiftBoxSelectorUI.xml" path="/" exported="true"/>
+    <image id="v5notlw" name="an_jia.png" path="/images/"/>
+    <image id="v5notlx" name="an_jian.png" path="/images/"/>
+    <image id="v5notly" name="back.png" path="/images/"/>
+    <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
+    <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
+    <image id="v5notm1" name="lm_dt_zsx1.png" path="/images/"/>
+    <image id="v5notm2" name="lm_dt_zsx2.png" path="/images/"/>
+    <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
+    <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
+    <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>
+    <image id="v5notm6" name="tc_wp_zz.png" path="/images/"/>
+    <image id="v5notm7" name="wpk_db_1_da.png" path="/images/"/>
+    <image id="v5notm8" name="wpk_sz_db_1.png" path="/images/"/>
+    <image id="v5notm9" name="wplb_db.png" path="/images/"/>
+    <component id="v5notmb" name="ListSelectorItem.xml" path="/components/" exported="true"/>
+    <image id="v5notmc" name="db_jiajian_1.png" path="/images/"/>
+    <component id="v5notmd" name="ComItemNumBag.xml" path="/components/" exported="true"/>
+    <component id="cu9wtme" name="BtnSub.xml" path="/components/" exported="true"/>
+    <component id="cu9wtmf" name="BtnReduce.xml" path="/components/" exported="true"/>
+    <component id="cu9wtmg" name="BtnAdd.xml" path="/components/" exported="true"/>
+    <component id="cu9wtmj" name="BtnCancel.xml" path="/components/" exported="true"/>
+    <component id="cu9wtmk" name="BtnShowItemTips.xml" path="/components/"/>
   </resources>
-  <publish name="" path="../GameClient/Assets/ResIn/UI/Bag" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -32,8 +32,9 @@
     <text id="n22_si5z" name="txtCostCount" xy="343,624" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
     <group id="n19_si5z" name="n19" xy="175,616" size="612,70" group="n34_l500"/>
     <text id="n24_si5z" name="txtTips" xy="319,706" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
-    <group id="n26_si5z" name="n26" xy="318,706" size="326,137" group="n34_l500" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="450,787" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="319,706" size="323,135" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
     <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,863" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>

FGUIProject/assets/CommonGame/components/BtnStyle000.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="204,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesExport/lm_an__xuanzhong_qifu.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="o9gh4l" fileName="imagesNew/lm_an__weixuan_qifu.png" xy="0,0" size="204,63">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="204,63" fontSize="34" color="#685539" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <gearColor controller="c1" pages="1" values="#685539,#000000" default="#744d16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_r9gf" name="n0" src="qkjstle" fileName="imagesNew/Resources_Underprint.png" xy="1,13" size="238,42" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qkjstld" fileName="imagesNew/fzd_jia.png" xy="175,9" group="n4_qqat"/>
+    <image id="n3_r9gf" name="imgAdd" src="qkjstld" fileName="imagesNew/fzd_jia.png" xy="175,9" group="n4_qqat"/>
     <text id="n1_r9gf" name="title" xy="83,14" pivot="0.5,0" size="72,39" group="n4_qqat" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#ffffff" vAlign="middle" singleLine="true" autoClearText="true" text="66666"/>
     <loader id="n2_r9gf" name="icon" xy="17,14" pivot="0.5,0.5" size="40,40" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" fill="scale"/>
     <group id="n4_qqat" name="n4" xy="1,9" size="238,50"/>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="129,46">
+<component size="114,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
+  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
+    <remark page="0" value="默认"/>
+  </controller>
   <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="60,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="129,50" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+      <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
+    </text>
+    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="28,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComItemNew1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="qik1tlz" fileName="components/ComItemIconNew1.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="90,206" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,145" size="131,33" group="n28_qik1"/>
+    <text id="n15_ehs9" name="txtCount" xy="89,138" pivot="0.5,0" anchor="true" size="97,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="24,138" size="131,44"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,70" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13," selected="11">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="12">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -13,6 +13,7 @@
     <remark page="9" value="金币马蹄珍珠"/>
     <remark page="10" value="竞技场"/>
     <remark page="11" value="雅集"/>
+    <remark page="12" value="商店列表"/>
   </controller>
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
@@ -65,10 +66,16 @@
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
-    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,1">
+    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="13"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12,13" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0|814,1" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
+    <list id="n51_l500" name="list" xy="232,0" size="821,70" layout="row" colGap="30" defaultItem="ui://eg2y0ldpr9gf5z" align="right">
+      <gearDisplay controller="c1" pages="14"/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -291,7 +291,7 @@
     <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"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
     <image id="a0cf2o" name="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"/>
@@ -301,6 +301,11 @@
     <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/"/>
+    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/"/>
+    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
+    <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
+    <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1865">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="376,324" pivot="0,0.5" anchor="true">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
+    <text id="n2_qik1" name="txtMonth" xy="47,254" pivot="1,1" size="148,94" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
+      <gearFontSize controller="c1" pages="0" values="72" default="50"/>
+    </text>
+    <text id="n4_qik1" name="txtSignCount" xy="346,325" pivot="0.5,0" size="43,54" fontSize="40" color="#643323" text="30"/>
+    <list id="n5_qik1" name="list" xy="60,455" size="967,1276" layout="flow_hz" lineGap="2" colGap="2" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,837" opaque="false">
+  <displayList>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
+    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n27_fqor" 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"/>
@@ -11,63 +10,12 @@
     <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <image id="n2_fqor" name="n2" src="fqor2" fileName="imagesTest/wpbb_xtxt.png" xy="54,312" group="n3_fqor"/>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,229"/>
-    <component id="n4_fqor" name="n4" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="43,347" group="n7_fqor">
-      <Button checked="true" title="每日签到" controller="c1" page="0"/>
+    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
+    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+      <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="n5" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="333,347" group="n7_fqor">
-      <Button title="每日补给" controller="c1" page="1"/>
+    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+      <Button title="每日补给"/>
     </component>
-    <component id="n6_fqor" name="n6" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="623,347" group="n7_fqor">
-      <Button title="分享好礼" controller="c1" page="2"/>
-    </component>
-    <group id="n7_fqor" name="n7" xy="43,347" size="870,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n8_fqor" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="115,569" pivot="0,0.5" anchor="true" group="n21_fqor">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <text id="n9_fqor" name="txtSignCount" xy="53,448" pivot="0.5,0" size="20,41" group="n21_fqor" fontSize="30" text="1"/>
-    <list id="n20_fqor" name="list" xy="53,660" size="974,1232" group="n21_fqor" layout="flow_hz" lineGap="30" colGap="60" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n21_fqor" name="n21" xy="53,448" size="974,1444" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <component id="n22_fqor" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="242,827" group="n26_fqor"/>
-    <component id="n25_fqor" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="554,828" group="n26_fqor"/>
-    <group id="n26_fqor" name="n26" xy="242,827" size="534,354" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,328" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,-112" size="1080,1697">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="479,207" size="122,0" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="81,200" pivot="0.5,0.5" anchor="true">
+<component size="80,140" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <text id="n12_fqor" name="txtDay" xy="41,0" pivot="0.5,0" anchor="true" size="40,42" group="n13_fqor" fontSize="30" align="center" text=""/>
-    <loader id="n14_fqor" name="loaIcon" xy="0,114" pivot="0.5,0.5" size="80,80" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
-    <text id="n15_fqor" name="txtCount" xy="26,157" pivot="1,0" size="53,42" group="n13_fqor" fontSize="30" align="right" autoClearText="true" text="000"/>
-    <group id="n13_fqor" name="n13" xy="0,0" size="80,199"/>
+    <image id="n18_qik1" name="n18" src="qik1g" fileName="images/qrhd_jd_fgx1.png" xy="33,76" group="n13_fqor"/>
+    <image id="n16_qik1" name="n16" src="qik1f" fileName="images/mrrw_jl_db.png" xy="0,0" group="n13_fqor"/>
+    <loader id="n14_fqor" name="loaIcon" xy="11,12" pivot="0.5,0.5" size="58,58" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
+    <image id="n17_qik1" name="n17" src="qik1d" fileName="images/mrqd_sz_db.png" xy="34,57" group="n13_fqor"/>
+    <text id="n15_fqor" name="txtCount" xy="35,46" pivot="0.5,0" size="45,39" group="n13_fqor" fontSize="28" color="#ffffff" align="center" autoClearText="true" text="000"/>
+    <text id="n12_fqor" name="txtDay" xy="39,103" pivot="0.5,0" anchor="true" size="35,44" group="n13_fqor" fontSize="32" color="#643323" align="center" text="30"/>
+    <image id="n19_qik1" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="-19,20" pivot="0.5,0" group="n13_fqor" scale="0.7,0.7"/>
+    <group id="n13_fqor" name="n13" xy="-19,0" size="119,147"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,422">
+<component size="378,643" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <text id="n25_fqor" name="txtTime" xy="91,5" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
-    <component id="n22_fqor" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,65" size="222,225"/>
-    <component id="n23_fqor" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="17,295">
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
       <Button title="补领"/>
     </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="46,372" pivot="0.5,0" controller="c1,1"/>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="178,122">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+<component size="155,200">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="35,0" size="117,28" group="n20_fqor" autoSize="true">
-      <gearIcon controller="c1" pages="0,2" values="|ui://t8nwuj7ifqorb" default="ui://t8nwuj7ifqorc"/>
+    <image id="n23_qik1" name="n23" src="qik1j" fileName="images/yqd_mr_db.png" xy="-2,0" group="n20_fqor"/>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" url="ui://t8nwuj7iqik1h" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
-    <loader id="n14_fqor" name="loaIcon" xy="24,29" pivot="0.5,0.5" size="92,92" group="n20_fqor" aspect="true" fill="scale"/>
-    <text id="n17_fqor" name="txtCount" xy="121,77" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <text id="n16_fqor" name="txtDay" xy="121,30" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <image id="n18_fqor" name="imgGot" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,60" size="144,32" group="n20_fqor"/>
-    <image id="n19_fqor" name="imgNotGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,56" size="178,40" group="n20_fqor"/>
-    <group id="n20_fqor" name="n20" xy="0,0" size="178,121"/>
+    <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
+    <text id="n16_fqor" name="txtDay" xy="33,-3" pivot="0.5,0" size="88,39" group="n20_fqor" fontSize="28" color="#8a4e4e" text="三十一"/>
+    <image id="n22_qik1" name="imgMask" src="qik1e" fileName="images/mrqd_zz.png" xy="-2,0" size="159,205" group="n20_fqor"/>
+    <image id="n18_fqor" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="17,64" group="n20_fqor"/>
+    <image id="n19_fqor" name="imgNotGet" src="qik1o" fileName="images/mrqd_kbq.png" xy="-8,45" group="n20_fqor"/>
+    <group id="n20_fqor" name="grpItem" xy="-8,-3" size="205,208" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="850,139" extention="ProgressBar">
+<component size="620,140" extention="ProgressBar">
   <displayList>
-    <image id="n0_fqor" name="n0" src="fqor6" fileName="images/pro_bk_in.png" xy="-36,0">
+    <image id="n0_fqor" name="n0" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_fqor" name="bar" src="fqor5" fileName="images/pro_activate.png" xy="0,4" fillMethod="hz"/>
-    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="0,25" group="n7_fqor"/>
-    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="121,25" group="n7_fqor"/>
-    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="242,25" group="n7_fqor"/>
-    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="363,25" group="n7_fqor"/>
-    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="484,25" group="n7_fqor"/>
-    <group id="n7_fqor" name="n7" xy="-40,-75" size="565,200" advanced="true"/>
+    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,100" fillMethod="hz"/>
+    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
+    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
+    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
+    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
+    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -2,16 +2,35 @@
 <packageDescription id="t8nwuj7i">
   <resources>
     <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
-    <image id="fqor1" name="wpbb_zi.png" path="/imagesTest/"/>
-    <image id="fqor2" name="wpbb_xtxt.png" path="/imagesTest/"/>
-    <image id="fqor5" name="pro_activate.png" path="/imagesTest/"/>
-    <image id="fqor6" name="pro_bk_in.png" path="/imagesTest/"/>
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
     <component id="fqora" name="ComSupply.xml" path="/components/"/>
-    <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
-    <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
+    <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
+    <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
+    <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
+    <image id="qik1g" name="qrhd_jd_fgx1.png" path="/images/"/>
+    <image id="qik1h" name="wz_hjksb.png" path="/images/"/>
+    <image id="qik1i" name="wz_yqd.png" path="/images/"/>
+    <image id="qik1j" name="yqd_mr_db.png" path="/images/"/>
+    <image id="qik1k" name="yz_yhd.png" path="/images/"/>
+    <image id="qik1l" name="mrqd_db.png" path="/images/" scale="9grid" scale9grid="270,453,540,1372"/>
+    <image id="qik1m" name="mrqd_jdt_db.png" path="/images/"/>
+    <image id="qik1n" name="mrqd_jdt_yellow.png" path="/images/"/>
+    <image id="qik1o" name="mrqd_kbq.png" path="/images/"/>
+    <component id="qik1q" name="DailySignUI.xml" path="/" exported="true"/>
+    <image id="qik1r" name="txz_lvl_db.png" path="/images/"/>
+    <image id="qik1s" name="wz_jksb.png" path="/images/"/>
+    <component id="qik1t" name="DailySupplyUI.xml" path="/" exported="true"/>
+    <component id="qik1u" name="Button1.xml" path="/components/"/>
+    <image id="qik1v" name="wz_mrbj_ms.png" path="/images/"/>
+    <image id="qik1w" name="mrbj_shu.png" path="/images/"/>
+    <image id="qik1x" name="mrbj_sj_db.png" path="/images/"/>
+    <image id="qik1y" name="mrbj_sz_db.png" path="/images/"/>
+    <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
+    <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
+    <image id="qik111" name="wz_mrbj.png" path="/images/"/>
+    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxGold.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,970"/>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxPower.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1118">
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhze" fileName="images/diban.png" xy="23,261" group="n7_qqhz"/>
+    <image id="n1_qqhz" name="n1" src="qqhza" fileName="images/kaikou.png" xy="37,62" group="n7_qqhz"/>
+    <image id="n3_qqhz" name="n3" src="qqhz4" fileName="images/tape.png" xy="-1,577" group="n7_qqhz"/>
+    <image id="n6_qqhz" name="n6" src="qqhzb" fileName="images/heart.png" xy="208,57" group="n7_qqhz" rotation="-0.5"/>
+    <image id="n5_qqhz" name="n5" src="qqhz5" fileName="images/small_paper.png" xy="261,405" group="n7_qqhz"/>
+    <image id="n2_qqhz" name="n2" src="qqhz6" fileName="images/paper.png" xy="30,366" group="n7_qqhz"/>
+    <image id="n8_qqhz" name="n8" src="qqhzp" fileName="images/cz_tl_juese.png" xy="23,-27" group="n7_qqhz"/>
+    <text id="n9_qqhz" name="n9" xy="481,164" size="444,154" group="n7_qqhz" fontSize="32" color="#915e15" align="center" autoSize="none" text="是否花费20粉钻购买60体力？&#xA;体力每5分钟恢复1点&#xA;（今日剩余购买次数：8/8）"/>
+    <component id="n12_qqhz" name="btnCancel" src="qqhzs" fileName="components/BtnCancel.xml" xy="362,327" group="n7_qqhz"/>
+    <component id="n14_qqhz" name="btnSub" src="qqhzu" fileName="components/BtnSub.xml" xy="648,327" group="n7_qqhz"/>
+    <text id="n15_qqhz" name="n15" xy="151,434" size="753,48" group="n7_qqhz" fontSize="28" color="#a67975" autoSize="none" text="除了上述购买体力的途径，我们还提供了更多的优惠礼包选择"/>
+    <image id="n16_qqhz" name="n16" src="qqhzg" fileName="images/cz_lb_db.png" xy="69,475" group="n7_qqhz"/>
+    <group id="n7_qqhz" name="n7" xy="-1,-27" size="1080,1105"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnCancel.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,75" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhzn" fileName="images/cz_an_blue.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="取消"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,75" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>
+  </displayList>
+  <Button/>
+</component>