雅集

FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -2,7 +2,7 @@
 <component size="222,254" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="ng0itiz" fileName="components/ComItemIcon.xml" xy="0,0" pivot="0.5,0.5" size="222,222" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="68,42" fontSize="30" color="#fbf6eb" align="right" vars="true" strokeColor="#8c7358" strokeSize="2" text="x{count=200}">
+    <text id="n15_ehs9" name="txtCount" xy="205,178" pivot="1,0" anchor="true" size="68,42" fontSize="30" color="#fbf6eb" align="right" vars="true" strokeColor="#8c7358" strokeSize="2" text="x200">
       <relation target="n25_pu55" sidePair="right-right,top-top"/>
     </text>
     <text id="n26_r9ri" name="txtName" xy="111,215" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">

FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -2,7 +2,7 @@
 <component size="260,260" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="243,203" pivot="1,0" anchor="true" size="69,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5b4b35" align="right" vars="true" text="x{count=200}">
+    <text id="n15_ehs9" name="txtCount" xy="243,203" pivot="1,0" anchor="true" size="69,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5b4b35" align="right" vars="true" text="x200">
       <relation target="n25_pu55" sidePair="right-right,top-top"/>
     </text>
     <text id="n26_r9ri" name="txtName" xy="131,260" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n14_9jv6" 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"/>
@@ -8,14 +8,17 @@
     <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n1_pvb4" name="btnBack" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>
+    <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">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
     <image id="n3_pvb4" name="n3" src="9jv661" fileName="images/lm_yeqian_db2.png" xy="618,91" size="293,56" group="n6_pvb4"/>
-    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="613,88" group="n6_pvb4">
-      <Button title="领取福利" titleColor="#915e15" controller="c1" page="0"/>
+    <component id="n4_pvb4" name="n4" src="9jv677" fileName="components/Button81.xml" xy="613,88" group="n6_pvb4">
+      <Button checked="true" title="领取福利" titleColor="#915e15" controller="c1" page="0"/>
     </component>
-    <component id="n5_pvb4" name="n5" src="rv091j" fileName="components/Button8.xml" xy="765,88" group="n6_pvb4">
-      <Button checked="true" title="采购福利" titleColor="#915e15" controller="c1" page="1"/>
+    <component id="n5_pvb4" name="n5" src="9jv677" fileName="components/Button81.xml" xy="765,88" group="n6_pvb4">
+      <Button title="采购福利" titleColor="#915e15" controller="c1" page="1"/>
     </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">
@@ -23,9 +26,10 @@
     </component>
     <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697">
       <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
       <Button title="一键领取"/>
     </component>
-    <list id="n12_pvb4" name="listGet" xy="150,302" size="779,1352" layout="flow_hz" overflow="scroll" colGap="25" defaultItem="ui://tw70qm9dpvb45i" autoClearItems="true">
+    <list id="n12_pvb4" name="listGet" xy="150,302" size="779,1352" layout="flow_hz" overflow="hidden" colGap="25" lineItemCount="2" defaultItem="ui://tw70qm9dpvb45i" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
@@ -33,7 +37,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n9_pvb4" name="listBuy" xy="150,300" size="779,1470" layout="flow_hz" overflow="scroll" colGap="25" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+    <list id="n9_pvb4" name="listBuy" xy="150,300" size="779,1470" layout="flow_hz" overflow="hidden" colGap="25" lineItemCount="2" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/League/components/Button8.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="152,63" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="152,63" aspect="true" url="ui://tw70qm9dwm603q" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="1"/>
     </loader>
-    <text id="n3_u2u3" name="title" xy="71,12" pivot="0.5,0" size="10,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#ae9370" align="center" text="">
+    <text id="n3_u2u3" name="title" xy="46,12" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#915e15" align="center" text="标题">
       <gearColor controller="button" pages="0" values="#ae9370,#000000" default="#915e15,#000000"/>
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

