zhaoyang 2 年之前
父節點
當前提交
a429f27b4a
共有 100 個文件被更改,包括 1027 次插入126 次删除
  1. 17 0
      FGUIProject/assets/CommonGame/components/ComItemIconNew.xml
  2. 12 0
      FGUIProject/assets/CommonGame/components/ComItemNew.xml
  3. 二進制
      FGUIProject/assets/CommonGame/images/lm_daoju_db.png
  4. 3 0
      FGUIProject/assets/CommonGame/package.xml
  5. 31 17
      FGUIProject/assets/League/LeagueGiftUI.xml
  6. 0 18
      FGUIProject/assets/League/components/ListGiftBuyItem.xml
  7. 20 0
      FGUIProject/assets/League/components/ListGiftBuyItemBottom.xml
  8. 20 0
      FGUIProject/assets/League/components/ListGiftBuyItemCenter.xml
  9. 20 0
      FGUIProject/assets/League/components/ListGiftBuyItemTop.xml
  10. 0 11
      FGUIProject/assets/League/components/ListGiftGetItem.xml
  11. 23 0
      FGUIProject/assets/League/components/ListGiftGetItemBottom.xml
  12. 23 0
      FGUIProject/assets/League/components/ListGiftGetItemCenter.xml
  13. 23 0
      FGUIProject/assets/League/components/ListGiftGetItemTop.xml
  14. 二進制
      FGUIProject/assets/League/images/biaotizi12.png
  15. 二進制
      FGUIProject/assets/League/images/biaotizi_11.png
  16. 二進制
      FGUIProject/assets/League/images/fannao.png
  17. 二進制
      FGUIProject/assets/League/images/liuhan.png
  18. 二進制
      FGUIProject/assets/League/images/lm_an__3xuanzhong2.png
  19. 二進制
      FGUIProject/assets/League/images/lm_biaoqian_1.png
  20. 二進制
      FGUIProject/assets/League/images/lm_biaoqian_2.png
  21. 二進制
      FGUIProject/assets/League/images/lm_biaoqian_3.png
  22. 二進制
      FGUIProject/assets/League/images/lm_biaoqian_4.png
  23. 二進制
      FGUIProject/assets/League/images/lm_biaoqian_ylq.png
  24. 二進制
      FGUIProject/assets/League/images/lm_biaotizi_13.png
  25. 二進制
      FGUIProject/assets/League/images/lm_bq_dcm.png
  26. 二進制
      FGUIProject/assets/League/images/lm_bq_xcm.png
  27. 二進制
      FGUIProject/assets/League/images/lm_bq_xxcm.png
  28. 二進制
      FGUIProject/assets/League/images/lm_ch_dcm.png
  29. 二進制
      FGUIProject/assets/League/images/lm_daoju_db.png
  30. 二進制
      FGUIProject/assets/League/images/lm_djs_db.png
  31. 二進制
      FGUIProject/assets/League/images/lm_dt_cwdk.png
  32. 二進制
      FGUIProject/assets/League/images/lm_dt_cy_db.png
  33. 二進制
      FGUIProject/assets/League/images/lm_dt_cy_dk.png
  34. 二進制
      FGUIProject/assets/League/images/lm_dt_db.png
  35. 二進制
      FGUIProject/assets/League/images/lm_dt_dhdk.png
  36. 二進制
      FGUIProject/assets/League/images/lm_dt_dhdk2.png
  37. 二進制
      FGUIProject/assets/League/images/lm_dt_dk.png
  38. 二進制
      FGUIProject/assets/League/images/lm_dt_srdb.png
  39. 二進制
      FGUIProject/assets/League/images/lm_dt_srdk.png
  40. 二進制
      FGUIProject/assets/League/images/lm_dt_tb_x.png
  41. 二進制
      FGUIProject/assets/League/images/lm_dt_tsdb.png
  42. 二進制
      FGUIProject/assets/League/images/lm_dt_tsdk.png
  43. 二進制
      FGUIProject/assets/League/images/lm_dt_zsx1.png
  44. 二進制
      FGUIProject/assets/League/images/lm_fgx.png
  45. 二進制
      FGUIProject/assets/League/images/lm_fl_db.png
  46. 二進制
      FGUIProject/assets/League/images/lm_fl_zsdz.png
  47. 二進制
      FGUIProject/assets/League/images/lm_fl_zsdz_chang.png
  48. 二進制
      FGUIProject/assets/League/images/lm_kp_db.png
  49. 二進制
      FGUIProject/assets/League/images/lm_kp_db2_dlq.png
  50. 二進制
      FGUIProject/assets/League/images/lm_kp_db_chang.png
  51. 二進制
      FGUIProject/assets/League/images/lm_phb_dk.png
  52. 二進制
      FGUIProject/assets/League/images/lm_tb_biaoqing.png
  53. 二進制
      FGUIProject/assets/League/images/lm_tb_phb.png
  54. 二進制
      FGUIProject/assets/League/images/lm_tb_wg1.png
  55. 二進制
      FGUIProject/assets/League/images/lm_tb_wg2.png
  56. 二進制
      FGUIProject/assets/League/images/lm_tb_wg3.png
  57. 二進制
      FGUIProject/assets/League/images/lm_tx_db.png
  58. 二進制
      FGUIProject/assets/League/images/lm_yeqian_db2.png
  59. 二進制
      FGUIProject/assets/League/images/lm_yeqian_xuanzhong2.png
  60. 二進制
      FGUIProject/assets/League/images/lm_zhuangshixian_2.png
  61. 二進制
      FGUIProject/assets/League/images/lm_zsd.png
  62. 二進制
      FGUIProject/assets/League/images/lm_zsx0.png
  63. 二進制
      FGUIProject/assets/League/images/组6635.png
  64. 56 2
      FGUIProject/assets/League/package.xml
  65. 1 1
      FGUIProject/assets/Main/FontNew/Font_Prefect.fnt
  66. 13 32
      FGUIProject/assets/Main/components/ComAllPerfect.xml
  67. 2 2
      FGUIProject/assets/Main/components/ComScoreResult.xml
  68. 1 1
      FGUIProject/assets/Main/components/ComSkillScore.xml
  69. 二進制
      FGUIProject/assets/Main/imagesNew/3Second.png
  70. 1 0
      FGUIProject/assets/Main/package.xml
  71. 9 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueGiftUI.cs
  72. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemBottom.cs
  73. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemBottom.cs.meta
  74. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemCenter.cs
  75. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemCenter.cs.meta
  76. 16 16
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemTop.cs
  77. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemTop.cs.meta
  78. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemBottom.cs
  79. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemBottom.cs.meta
  80. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemCenter.cs
  81. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemCenter.cs.meta
  82. 13 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemTop.cs
  83. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemTop.cs.meta
  84. 51 11
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs
  85. 二進制
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  86. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  87. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  88. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  89. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  90. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  91. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  92. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  93. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  94. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png
  95. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png.meta
  96. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png
  97. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png.meta
  98. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  99. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png.meta
  100. 二進制
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png

+ 17 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,260">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="9jv6tlu" fileName="images/lm_daoju_db.png" xy="0,0"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="130,130" pivot="0.5,0.5" anchor="true" size="200,200" group="n30_9jv6" url="ui://xz8kxrecng0i27" fill="scaleFree" autoSize="true"/>
+    <text id="n17_j48o" name="txtHasCount" xy="131,261" pivot="0.5,0" anchor="true" size="102,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="183,18" size="44,94" group="n30_9jv6" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="40,109" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="40,109" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="49,109" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="40,109" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="pu55tiw" fileName="images/pfjl_and.png" xy="19,19" size="221,220" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="87,104" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="19,19" size="221,220" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="19,18" size="221,279"/>
+  </displayList>
+</component>

+ 12 - 0
FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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}">
+      <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="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+  </displayList>
+</component>

二進制
FGUIProject/assets/CommonGame/images/lm_daoju_db.png


+ 3 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -277,6 +277,9 @@
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
     <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
+    <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
+    <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
+    <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 31 - 17
FGUIProject/assets/League/LeagueGiftUI.xml

@@ -1,42 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1110">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,0" size="1080,1147" group="n11_pvb4"/>
-    <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,20" size="111,96" group="n11_pvb4"/>
-    <image id="n2_pvb4" name="n2" src="wm603l" fileName="images/biaotizi_5.png" xy="202,80" size="673,62" group="n11_pvb4"/>
-    <image id="n3_pvb4" name="n3" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,172" size="293,56" group="n6_pvb4"/>
-    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="162,169" group="n6_pvb4">
-      <Button checked="true" title="领取福利" controller="c1" page="0"/>
+    <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"/>
+    </loader>
+    <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"/>
+    <image id="n2_pvb4" name="n2" src="9jv669" fileName="images/biaotizi_11.png" xy="203,222" size="673,62"/>
+    <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>
-    <component id="n5_pvb4" name="n5" src="rv091j" fileName="components/Button8.xml" xy="314,169" group="n6_pvb4">
-      <Button title="采购福利" controller="c1" page="1"/>
+    <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>
-    <group id="n6_pvb4" name="n6" xy="162,169" size="304,63" group="n11_pvb4"/>
-    <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="635,93" size="36,37" group="n11_pvb4">
+    <group id="n6_pvb4" name="n6" xy="613,88" size="304,63"/>
+    <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="920,101" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <component id="n8_pvb4" name="btnGet" src="wm603x" fileName="components/Button111.xml" xy="375,819" group="n11_pvb4">
+    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="一键领取"/>
     </component>