FGUIProject/assets/League/components/Button81.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="152,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="152,63" aspect="true" url="ui://tw70qm9dwm603q" fill="scale" autoSize="true">
+      <gearDisplay controller="button" pages="1"/>
+    </loader>
+    <text id="n3_u2u3" name="title" xy="46,12" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#915e15" align="center" text="标题">
+      <gearColor controller="button" pages="0" values="#915e15,#000000" default="#915e15,#000000"/>
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1255,801">
+  <displayList>
+    <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="438,0" group="n22_9jv6"/>
+    <loader id="n12_pvb4" name="loaIcon" xy="572,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
+    <text id="n15_pvb4" name="txtCount" xy="648,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/Button17.xml" xy="564,588" group="n22_9jv6">
+      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
+    </component>
+    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="562,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
+    <list id="n13_pvb4" name="listGift" xy="0,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n18_pvb4" name="txtTime" xy="696,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
+    <loader id="n21_9jv6" name="loaType" xy="457,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
+    <group id="n22_9jv6" name="n22" xy="0,0" size="1255,801"/>
+  </displayList>
+</component>

FGUIProject/assets/League/components/ListGiftBuyItemBottom.xml

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,735" overflow="hidden">
   <displayList>
-    <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,-65" group="n22_9jv6"/>
-    <loader id="n21_9jv6" name="loaType" xy="19,34" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n12_pvb4" name="loaIcon" xy="134,200" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <text id="n15_pvb4" name="txtCount" xy="210,364" 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/Button17.xml" xy="126,523" group="n22_9jv6">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
-    </component>
-    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,571" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
-    <list id="n13_pvb4" name="listGift" xy="-193,420" pivot="0.5,0" size="764,251" group="n22_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <text id="n18_pvb4" name="txtTime" xy="252,52" pivot="0.5,0" size="115,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" vars="true" text="剩余[color=#E45E29]{value=23}[/color]天"/>
-    <group id="n22_9jv6" name="n22" xy="-193,-65" size="764,801"/>
+    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-439,-66"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftBuyItemCenter.xml

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,648" overflow="hidden">
   <displayList>
-    <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,-65" group="n22_9jv6"/>
-    <loader id="n21_9jv6" name="loaType" xy="19,34" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n12_pvb4" name="loaIcon" xy="134,200" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <text id="n15_pvb4" name="txtCount" xy="210,364" 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/Button17.xml" xy="126,523" group="n22_9jv6">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
-    </component>
-    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,571" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
-    <list id="n13_pvb4" name="listGift" xy="-193,420" pivot="0.5,0" size="764,251" group="n22_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <text id="n18_pvb4" name="txtTime" xy="252,52" pivot="0.5,0" size="115,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" vars="true" text="剩余[color=#E45E29]{value=23}[/color]天"/>
-    <group id="n22_9jv6" name="n22" xy="-193,-65" size="764,801"/>
+    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-439,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftBuyItemTop.xml

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,712" overflow="hidden">
   <displayList>
-    <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/Button17.xml" xy="126,588" group="n22_9jv6">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
-    </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="-193,485" pivot="0.5,0" size="764,251" group="n22_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <text id="n18_pvb4" name="txtTime" xy="252,117" pivot="0.5,0" size="115,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" vars="true" text="剩余[color=#E45E29]{value=23}[/color]天"/>
-    <loader id="n21_9jv6" name="loaType" xy="19,34" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <group id="n22_9jv6" name="n22" xy="-193,0" size="764,801"/>
+    <component id="n19_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-438,0"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1113,759">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="可领取"/>
+    <remark page="1" value="已领取"/>
+  </controller>
+  <displayList>
+    <loader id="n29_9jv6" name="n29" xy="368,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
+      <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
+    </loader>
+    <loader id="n21_9jv6" name="loaType" xy="385,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
+    <loader id="n15_pvb4" name="loaIcon" xy="500,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
+    <list id="n13_pvb4" name="listGift" xy="0,493" pivot="0.5,0" size="1113,266" group="n28_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="391,300" group="n28_9jv6">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <group id="n28_9jv6" name="n28" xy="0,0" size="1113,759"/>
+  </displayList>
+</component>

FGUIProject/assets/League/components/ListGiftGetItemBottom.xml

@@ -5,19 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="0,-65" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
-    </loader>
-    <loader id="n21_9jv6" name="loaType" xy="17,36" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n15_pvb4" name="loaIcon" xy="132,195" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="-139,428" size="656,260" group="n28_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="23,235" group="n28_9jv6">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <group id="n28_9jv6" name="n28" xy="-139,-65" size="656,754"/>
+    <component id="n29_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItemCenter.xml

@@ -5,19 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="0,-65" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
-    </loader>
-    <loader id="n21_9jv6" name="loaType" xy="17,36" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n15_pvb4" name="loaIcon" xy="132,195" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="-139,428" size="656,260" group="n28_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="23,235" group="n28_9jv6">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <group id="n28_9jv6" name="n28" xy="-139,-65" size="656,754"/>
+    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItemTop.xml

@@ -5,19 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="0,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
-    </loader>
-    <loader id="n21_9jv6" name="loaType" xy="17,100" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n15_pvb4" name="loaIcon" xy="132,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="-139,493" size="656,260" group="n28_9jv6" layout="row" colGap="-80" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="23,300" group="n28_9jv6">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <group id="n28_9jv6" name="n28" xy="-139,0" size="656,754"/>
+    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,0"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -195,6 +195,9 @@
     <component id="9jv674" name="ListGiftGetItemBottom.xml" path="/components/" exported="true"/>
     <component id="9jv675" name="ListGiftBuyItemCenter.xml" path="/components/" exported="true"/>
     <component id="9jv676" name="ListGiftBuyItemBottom.xml" path="/components/" exported="true"/>
+    <component id="9jv677" name="Button81.xml" path="/components/"/>
+    <component id="9jv678" name="ListGiftButItem.xml" path="/components/"/>
+    <component id="9jv679" name="ListGiftGetItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemIconNew
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldp9jv6tlt";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemIconNew";
+        private static UI_ComItemIconNew _proxy;
+
+        public static UI_ComItemIconNew Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemIconNew();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComItemIconNew Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemIconNew();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComItemNew
+    {
+        public GComponent target;
+        public UI_ComItemIconNew m_comItemIcon;
+        public GTextField m_txtCount;
+        public GTextField m_txtName;
+        public const string URL = "ui://eg2y0ldp9jv6tls";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemNew";
+        private static UI_ComItemNew _proxy;
+
+        public static UI_ComItemNew Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItemNew();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComItemNew Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItemNew();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
+            m_txtCount = null;
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs.meta

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

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListGiftButItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtCount;
+        public GButton m_btnBuy;
+        public GComponent m_comCost;
+        public GList m_listGift;
+        public GTextField m_txtTime;
+        public GLoader m_loaType;
+        public const string URL = "ui://tw70qm9d9jv678";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftButItem";
+        private static UI_ListGiftButItem _proxy;
+
+        public static UI_ListGiftButItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftButItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListGiftButItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftButItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+            m_listGift = (GList)comp.GetChild("listGift");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_loaType = (GLoader)comp.GetChild("loaType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtCount = null;
+            m_btnBuy = null;
+            m_comCost = null;
+            m_listGift = null;
+            m_txtTime = null;
+            m_loaType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftButItem.cs.meta

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

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

@@ -7,13 +7,7 @@ namespace UI.League
     public partial class UI_ListGiftBuyItemBottom
     {
         public GComponent target;
-        public GLoader m_loaType;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
-        public GButton m_btnBuy;
-        public GComponent m_comCost;
-        public GList m_listGift;
-        public GTextField m_txtTime;
+        public UI_ListGiftButItem m_comItem;
         public const string URL = "ui://tw70qm9d9jv676";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftBuyItemBottom";
@@ -61,23 +55,12 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_comCost = (GComponent)comp.GetChild("comCost");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_comItem = (UI_ListGiftButItem)UI_ListGiftButItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaType = null;
-            m_loaIcon = null;
-            m_txtCount = null;
-            m_btnBuy = null;
-            m_comCost = null;
-            m_listGift = null;
-            m_txtTime = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,13 +7,7 @@ namespace UI.League
     public partial class UI_ListGiftBuyItemCenter
     {
         public GComponent target;
-        public GLoader m_loaType;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
-        public GButton m_btnBuy;
-        public GComponent m_comCost;
-        public GList m_listGift;
-        public GTextField m_txtTime;
+        public UI_ListGiftButItem m_comItem;
         public const string URL = "ui://tw70qm9d9jv675";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftBuyItemCenter";
@@ -61,23 +55,12 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_comCost = (GComponent)comp.GetChild("comCost");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_comItem = (UI_ListGiftButItem)UI_ListGiftButItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaType = null;
-            m_loaIcon = null;
-            m_txtCount = null;
-            m_btnBuy = null;
-            m_comCost = null;
-            m_listGift = null;
-            m_txtTime = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,13 +7,7 @@ namespace UI.League
     public partial class UI_ListGiftBuyItemTop
     {
         public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtCount;
-        public GButton m_btnBuy;
-        public GComponent m_comCost;
-        public GList m_listGift;
-        public GTextField m_txtTime;
-        public GLoader m_loaType;
+        public UI_ListGiftButItem m_comItem;
         public const string URL = "ui://tw70qm9dpvb44z";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftBuyItemTop";
@@ -61,23 +55,12 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_comCost = (GComponent)comp.GetChild("comCost");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_loaType = (GLoader)comp.GetChild("loaType");
+            m_comItem = (UI_ListGiftButItem)UI_ListGiftButItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaIcon = null;
-            m_txtCount = null;
-            m_btnBuy = null;
-            m_comCost = null;
-            m_listGift = null;
-            m_txtTime = null;
-            m_loaType = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListGiftGetItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaType;
+        public GLoader m_loaIcon;
+        public GList m_listGift;
+        public const string URL = "ui://tw70qm9d9jv679";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftGetItem";
+        private static UI_ListGiftGetItem _proxy;
+
+        public static UI_ListGiftGetItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftGetItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListGiftGetItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftGetItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_loaType = (GLoader)comp.GetChild("loaType");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_listGift = (GList)comp.GetChild("listGift");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaType = null;
+            m_loaIcon = null;
+            m_listGift = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItem.cs.meta

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

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

@@ -8,9 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaType;
-        public GLoader m_loaIcon;
-        public GList m_listGift;
+        public UI_ListGiftGetItem m_comItem;
         public const string URL = "ui://tw70qm9d9jv674";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftGetItemBottom";
@@ -59,16 +57,13 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_listGift = (GList)comp.GetChild("listGift");
+            m_comItem = (UI_ListGiftGetItem)UI_ListGiftGetItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaType = null;
-            m_loaIcon = null;
-            m_listGift = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,9 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaType;
-        public GLoader m_loaIcon;
-        public GList m_listGift;
+        public UI_ListGiftGetItem m_comItem;
         public const string URL = "ui://tw70qm9d9jv673";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftGetItemCenter";
@@ -59,16 +57,13 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_listGift = (GList)comp.GetChild("listGift");
+            m_comItem = (UI_ListGiftGetItem)UI_ListGiftGetItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaType = null;
-            m_loaIcon = null;
-            m_listGift = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,9 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaType;
-        public GLoader m_loaIcon;
-        public GList m_listGift;
+        public UI_ListGiftGetItem m_comItem;
         public const string URL = "ui://tw70qm9dpvb45i";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftGetItemTop";
@@ -59,16 +57,13 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_listGift = (GList)comp.GetChild("listGift");
+            m_comItem = (UI_ListGiftGetItem)UI_ListGiftGetItem.Create(comp.GetChild("comItem"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaType = null;
-            m_loaIcon = null;
-            m_listGift = null;
+            m_comItem.Dispose();
+            m_comItem = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -60,7 +60,7 @@ namespace GFGGame
         private void UpdateView()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemData.id);
-            if(itemCfg == null)
+            if (itemCfg == null)
             {
                 Log.Error($"使用了一个不存在的物品 {_itemData.id}！");
                 return;
@@ -78,7 +78,7 @@ namespace GFGGame
             _txtCount.visible = true;
 
             _txtName.text = itemCfg.name;
-            _txtCount.SetVar("count", _itemData.num.ToString()).FlushVars();
+            _txtCount.text = string.Format("x{0}", _itemData.num);
             _txtHasCount.SetVar("count", "" + ItemDataManager.GetItemNum(_itemData.id)).FlushVars();
         }
 
@@ -242,7 +242,10 @@ namespace GFGGame
                 _txtCount.visible = value;
             }
         }
-
+        public void ChangeTxtCountStyle()
+        {
+            _txtCount.text = string.Format("{0}", _itemData.num);
+        }
         public void SetTxtNamePos(int x, int y)
         {
             _txtName.SetPosition(x, y, 0);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs

@@ -31,9 +31,11 @@ namespace GFGGame
             _ui = UI_LeagueGiftUI.Create();
 
             this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            isfullScreen = true;
+            // this.viewCom.Center();
+            //   this.viewCom = _ui.target;
+            // this.modal = true;
+            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
@@ -43,6 +45,9 @@ namespace GFGGame
             _ui.m_listBuy.itemProvider = GetListBuyItemResource;
             _ui.m_listGet.itemRenderer = RenderListGetItem;
             _ui.m_listGet.itemProvider = GetListGetItemResource;
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+
         }
         protected override void AddEventListener()
         {
@@ -61,6 +66,7 @@ namespace GFGGame
             base.OnHide();
             if (_ui.m_listBuy.numItems > 0) _ui.m_listBuy.ScrollToView(0);
             if (_ui.m_listGet.numItems > 0) _ui.m_listGet.ScrollToView(0);
+            _ui.m_c1.selectedIndex = 0;
         }
 
         protected override void RemoveEventListener()
@@ -96,12 +102,12 @@ namespace GFGGame
         private void RenderListGetItem(int index, GObject obj)
         {
             UI_ListGiftGetItemTop item = UI_ListGiftGetItemTop.Proxy(obj);
-            if (item.m_listGift.data == null)
+            if (item.m_comItem.m_listGift.data == null)
             {
-                item.m_listGift.itemRenderer = RenderListRewardItem;
+                item.m_comItem.m_listGift.itemRenderer = RenderListRewardItem;
             }
-            item.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
-            item.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
+            item.m_comItem.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
+            item.m_comItem.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
             UI_ListGiftGetItemTop.ProxyEnd();
         }
         private void RenderListBuyItem(int index, GObject obj)
@@ -109,24 +115,25 @@ namespace GFGGame
             UI_ListGiftBuyItemTop item = UI_ListGiftBuyItemTop.Proxy(obj);
             LeagueGiftBuyData buyData = _buyDatas[index];
             string strCount = buyData.GiftCfg.limitType == 1 ? "今日剩余：{0}/{1}" : "本周剩余：{0}/{1}";
-            item.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
-            int day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
+            item.m_comItem.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
+            long day = buyData.EndTime / TimeUtil.SECOND_PER_DAY / 1000;// TimeUtil.FormattingTime11(TimeHelper.ServerNow(), TimeHelper.ServerNow() + buyData.EndTime);
             // item.m_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("（剩余{0}天）", day);
-            item.m_txtTime.SetVar("value", buyData.EndTime == 0 ? "" : day.ToString());
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, buyData.GiftCfg.consumeArr[0]);
+            item.m_comItem.m_txtTime.visible = buyData.EndTime != 0;
+            item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(day.ToString(), "#E45E29"));
+            ItemUtil.UpdateItemNeedNum(item.m_comItem.m_comCost, buyData.GiftCfg.consumeArr[0]);
 
-            if (item.m_listGift.data == null)
+            if (item.m_comItem.m_listGift.data == null)
             {
-                item.m_listGift.itemRenderer = RenderListRewardItem;
+                item.m_comItem.m_listGift.itemRenderer = RenderListRewardItem;
             }
-            item.m_listGift.data = _buyDatas[index].GiftCfg.bonusArr;
-            item.m_listGift.numItems = _buyDatas[index].GiftCfg.bonusArr.Length;
+            item.m_comItem.m_listGift.data = _buyDatas[index].GiftCfg.bonusArr;
+            item.m_comItem.m_listGift.numItems = _buyDatas[index].GiftCfg.bonusArr.Length;
 
-            if (item.m_btnBuy.data == null)
+            if (item.m_comItem.m_btnBuy.data == null)
             {
-                item.m_btnBuy.onClick.Add(OnBtnBuyClick);
+                item.m_comItem.m_btnBuy.onClick.Add(OnBtnBuyClick);
             }
-            item.m_btnBuy.data = buyData;
+            item.m_comItem.m_btnBuy.data = buyData;
 
             UI_ListGiftBuyItemTop.ProxyEnd();
         }
@@ -139,8 +146,9 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.6f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+            (obj.data as ItemView).SetTxtCountScale = 3f;
+            (obj.data as ItemView).SetTxtCountPos(250, 142);
         }
         private string GetListGetItemResource(int index)
         {