-    <list id="n12_pvb4" name="listGet" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+    <list id="n12_pvb4" name="listGet" xy="150,302" size="779,1352" layout="flow_hz" overflow="scroll" colGap="25" defaultItem="ui://tw70qm9dpvb45i" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n9_pvb4" name="listBuy" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+    <list id="n9_pvb4" name="listBuy" xy="150,300" size="779,1470" layout="flow_hz" overflow="scroll" colGap="25" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n10_pvb4" name="txtTips" xy="392,450" size="330,80" group="n11_pvb4" fontSize="30" align="center" text="当前暂无可领取的福利&#xA;社长和副社长可采购福利">
+    <text id="n10_pvb4" name="n10" xy="338,937" size="404,54" group="n17_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#915e15" align="center" text="当前暂无可领取的福利">
       <gearDisplay controller="c1" pages="0"/>
     </text>
-    <group id="n11_pvb4" name="n11" xy="0,0" size="1080,1147"/>
+    <text id="n15_9jv6" name="n15" xy="384,991" size="312,39" group="n17_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a89171" align="center" text="社长和副社长可采购福利">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <image id="n16_9jv6" name="n16" src="9jv66b" fileName="images/liuhan.png" xy="443,728" group="n17_9jv6"/>
+    <group id="n17_9jv6" name="grpTips" xy="338,728" size="404,302" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

+ 0 - 18
FGUIProject/assets/League/components/ListGiftBuyItem.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="747,156" overflow="hidden">
-  <displayList>
-    <loader id="n12_pvb4" name="loaIcon" xy="0,22" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="116,1" size="200,251" layout="row" defaultItem="ui://eg2y0ldpj48o98" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n14_pvb4" name="btnBuy" src="rv091p" fileName="components/Button12.xml" xy="558,46" group="n17_pvb4">
-      <Button title="采购"/>
-    </component>
-    <text id="n15_pvb4" name="txtCount" xy="554,5" pivot="0.5,0" size="193,41" group="n17_pvb4" fontSize="30" text="今日剩余:1/1"/>
-    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="588,104" group="n17_pvb4" controller="c1,1"/>
-    <group id="n17_pvb4" name="grpLeader" xy="554,5" size="193,145" advanced="true"/>
-    <text id="n18_pvb4" name="txtTime" xy="143,121" size="40,42" fontSize="30" text=""/>
-  </displayList>
-</component>

+ 20 - 0
FGUIProject/assets/League/components/ListGiftBuyItemBottom.xml

@@ -0,0 +1,20 @@
+<?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"/>
+  </displayList>
+</component>

+ 20 - 0
FGUIProject/assets/League/components/ListGiftBuyItemCenter.xml

@@ -0,0 +1,20 @@
+<?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"/>
+  </displayList>
+</component>

+ 20 - 0
FGUIProject/assets/League/components/ListGiftBuyItemTop.xml

@@ -0,0 +1,20 @@
+<?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"/>
+  </displayList>
+</component>

+ 0 - 11
FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="747,156" overflow="hidden">
-  <displayList>
-    <loader id="n15_pvb4" name="loaIcon" xy="17,51" size="50,50"/>
-    <list id="n13_pvb4" name="listGift" xy="116,1" size="656,251" layout="row" defaultItem="ui://eg2y0ldpj48o98" vAlign="middle">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-  </displayList>
-</component>

+ 23 - 0
FGUIProject/assets/League/components/ListGiftGetItemBottom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="377,688" pivot="0.5,0.5" overflow="hidden">
+  <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="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"/>
+  </displayList>
+</component>

+ 23 - 0
FGUIProject/assets/League/components/ListGiftGetItemCenter.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="377,601" pivot="0.5,0.5" overflow="hidden">
+  <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="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"/>
+  </displayList>
+</component>

+ 23 - 0
FGUIProject/assets/League/components/ListGiftGetItemTop.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="377,666" pivot="0.5,0.5" overflow="hidden">
+  <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="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"/>
+  </displayList>
+</component>

二進制
FGUIProject/assets/League/images/biaotizi12.png


二進制
FGUIProject/assets/League/images/biaotizi_11.png


二進制
FGUIProject/assets/League/images/fannao.png


二進制
FGUIProject/assets/League/images/liuhan.png


二進制
FGUIProject/assets/League/images/lm_an__3xuanzhong2.png


二進制
FGUIProject/assets/League/images/lm_biaoqian_1.png


二進制
FGUIProject/assets/League/images/lm_biaoqian_2.png


二進制
FGUIProject/assets/League/images/lm_biaoqian_3.png


二進制
FGUIProject/assets/League/images/lm_biaoqian_4.png


二進制
FGUIProject/assets/League/images/lm_biaoqian_ylq.png


二進制
FGUIProject/assets/League/images/lm_biaotizi_13.png


二進制
FGUIProject/assets/League/images/lm_bq_dcm.png


二進制
FGUIProject/assets/League/images/lm_bq_xcm.png


二進制
FGUIProject/assets/League/images/lm_bq_xxcm.png


二進制
FGUIProject/assets/League/images/lm_ch_dcm.png


二進制
FGUIProject/assets/League/images/lm_daoju_db.png


二進制
FGUIProject/assets/League/images/lm_djs_db.png


二進制
FGUIProject/assets/League/images/lm_dt_cwdk.png


二進制
FGUIProject/assets/League/images/lm_dt_cy_db.png


二進制
FGUIProject/assets/League/images/lm_dt_cy_dk.png


二進制
FGUIProject/assets/League/images/lm_dt_db.png


二進制
FGUIProject/assets/League/images/lm_dt_dhdk.png


二進制
FGUIProject/assets/League/images/lm_dt_dhdk2.png


二進制
FGUIProject/assets/League/images/lm_dt_dk.png


二進制
FGUIProject/assets/League/images/lm_dt_srdb.png


二進制
FGUIProject/assets/League/images/lm_dt_srdk.png


二進制
FGUIProject/assets/League/images/lm_dt_tb_x.png


二進制
FGUIProject/assets/League/images/lm_dt_tsdb.png


二進制
FGUIProject/assets/League/images/lm_dt_tsdk.png


二進制
FGUIProject/assets/League/images/lm_dt_zsx1.png


二進制
FGUIProject/assets/League/images/lm_fgx.png


二進制
FGUIProject/assets/League/images/lm_fl_db.png


二進制
FGUIProject/assets/League/images/lm_fl_zsdz.png


二進制
FGUIProject/assets/League/images/lm_fl_zsdz_chang.png


二進制
FGUIProject/assets/League/images/lm_kp_db.png


二進制
FGUIProject/assets/League/images/lm_kp_db2_dlq.png


二進制
FGUIProject/assets/League/images/lm_kp_db_chang.png


二進制
FGUIProject/assets/League/images/lm_phb_dk.png


二進制
FGUIProject/assets/League/images/lm_tb_biaoqing.png


二進制
FGUIProject/assets/League/images/lm_tb_phb.png


二進制
FGUIProject/assets/League/images/lm_tb_wg1.png


二進制
FGUIProject/assets/League/images/lm_tb_wg2.png


二進制
FGUIProject/assets/League/images/lm_tb_wg3.png


二進制
FGUIProject/assets/League/images/lm_tx_db.png


二進制
FGUIProject/assets/League/images/lm_yeqian_db2.png


二進制
FGUIProject/assets/League/images/lm_yeqian_xuanzhong2.png


二進制
FGUIProject/assets/League/images/lm_zhuangshixian_2.png


二進制
FGUIProject/assets/League/images/lm_zsd.png


二進制
FGUIProject/assets/League/images/lm_zsx0.png


二進制
FGUIProject/assets/League/images/组6635.png


+ 56 - 2
FGUIProject/assets/League/package.xml

@@ -123,7 +123,7 @@
     <image id="o9gh4u" name="lm_kuang_qifu.png" path="/images/"/>
     <image id="o9gh4v" name="tb_up.png" path="/images/"/>
     <component id="o9gh4x" name="ComConstruct1.xml" path="/components/"/>
-    <component id="pvb44z" name="ListGiftBuyItem.xml" path="/components/"/>
+    <component id="pvb44z" name="ListGiftBuyItemTop.xml" path="/components/" exported="true"/>
     <component id="pvb450" name="LeagueAnswerRankUI.xml" path="/" exported="true"/>
     <component id="pvb451" name="ListRankItem.xml" path="/components/"/>
     <component id="pvb452" name="LeagueAnswerUI.xml" path="/" exported="true"/>
@@ -140,7 +140,61 @@
     <component id="pvb45d" name="ListSkillItem.xml" path="/components/"/>
     <component id="pvb45f" name="ListSkillLayerItem.xml" path="/components/"/>
     <component id="pvb45h" name="LeagueGiftUI.xml" path="/" exported="true"/>
-    <component id="pvb45i" name="ListGiftGetItem.xml" path="/components/" exported="true"/>
+    <component id="pvb45i" name="ListGiftGetItemTop.xml" path="/components/" exported="true"/>
+    <image id="9jv65j" name="biaotizi12.png" path="/images/"/>
+    <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
+    <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/images/"/>
+    <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
+    <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
+    <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
+    <image id="9jv65s" name="lm_kp_db2_dlq.png" path="/images/"/>
+    <image id="9jv65t" name="lm_kp_db_chang.png" path="/images/"/>
+    <image id="9jv65u" name="lm_phb_dk.png" path="/images/"/>
+    <image id="9jv65v" name="lm_tb_biaoqing.png" path="/images/"/>
+    <image id="9jv65w" name="lm_tb_phb.png" path="/images/"/>
+    <image id="9jv65x" name="lm_tb_wg1.png" path="/images/"/>
+    <image id="9jv65y" name="lm_tb_wg2.png" path="/images/"/>
+    <image id="9jv65z" name="lm_tb_wg3.png" path="/images/"/>
+    <image id="9jv660" name="lm_tx_db.png" path="/images/"/>
+    <image id="9jv661" name="lm_yeqian_db2.png" path="/images/"/>
+    <image id="9jv662" name="lm_yeqian_xuanzhong2.png" path="/images/"/>
+    <image id="9jv663" name="lm_zhuangshixian_2.png" path="/images/"/>
+    <image id="9jv664" name="lm_zsd.png" path="/images/"/>
+    <image id="9jv665" name="lm_dt_tb_x.png" path="/images/"/>
+    <image id="9jv666" name="lm_dt_srdk.png" path="/images/"/>
+    <image id="9jv667" name="lm_dt_srdb.png" path="/images/"/>
+    <image id="9jv668" name="lm_dt_dk.png" path="/images/"/>
+    <image id="9jv669" name="biaotizi_11.png" path="/images/"/>
+    <image id="9jv66a" name="fannao.png" path="/images/"/>
+    <image id="9jv66b" name="liuhan.png" path="/images/"/>
+    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/images/"/>
+    <image id="9jv66g" name="lm_biaoqian_ylq.png" path="/images/"/>
+    <image id="9jv66i" name="lm_biaotizi_13.png" path="/images/"/>
+    <image id="9jv66j" name="lm_zsx0.png" path="/images/"/>
+    <image id="9jv66k" name="lm_bq_dcm.png" path="/images/"/>
+    <image id="9jv66l" name="lm_bq_xxcm.png" path="/images/"/>
+    <image id="9jv66m" name="lm_ch_dcm.png" path="/images/"/>
+    <image id="9jv66n" name="lm_daoju_db.png" path="/images/"/>
+    <image id="9jv66o" name="lm_djs_db.png" path="/images/"/>
+    <image id="9jv66p" name="lm_dt_cwdk.png" path="/images/"/>
+    <image id="9jv66q" name="lm_dt_cy_db.png" path="/images/"/>
+    <image id="9jv66r" name="lm_dt_cy_dk.png" path="/images/"/>
+    <image id="9jv66s" name="lm_dt_db.png" path="/images/"/>
+    <image id="9jv66t" name="lm_dt_dhdk.png" path="/images/"/>
+    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/"/>
+    <image id="9jv66v" name="lm_bq_xcm.png" path="/images/"/>
+    <image id="9jv66w" name="组6635.png" path="/images/"/>
+    <image id="9jv66x" name="lm_biaoqian_1.png" path="/images/"/>
+    <image id="9jv66y" name="lm_biaoqian_2.png" path="/images/"/>
+    <image id="9jv66z" name="lm_biaoqian_3.png" path="/images/"/>
+    <image id="9jv670" name="lm_biaoqian_4.png" path="/images/"/>
+    <image id="9jv671" name="lm_fl_zsdz.png" path="/images/"/>
+    <image id="9jv672" name="lm_fl_zsdz_chang.png" path="/images/"/>
+    <component id="9jv673" name="ListGiftGetItemCenter.xml" path="/components/" exported="true"/>
+    <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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Main/FontNew/Font_Prefect.fnt

@@ -1,4 +1,4 @@
-info size=12 colored=false
+info size=12 resizable=true colored=false
 char id=48 img=qkjsln xoffset=0 yoffset=0 xadvance=0
 char id=49 img=qkjslo xoffset=0 yoffset=0 xadvance=0
 char id=50 img=qkjslp xoffset=0 yoffset=0 xadvance=0

+ 13 - 32
FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,41 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="345,367">
   <displayList>
-    <loader id="n41_psph" name="n41" xy="49,60" size="247,247"/>
-    <image id="n31_cn27" name="n31" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph"/>
-    <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph" aspect="true"/>
-    <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138" group="n40_psph"/>
-    <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" group="n40_psph" aspect="true" scale="1.5,1.5"/>
-    <group id="n40_psph" name="n40" xy="49,52" size="247,262" advanced="true"/>
-    <graph id="n36_qgxy" name="holder" xy="181,-236" size="1,1" group="n39_qgxy"/>
-    <image id="n37_qgxy" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="65,-308" group="n39_qgxy"/>
-    <text id="n38_qgxy" name="txtCount" xy="64,-215" pivot="0.5,0" size="234,69" group="n39_qgxy" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
-    <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
+    <text id="n38_qgxy" name="txtCount" xy="3,135" pivot="0.5,0.5" size="339,97" font="ui://mfvz4q8kqkjsnw" fontSize="40" text="66666"/>
+    <graph id="n42_gfx4" name="holderLoop" xy="172,183" size="1,1"/>
+    <graph id="n43_gfx4" name="holder" xy="172,183" size="1,1"/>
+    <graph id="n44_gfx4" name="holderSmokeIn" xy="172,183" size="1,1"/>
+    <graph id="n45_gfx4" name="holderSmokeOut" xy="172,183" size="1,1"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="24" ease="Linear"/>
-    <item time="0" type="Visible" target="n31_cn27" value="true"/>
-    <item time="0" type="Visible" target="n32_cn27" value="false"/>
-    <item time="0" type="Visible" target="n33_cn27" value="true"/>
-    <item time="0" type="Visible" target="n35_oixc" value="true"/>
-    <item time="0" type="Visible" target="n39_qgxy" value="false"/>
-    <item time="0" type="Visible" target="n40_psph" value="true"/>
-    <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
-    <item time="24" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
-    <item time="24" type="Visible" target="n32_cn27" value="true"/>
-    <item time="24" type="Visible" target="n33_cn27" value="false"/>
-    <item time="24" type="XY" target="n32_cn27" tween="true" startValue="512,-55" endValue="111,173" duration="48" ease="Quad.In" path="2,0,0,-104,-572,-1143,-217,1,2,-401,228,342.8462,674.1072,0,0,1"/>
-    <item time="72" type="Visible" target="n31_cn27" value="false"/>
-    <item time="72" type="Visible" target="n32_cn27" value="false"/>
-    <item time="72" type="Visible" target="n35_oixc" value="false"/>
-    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
-    <item time="72" type="Visible" target="n40_psph" value="false"/>
+    <item time="0" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n42_gfx4" value="true"/>
+    <item time="0" type="Visible" target="n43_gfx4" value="true"/>
+    <item time="0" type="Visible" target="n44_gfx4" value="false"/>
+    <item time="0" type="Visible" target="n45_gfx4" value="false"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Visible" target="n39_qgxy" value="true"/>
-    <item time="0" type="Visible" target="n40_psph" value="false"/>
-    <item time="9" type="Visible" target="n39_qgxy" value="true"/>
-    <item time="63" type="Visible" target="n39_qgxy" value="false"/>
-    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n44_gfx4" value="true"/>
+    <item time="72" type="Visible" target="n44_gfx4" value="false"/>
   </transition>
+  <transition name="t2"/>
 </component>

+ 2 - 2
FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
     <graph id="n28_qkjs" name="holderResult" xy="130,130" pivot="0.5,0.5" anchor="true" size="30,30" type="rect"/>
     <image id="n18_f2bf" name="n18" src="qkjsli" fileName="imagesNew/font_zdqp_dikuang.png" xy="122,126" pivot="0.48,0.48" anchor="true" visible="false"/>
@@ -18,7 +18,7 @@
     <text id="n10_vuz5" name="txtCount1" xy="66,116" pivot="0.5,0" size="124,32" group="n22_f2bf" font="ui://mfvz4q8kqkjsnv" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <text id="n11_vuz5" name="txtCount2" xy="66,116" pivot="0.5,0" size="124,32" group="n22_f2bf" font="ui://mfvz4q8kqkjsnw" fontSize="51" align="center" text="666666">
+    <text id="n11_vuz5" name="txtCount2" xy="66,116" pivot="0.5,0" size="124,32" group="n22_f2bf" font="ui://mfvz4q8kqkjsnw" fontSize="12" align="center" text="666666">
       <gearDisplay controller="c1" pages="2"/>
     </text>
     <group id="n22_f2bf" name="grpResult" xy="66,116" size="124,32" visible="false" advanced="true"/>

+ 1 - 1
FGUIProject/assets/Main/components/ComSkillScore.xml

@@ -8,7 +8,7 @@
     <loader id="n7_qkjs" name="n7" xy="0,0" size="179,40" url="ui://mfvz4q8kqkjsjb" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kqkjsjb|ui://mfvz4q8kqkjsm6"/>
     </loader>
-    <text id="n5_om9f" name="txtCount" xy="42,4" pivot="0.5,0" size="94,32" font="ui://mfvz4q8kqkjsnw" fontSize="32" color="#fdfbee" align="center" vars="true" text="+  {value=666}">
+    <text id="n5_om9f" name="txtCount" xy="42,4" pivot="0.5,0" size="94,32" font="ui://mfvz4q8kqkjsnw" fontSize="12" color="#fdfbee" align="center" vars="true" text="+  {value=666}">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <text id="n8_qkjs" name="txtCount1" xy="43,4" pivot="0.5,0" size="92,32" font="ui://mfvz4q8kqkjsnu" fontSize="48" color="#fdfbee" align="center" letterSpacing="3" vars="true" text="-  {value=666}">

二進制
FGUIProject/assets/Main/imagesNew/3Second.png


+ 1 - 0
FGUIProject/assets/Main/package.xml

@@ -614,6 +614,7 @@
     <image id="qkjsnz" name="zspf_picture.png" path="/imagesNew/"/>
     <component id="o9gho0" name="ComSkillCardMask.xml" path="/components/"/>
     <component id="o9gho1" name="ProgressBar3.xml" path="/components/"/>
+    <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 9 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueGiftUI.cs

@@ -8,12 +8,13 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnClose;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
         public GButton m_btnRule;
         public GButton m_btnGet;
         public GList m_listGet;
         public GList m_listBuy;
-        public GTextField m_txtTips;
+        public GGroup m_grpTips;
         public const string URL = "ui://tw70qm9dpvb45h";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueGiftUI";
@@ -62,22 +63,24 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_listGet = (GList)comp.GetChild("listGet");
             m_listBuy = (GList)comp.GetChild("listBuy");
-            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_grpTips = (GGroup)comp.GetChild("grpTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnClose = null;
+            m_loaBg = null;
+            m_btnBack = null;
             m_btnRule = null;
             m_btnGet = null;
             m_listGet = null;
             m_listBuy = null;
-            m_txtTips = null;
+            m_grpTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemBottom.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_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 const string URL = "ui://tw70qm9d9jv676";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftBuyItemBottom";
+        private static UI_ListGiftBuyItemBottom _proxy;
+
+        public static UI_ListGiftBuyItemBottom Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftBuyItemBottom();
+            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_ListGiftBuyItemBottom Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftBuyItemBottom();
+            }
+            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_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");
+        }
+        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;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemBottom.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6ce7861fa5a4c4e47af2df4db75b38f4
+guid: e3458e730d0f95b4ba8648d703c724aa
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemCenter.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_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 const string URL = "ui://tw70qm9d9jv675";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftBuyItemCenter";
+        private static UI_ListGiftBuyItemCenter _proxy;
+
+        public static UI_ListGiftBuyItemCenter Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftBuyItemCenter();
+            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_ListGiftBuyItemCenter Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftBuyItemCenter();
+            }
+            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_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");
+        }
+        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;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemCenter.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d9f70fe5ba8a0b34fbb75a6e04a0079f
+guid: 326c59154d1e8e544961767366830972
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 16 - 16
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemTop.cs

@@ -4,24 +4,24 @@ using FairyGUI;
 
 namespace UI.League
 {
-    public partial class UI_ListGiftBuyItem
+    public partial class UI_ListGiftBuyItemTop
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GList m_listGift;
-        public GButton m_btnBuy;
         public GTextField m_txtCount;
+        public GButton m_btnBuy;
         public GComponent m_comCost;
-        public GGroup m_grpLeader;
+        public GList m_listGift;
         public GTextField m_txtTime;
+        public GLoader m_loaType;
         public const string URL = "ui://tw70qm9dpvb44z";
         public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "ListGiftBuyItem";
-        private static UI_ListGiftBuyItem _proxy;
+        public const string RES_NAME = "ListGiftBuyItemTop";
+        private static UI_ListGiftBuyItemTop _proxy;
 
-        public static UI_ListGiftBuyItem Create(GObject gObject = null)
+        public static UI_ListGiftBuyItemTop Create(GObject gObject = null)
         {
-            var ui = new UI_ListGiftBuyItem();
+            var ui = new UI_ListGiftBuyItemTop();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.League
             return ui;
         }
 
-        public static UI_ListGiftBuyItem Proxy(GObject gObject = null)
+        public static UI_ListGiftBuyItemTop Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListGiftBuyItem();
+                _proxy = new UI_ListGiftBuyItemTop();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -62,22 +62,22 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
             m_comCost = (GComponent)comp.GetChild("comCost");
-            m_grpLeader = (GGroup)comp.GetChild("grpLeader");
+            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_listGift = null;
-            m_btnBuy = null;
             m_txtCount = null;
+            m_btnBuy = null;
             m_comCost = null;
-            m_grpLeader = null;
+            m_listGift = null;
             m_txtTime = null;
+            m_loaType = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItemTop.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemBottom.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_ListGiftGetItemBottom
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaType;
+        public GLoader m_loaIcon;
+        public GList m_listGift;
+        public const string URL = "ui://tw70qm9d9jv674";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftGetItemBottom";
+        private static UI_ListGiftGetItemBottom _proxy;
+
+        public static UI_ListGiftGetItemBottom Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftGetItemBottom();
+            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_ListGiftGetItemBottom Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftGetItemBottom();
+            }
+            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;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemBottom.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemCenter.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_ListGiftGetItemCenter
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaType;
+        public GLoader m_loaIcon;
+        public GList m_listGift;
+        public const string URL = "ui://tw70qm9d9jv673";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftGetItemCenter";
+        private static UI_ListGiftGetItemCenter _proxy;
+
+        public static UI_ListGiftGetItemCenter Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftGetItemCenter();
+            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_ListGiftGetItemCenter Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftGetItemCenter();
+            }
+            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;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemCenter.cs.meta

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

+ 13 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemTop.cs

@@ -4,19 +4,21 @@ using FairyGUI;
 
 namespace UI.League
 {
-    public partial class UI_ListGiftGetItem
+    public partial class UI_ListGiftGetItemTop
     {
         public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaType;
         public GLoader m_loaIcon;
         public GList m_listGift;
         public const string URL = "ui://tw70qm9dpvb45i";
         public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "ListGiftGetItem";
-        private static UI_ListGiftGetItem _proxy;
+        public const string RES_NAME = "ListGiftGetItemTop";
+        private static UI_ListGiftGetItemTop _proxy;
 
-        public static UI_ListGiftGetItem Create(GObject gObject = null)
+        public static UI_ListGiftGetItemTop Create(GObject gObject = null)
         {
-            var ui = new UI_ListGiftGetItem();
+            var ui = new UI_ListGiftGetItemTop();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +27,11 @@ namespace UI.League
             return ui;
         }
 
-        public static UI_ListGiftGetItem Proxy(GObject gObject = null)
+        public static UI_ListGiftGetItemTop Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListGiftGetItem();
+                _proxy = new UI_ListGiftGetItemTop();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,11 +58,15 @@ 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");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_loaType = null;
             m_loaIcon = null;
             m_listGift = null;
             if(disposeTarget && target != null)

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftGetItemTop.cs.meta

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

+ 51 - 11
GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs

@@ -35,12 +35,14 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300003;
             _ui.m_listBuy.itemRenderer = RenderListBuyItem;
+            _ui.m_listBuy.itemProvider = GetListBuyItemResource;
             _ui.m_listGet.itemRenderer = RenderListGetItem;
+            _ui.m_listGet.itemProvider = GetListGetItemResource;
         }
         protected override void AddEventListener()
         {
@@ -67,7 +69,10 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBuyList);
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
         }
-
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueGiftView).FullName);
+        }
         private void OnBtnCreatClick()
         {
 
@@ -81,7 +86,7 @@ namespace GFGGame
         {
             _getDatas = LeagueDataManager.Instance.GetGiftGetDatas();
             _ui.m_listGet.numItems = _getDatas.Count;
-            _ui.m_txtTips.visible = _getDatas.Count == 0;
+            _ui.m_grpTips.visible = _getDatas.Count == 0;
         }
         private void UpdateBuyList()
         {
@@ -90,23 +95,24 @@ namespace GFGGame
         }
         private void RenderListGetItem(int index, GObject obj)
         {
-            UI_ListGiftGetItem item = UI_ListGiftGetItem.Proxy(obj);
+            UI_ListGiftGetItemTop item = UI_ListGiftGetItemTop.Proxy(obj);
             if (item.m_listGift.data == null)
             {
                 item.m_listGift.itemRenderer = RenderListRewardItem;
             }
             item.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
             item.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
-            UI_ListGiftGetItem.ProxyEnd();
+            UI_ListGiftGetItemTop.ProxyEnd();
         }
         private void RenderListBuyItem(int index, GObject obj)
         {
-            UI_ListGiftBuyItem item = UI_ListGiftBuyItem.Proxy(obj);
+            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_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("(剩余{0}天)", day);
+            // 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]);
 
             if (item.m_listGift.data == null)
@@ -122,7 +128,7 @@ namespace GFGGame
             }
             item.m_btnBuy.data = buyData;
 
-            UI_ListGiftBuyItem.ProxyEnd();
+            UI_ListGiftBuyItemTop.ProxyEnd();
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
@@ -133,10 +139,39 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetComItemScale = 0.6f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
         }
-
+        private string GetListGetItemResource(int index)
+        {
+            if (index < _ui.m_listBuy.columnCount)
+            {
+                return "ui://League/ListGiftGetItemTop";
+            }
+            else if (index >= _ui.m_listBuy.numItems - _ui.m_listBuy.columnCount - 1)
+            {
+                return "ui://League/ListGiftGetItemBottom";
+            }
+            else
+            {
+                return "ui://League/ListGiftGetItemCenter";
+            }
+        }
+        private string GetListBuyItemResource(int index)
+        {
+            if (index < _ui.m_listBuy.columnCount)
+            {
+                return "ui://League/ListGiftBuyItemTop";
+            }
+            else if (index >= _ui.m_listBuy.numItems - _ui.m_listBuy.columnCount - 1)
+            {
+                return "ui://League/ListGiftBuyItemBottom";
+            }
+            else
+            {
+                return "ui://League/ListGiftBuyItemCenter";
+            }
+        }
         private void OnBtnBuyClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -171,7 +206,12 @@ namespace GFGGame
         }
         private void OnBtnGetClick()
         {
-            // LeagueSproxy.ReqGetLeagueWelfare().Coroutine();
+            // bool result = await LeagueSproxy.ReqGetLeagueWelfare();
+            // if (result)
+            // {
+            //     UpdateGetList();
+            // }
+            LeagueSproxy.ReqGetLeagueWelfare().Coroutine();
         }
     }
 }

二進制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 3bcc0ba1972d24d4ea99cf5656ccde9b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5b4e83d805a4ef44db436f60fb498bac
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: ada20b19d874e3245aec04bb9d143a92
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二進制
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


Some files were not shown because too many files changed in this diff