zhaoyang 2 жил өмнө
parent
commit
06758dc45e
81 өөрчлөгдсөн 908 нэмэгдсэн , 231 устгасан
  1. 0 0
      FGUIProject/assets/CommonGame/components/BtnClose.xml
  2. 1 1
      FGUIProject/assets/CommonGame/components/ComCost.xml
  3. 4 4
      FGUIProject/assets/CommonGame/components/ComCostCurrency.xml
  4. 23 0
      FGUIProject/assets/CommonGame/components/ComHead1.xml
  5. 24 0
      FGUIProject/assets/CommonGame/components/ComHead2.xml
  6. 1 1
      FGUIProject/assets/CommonGame/components/ComHeadLv.xml
  7. 10 0
      FGUIProject/assets/CommonGame/components/ComHeadLv1.xml
  8. 7 0
      FGUIProject/assets/CommonGame/components/ComHeadWithLv2.xml
  9. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_db_lvl.png
  10. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_huizhangdk.png
  11. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_zjm_sztxk.png
  12. 9 2
      FGUIProject/assets/CommonGame/package.xml
  13. 9 9
      FGUIProject/assets/League/LeagueApplyUI.xml
  14. 58 32
      FGUIProject/assets/League/LeagueConstructUI.xml
  15. 6 6
      FGUIProject/assets/League/LeagueMemberLogUI.xml
  16. 2 1
      FGUIProject/assets/League/LeaguePrayUI.xml
  17. 28 16
      FGUIProject/assets/League/LeagueUI.xml
  18. 3 3
      FGUIProject/assets/League/components/Button17.xml
  19. 5 4
      FGUIProject/assets/League/components/Button2.xml
  20. 4 2
      FGUIProject/assets/League/components/Button20.xml
  21. 5 8
      FGUIProject/assets/League/components/Button3.xml
  22. 3 2
      FGUIProject/assets/League/components/ButtonModle2.xml
  23. 3 2
      FGUIProject/assets/League/components/ButtonModle3.xml
  24. 6 2
      FGUIProject/assets/League/components/ButtonModle4.xml
  25. 9 4
      FGUIProject/assets/League/components/ButtonModle5.xml
  26. 3 2
      FGUIProject/assets/League/components/ButtonModle6.xml
  27. 9 7
      FGUIProject/assets/League/components/ButtonModle7.xml
  28. 4 4
      FGUIProject/assets/League/components/ButtonToggle.xml
  29. 8 7
      FGUIProject/assets/League/components/ComConstruct.xml
  30. 17 0
      FGUIProject/assets/League/components/ComConstruct1.xml
  31. 2 2
      FGUIProject/assets/League/components/ComLeagueHead.xml
  32. 4 4
      FGUIProject/assets/League/components/ComPary.xml
  33. 7 6
      FGUIProject/assets/League/components/ListApplyItem.xml
  34. 7 5
      FGUIProject/assets/League/components/ListLogItem.xml
  35. 3 5
      FGUIProject/assets/League/package.xml
  36. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  37. 2 2
      GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs
  38. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostColor1.cs
  39. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostColor1.cs.meta
  40. 78 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs
  41. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs.meta
  42. 78 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs
  43. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs.meta
  44. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs
  45. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs.meta
  46. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs
  47. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs.meta
  48. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs
  49. 76 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs
  50. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs.meta
  51. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button3.cs
  52. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ButtonModle4.cs
  53. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ButtonModle5.cs
  54. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComConstruct1.cs
  55. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComConstruct1.cs.meta
  56. 3 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueApplyUI.cs
  57. 25 21
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueConstructUI.cs
  58. 3 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberLogUI.cs
  59. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeaguePrayUI.cs
  60. 9 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs
  61. 2 2
      GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs
  62. 1 6
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs
  63. 26 16
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueConstructView.cs
  64. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs
  65. 2 6
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberLogView.cs
  66. 4 4
      GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs
  67. 0 1
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs
  68. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  69. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  70. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  71. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  72. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  73. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  74. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  75. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  76. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  77. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  78. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  79. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  80. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  81. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 0 - 0
FGUIProject/assets/CommonGame/components/BtnCloose.xml → FGUIProject/assets/CommonGame/components/BtnClose.xml


+ 1 - 1
FGUIProject/assets/CommonGame/components/ComCost.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,46">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>

+ 4 - 4
FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

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

+ 23 - 0
FGUIProject/assets/CommonGame/components/ComHead1.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,230" overflow="hidden" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="可见"/>
+    <remark page="1" value="不可见"/>
+  </controller>
+  <displayList>
+    <image id="n43_jcej" name="n43" src="jcejtkj" fileName="images/grxx_123.png" xy="33,40" pivot="0.5,0.5" size="160,160" group="n41_r9ri">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n39_r9ri" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="30,37" pivot="0.5,0.5" group="n41_r9ri">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n35_r9ri" name="n35" src="o9gh43" fileName="imagesNew/lm_zjm_sztxk.png" xy="28,35" pivot="0.5,0.5" size="170,171" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <group id="n41_r9ri" name="n41" xy="0,13" size="230,203"/>
+  </displayList>
+</component>

+ 24 - 0
FGUIProject/assets/CommonGame/components/ComHead2.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,230" overflow="hidden" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="可见"/>
+    <remark page="1" value="不可见"/>
+  </controller>
+  <displayList>
+    <image id="n43_jcej" name="n43" src="jcejtkj" fileName="images/grxx_123.png" xy="27,39" pivot="0.5,0.5" size="160,160" group="n41_r9ri">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n39_r9ri" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="24,35" pivot="0.5,0.5" group="n44_o9gh">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n35_r9ri" name="n35" src="a0cf2l" fileName="imagesNew/lm_huizhangdk.png" xy="10,18" pivot="0.5,0.5" size="209,211" group="n44_o9gh" aspect="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <group id="n44_o9gh" name="n44" xy="10,18" size="209,211" group="n41_r9ri"/>
+    <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <group id="n41_r9ri" name="n41" xy="0,13" size="230,216"/>
+  </displayList>
+</component>

+ 1 - 1
FGUIProject/assets/CommonGame/components/ComLv.xml → FGUIProject/assets/CommonGame/components/ComHeadLv.xml

@@ -2,7 +2,7 @@
 <component size="42,43">
   <displayList>
     <image id="n2_psph" name="n2" src="psphtkf" fileName="imagesExport/zjm_dj_1.png" xy="0,0" group="n4_psph"/>
-    <text id="n3_psph" name="txtLvl" xy="9,6" size="22,29" group="n4_psph" fontSize="20" color="#ffffff" align="center" text="--">
+    <text id="n3_psph" name="txtLvl" xy="9,6" size="27,29" group="n4_psph" fontSize="20" color="#ffffff" align="center" text="--">
       <relation target="n2_psph" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n4_psph" name="n4" xy="0,0" size="42,43"/>

+ 10 - 0
FGUIProject/assets/CommonGame/components/ComHeadLv1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="60,60">
+  <displayList>
+    <image id="n2_psph" name="n2" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" xy="0,0" size="60,60" group="n4_psph" aspect="true"/>
+    <text id="n3_psph" name="txtLvl" xy="10,0" size="40,52" group="n4_psph" font="ui://eg2y0ldpa0cftks" fontSize="38" color="#fffcf2" align="center" text="10">
+      <relation target="n2_psph" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n4_psph" name="n4" xy="0,0" size="60,60"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/CommonGame/components/ComHeadWithLv2.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,230">
+  <displayList>
+    <component id="n1_psph" name="comHead" src="o9ghtlq" fileName="components/ComHead2.xml" xy="0,0"/>
+    <component id="n2_psph" name="comLv" src="o9ghtlr" fileName="components/ComHeadLv1.xml" xy="146,150"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/League/images/lm_db_lvl.png → FGUIProject/assets/CommonGame/imagesNew/lm_db_lvl.png


+ 0 - 0
FGUIProject/assets/League/images/lm_huizhangdk.png → FGUIProject/assets/CommonGame/imagesNew/lm_huizhangdk.png


+ 0 - 0
FGUIProject/assets/League/images/lm_zjm_sztxk.png → FGUIProject/assets/CommonGame/imagesNew/lm_zjm_sztxk.png


+ 9 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -214,7 +214,7 @@
     <image id="psphtkd" name="cqxf_anniu.png" path="/imagesExport/" exported="true"/>
     <image id="psphtke" name="kp_mudan.jpg" path="/imagesExport/" exported="true"/>
     <image id="psphtkf" name="zjm_dj_1.png" path="/imagesExport/" exported="true"/>
-    <component id="psphq" name="ComLv.xml" path="/components/" exported="true"/>
+    <component id="psphq" name="ComHeadLv.xml" path="/components/" exported="true"/>
     <component id="psph10" name="ComHeadWithLv.xml" path="/components/" exported="true"/>
     <component id="psphtkg" name="BtnRule.xml" path="/components/" exported="true"/>
     <image id="jcejtkh" name="beizif.png" path="/images/"/>
@@ -245,7 +245,7 @@
     <font id="a0cftl0" name="FangZhengHeiTiJianTi-1.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="a0cftl1" name="back2.png" path="/imagesNew/"/>
     <image id="a0cf2i" name="back.png" path="/imagesNew/"/>
-    <component id="a0cftl2" name="BtnCloose.xml" path="/components/" exported="true"/>
+    <component id="a0cftl2" name="BtnClose.xml" path="/components/" exported="true"/>
     <image id="wm60tl4" name="grxx_2000012_1.png" path="/images/" exported="true"/>
     <image id="wm60tl7" name="grxx_xtkk_1.png" path="/images/"/>
     <component id="qkjstl8" name="ComHeadWithLv1.xml" path="/components/" exported="true"/>
@@ -270,6 +270,13 @@
     <image id="o9ghtlk" name="hz_bq_shuxing_3.png" path="/imagesNew/" exported="true"/>
     <image id="o9ghtll" name="hz_bq_shuxing_4.png" path="/imagesNew/" exported="true"/>
     <component id="o9ghtln" name="ComCostColor1.xml" path="/components/" exported="true"/>
+    <component id="o9ghtlo" name="ComHead1.xml" path="/components/" exported="true"/>
+    <image id="o9gh43" name="lm_zjm_sztxk.png" path="/imagesNew/"/>
+    <component id="o9ghtlp" name="ComHeadWithLv2.xml" path="/components/" exported="true"/>
+    <component id="o9ghtlq" name="ComHead2.xml" path="/components/" exported="true"/>
+    <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 9 - 9
FGUIProject/assets/League/LeagueApplyUI.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,902">
   <displayList>
-    <loader id="n7_wm60" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <component id="n6_wm60" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <image id="n8_o9gh" name="n8" src="wm6038" fileName="images/lm_db_duan.png" xy="0,0"/>
+    <image id="n9_o9gh" name="n9" src="o9gh4p" fileName="images/biaotizi_9.png" xy="201,74"/>
+    <component id="n6_wm60" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="892,14">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="742,224" size="29,29">
-      <Button icon="ui://eg2y0ldpjcej2k"/>
+    <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="642,86" size="36,37">
+      <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <list id="n4_rv09" name="list" xy="90,266" size="892,1367" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
+    <list id="n4_rv09" name="list" xy="140,165" size="820,531" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -21,6 +20,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n5_rv09" name="btnNoCheck" src="rv0920" fileName="components/ButtonToggle.xml" xy="492,1749"/>
+    <component id="n5_rv09" name="btnNoCheck" src="rv0920" fileName="components/ButtonToggle.xml" xy="592,769"/>
+    <text id="n10_o9gh" name="n10" xy="398,767" size="178,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" text="无需审核可加入"/>
   </displayList>
 </component>

+ 58 - 32
FGUIProject/assets/League/LeagueConstructUI.xml

@@ -1,48 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1000">
+<component size="1080,1100">
   <displayList>
-    <image id="n38_wm60" name="n38" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
-    <loader id="n0_rv09" name="loaIcon" xy="179,225" size="167,167" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n1_rv09" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="302,348" group="n7_rv09"/>
-    <text id="n2_rv09" name="txtName" xy="216,420" pivot="0.5,0" size="93,41" group="n7_rv09" fontSize="30" align="center" text="宴客厅"/>
-    <group id="n7_rv09" name="n7" xy="179,225" size="167,237" group="n10_rv09"/>
-    <component id="n8_rv09" name="comHall0" src="rv0925" fileName="components/ComConstruct.xml" xy="98,496" group="n10_rv09">
+    <image id="n38_wm60" name="n38" src="o9gh4i" fileName="images/lm_db_2.png" xy="0,32"/>
+    <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
+    <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
+    <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
+    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09"/>
+    <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
+    <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,48" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
+    <image id="n40_o9gh" name="n40" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="300,382" group="n44_o9gh" pkg="eg2y0ldp"/>
+    <text id="n41_o9gh" name="txtLv0" xy="301,376" pivot="0.5,0" size="35,44" group="n44_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
+    <group id="n44_o9gh" name="n44" xy="300,376" size="39,45" group="n7_rv09"/>
+    <group id="n7_rv09" name="n7" xy="118,187" size="274,736" group="n10_rv09"/>
+    <component id="n8_rv09" name="comHall0" src="rv0925" fileName="components/ComConstruct.xml" xy="130,487" group="n45_o9gh">
       <property target="txtDesc" propertyId="0" value="小酒馆等级"/>
     </component>
-    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="components/ComConstruct.xml" xy="98,554" group="n10_rv09">
+    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="components/ComConstruct.xml" xy="130,522" group="n45_o9gh">
       <property target="txtDesc" propertyId="0" value="小金库等级"/>
     </component>
-    <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="157,812" group="n10_rv09"/>
-    <group id="n10_rv09" name="n10" xy="98,225" size="295,647"/>
-    <loader id="n11_rv09" name="loaIcon1" xy="489,222" size="167,167" group="n14_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n12_rv09" name="comLv1" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="612,345" group="n14_rv09"/>
-    <text id="n13_rv09" name="txtName1" xy="526,417" pivot="0.5,0" size="93,41" group="n14_rv09" fontSize="30" align="center" text="小酒馆"/>
-    <group id="n14_rv09" name="n14" xy="489,222" size="167,237" group="n17_rv09"/>
-    <component id="n15_rv09" name="comHotel0" src="rv0925" fileName="components/ComConstruct.xml" xy="408,493" group="n17_rv09">
+    <group id="n45_o9gh" name="n45" xy="130,487" size="259,70" group="n10_rv09" advanced="true" layout="vt" excludeInvisibles="true"/>
+    <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
+    <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
+    <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
+    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh"/>
+    <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
+    <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,48" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
+    <image id="n52_o9gh" name="n52" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="594,382" group="n54_o9gh" pkg="eg2y0ldp"/>
+    <text id="n53_o9gh" name="txtLv1" xy="595,376" pivot="0.5,0" size="35,44" group="n54_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
+    <group id="n54_o9gh" name="n54" xy="594,376" size="39,45" group="n55_o9gh"/>
+    <group id="n55_o9gh" name="n55" xy="412,187" size="274,736" group="n17_rv09"/>
+    <component id="n15_rv09" name="comHotel0" src="rv0925" fileName="components/ComConstruct.xml" xy="424,487" group="n56_o9gh">
       <property target="txtDesc" propertyId="0" value="成员上限"/>
     </component>
-    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="components/ComConstruct.xml" xy="408,551" group="n17_rv09">
+    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="components/ComConstruct.xml" xy="424,522" group="n56_o9gh">
       <property target="txtDesc" propertyId="0" value="会花上限"/>
     </component>
-    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="components/ComConstruct.xml" xy="408,612" group="n17_rv09">
+    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="components/ComConstruct.xml" xy="424,557" group="n56_o9gh">
       <property target="txtDesc" propertyId="0" value="每日新加上限"/>
     </component>
-    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="components/ComConstruct.xml" xy="408,667" group="n17_rv09">
+    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="components/ComConstruct.xml" xy="424,592" group="n56_o9gh">
       <property target="txtDesc" propertyId="0" value="招募额外上限"/>
     </component>
-    <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="455,816" group="n17_rv09"/>
-    <group id="n17_rv09" name="n17" xy="408,222" size="295,654"/>
-    <loader id="n20_rv09" name="loaIcon2" xy="807,221" size="167,167" group="n23_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n21_rv09" name="comLv2" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="930,344" group="n23_rv09"/>
-    <text id="n22_rv09" name="txtName2" xy="844,416" pivot="0.5,0" size="93,41" group="n23_rv09" fontSize="30" align="center" text="小金库"/>
-    <group id="n23_rv09" name="n23" xy="807,221" size="167,237" group="n28_rv09"/>
-    <text id="n29_rv09" name="txtDesc" xy="797,493" size="182,41" group="n34_rv09" fontSize="30" align="center" text="资金存储上限"/>
-    <text id="n30_rv09" name="txtCurValue" xy="797,551" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <image id="n31_rv09" name="imgUp" src="rv0924" fileName="imageTest/bpjly_jtjt_3.png" xy="836,551" group="n33_rv09"/>
-    <text id="n32_rv09" name="txtNextAdd" xy="880,551" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <group id="n33_rv09" name="n33" xy="797,551" size="120,42" group="n34_rv09" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <group id="n34_rv09" name="n34" xy="797,493" size="182,100" group="n28_rv09"/>
-    <component id="n37_a0cf" name="btnUpLv2" src="a0cf31" fileName="components/Button20.xml" xy="786,811" group="n28_rv09"/>
-    <group id="n28_rv09" name="n28" xy="786,221" size="196,650"/>
+    <group id="n56_o9gh" name="n56" xy="424,487" size="259,140" group="n17_rv09" advanced="true" layout="vt" excludeInvisibles="true"/>
+    <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="454,792" group="n17_rv09"/>
+    <component id="n68_o9gh" name="btnTips" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="631,235" size="36,37" group="n17_rv09">
+      <Button icon="ui://tw70qm9do9gh4b"/>
+    </component>
+    <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
+    <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
+    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh"/>
+    <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
+    <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,48" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
+    <image id="n62_o9gh" name="n62" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="899,382" group="n64_o9gh" pkg="eg2y0ldp"/>
+    <text id="n63_o9gh" name="txtLv2" xy="900,376" pivot="0.5,0" size="35,44" group="n64_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
+    <group id="n64_o9gh" name="n64" xy="899,376" size="39,45" group="n65_o9gh"/>
+    <group id="n65_o9gh" name="n65" xy="717,187" size="274,736" group="n28_rv09"/>
+    <component id="n66_o9gh" name="comStore0" src="o9gh4x" fileName="components/ComConstruct1.xml" xy="706,487" group="n28_rv09">
+      <property target="txtDesc" propertyId="0" value="资金存储上限"/>
+    </component>
+    <component id="n37_a0cf" name="btnUpLv2" src="a0cf31" fileName="components/Button20.xml" xy="759,792" group="n28_rv09"/>
+    <group id="n28_rv09" name="n28" xy="706,187" size="295,736" group="n67_o9gh"/>
+    <group id="n67_o9gh" name="n67" xy="118,187" size="883,736" advanced="true"/>
+    <component id="n69_o9gh" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="344,968" size="36,37" group="n72_o9gh">
+      <Button icon="ui://tw70qm9do9gh4b"/>
+    </component>
+    <text id="n70_o9gh" name="n70" xy="389,966" size="202,35" group="n72_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#8d817a" text="雅集每日维护资金"/>
+    <component id="n71_o9gh" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="607,960" group="n72_o9gh" controller="c1,1"/>
+    <group id="n72_o9gh" name="n72" xy="344,960" size="392,46"/>
   </displayList>
 </component>

+ 6 - 6
FGUIProject/assets/League/LeagueMemberLogUI.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,944">
   <displayList>
-    <loader id="n8_wm60" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <component id="n7_wm60" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="91,125">
+    <image id="n9_o9gh" name="n9" src="wm6038" fileName="images/lm_db_duan.png" xy="0,0"/>
+    <image id="n10_o9gh" name="n10" src="o9gh4s" fileName="images/biaotizi_10.png" xy="203,74"/>
+    <component id="n7_wm60" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="894,13">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <list id="n6_rv09" name="list" xy="54,364" size="972,1312" overflow="scroll" defaultItem="ui://tw70qm9drv0923" autoClearItems="true">
+    <list id="n6_rv09" name="list" xy="142,160" size="837,558" overflow="scroll" defaultItem="ui://tw70qm9drv0923" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -17,5 +16,6 @@
       <item/>
     </list>
     <text id="n5_rv09" name="n5" xy="390,1792" pivot="0.5,0" size="333,41" fontSize="30" align="center" autoClearText="true" text="联盟信息只保留最近50条"/>
+    <text id="n11_o9gh" name="n11" xy="402,789" size="276,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#a5916f" text="雅集信息只保留最近50条"/>
   </displayList>
 </component>

+ 2 - 1
FGUIProject/assets/League/LeaguePrayUI.xml

@@ -2,6 +2,8 @@
 <component size="1080,1100">
   <displayList>
     <image id="n12_wm60" name="n12" src="o9gh4i" fileName="images/lm_db_2.png" xy="0,40"/>
+    <image id="n14_o9gh" name="n14" src="o9gh4r" fileName="images/biaotizi_7.png" xy="209,107"/>
+    <component id="n15_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="914,60"/>
     <component id="n9_rv09" name="comPary0" src="rv0929" fileName="components/ComPary.xml" xy="116,207">
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="白檀香"/>
@@ -14,6 +16,5 @@
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="天木香"/>
     </component>
-    <image id="n14_o9gh" name="n14" src="o9gh4r" fileName="images/biaotizi_7.png" xy="209,107"/>
   </displayList>
 </component>

+ 28 - 16
FGUIProject/assets/League/LeagueUI.xml

@@ -4,32 +4,44 @@
     <loader id="n0_u2u3" 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="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="204,315"/>
     <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="436,110" size="29,29">
-      <Button icon="ui://eg2y0ldpjcej2k"/>
+    <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37">
+      <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <component id="n17_u2u3" name="btnChangeNotice" src="u2u319" fileName="components/Button1.xml" xy="894,299"/>
-    <component id="n18_u2u3" name="btnMember" src="u2u31a" fileName="components/Button2.xml" xy="480,94">
+    <component id="n18_u2u3" name="btnMember" src="u2u31a" fileName="components/Button2.xml" xy="770,81">
       <Button title="雅集成员"/>
     </component>
-    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="757,94">
+    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81">
       <Button title="雅集建设"/>
     </component>
-    <text id="n10_u2u3" name="txtUnionName" xy="95,200" pivot="0.5,0" size="198,41" fontSize="30" align="center" autoClearText="true" text="联盟名字7个字"/>
+    <text id="n10_u2u3" name="txtUnionName" xy="250,317" pivot="0.5,0" size="212,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
-    <component id="n13_u2u3" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="275,247" scale="0.4,0.4"/>
-    <text id="n14_u2u3" name="txtLeaderName" xy="363,281" size="198,41" fontSize="30" autoClearText="true" text="会长名字7个字"/>
-    <text id="n15_u2u3" name="txtNotice" xy="291,334" size="642,81" fontSize="30" autoSize="none" autoClearText="true" text="联盟公告联盟公告联盟公告联盟公告联盟公告联盟公告"/>
-    <component id="n7_u2u3" name="n7" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,447" group="n9_u2u3"/>
-    <component id="n3_u2u3" name="btnPray" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,670" group="n9_u2u3"/>
-    <component id="n4_u2u3" name="n4" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,895" group="n9_u2u3"/>
-    <component id="n5_u2u3" name="n5" src="u2u310" fileName="components/ButtonModle4.xml" xy="663,1583" group="n9_u2u3"/>
-    <component id="n6_u2u3" name="n6" src="u2u312" fileName="components/ButtonModle5.xml" xy="118,1487" group="n9_u2u3"/>
-    <component id="n8_u2u3" name="n8" src="u2u316" fileName="components/ButtonModle7.xml" xy="617,1193" group="n9_u2u3"/>
-    <group id="n9_u2u3" name="n9" xy="70,447" size="1012,1495" advanced="true">
+    <text id="n14_u2u3" name="txtLeaderName" xy="850,339" size="162,34" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" autoClearText="true" text="会长名字7个字"/>
+    <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,308" size="444,136" group="n26_o9gh">
+      <relation target="n15_u2u3" sidePair="height-height"/>
+    </image>
+    <image id="n24_o9gh" name="n24" src="o9gh44" fileName="images/lm_zjm_mzkuang.png" xy="784,283" group="n26_o9gh"/>
+    <image id="n27_o9gh" name="n27" src="o9gh4a" fileName="images/lm_zjm_chkuang.png" xy="813,263" group="n26_o9gh"/>
+    <component id="n13_u2u3" name="comHead" src="o9ghtlo" fileName="components/ComHead1.xml" pkg="eg2y0ldp" xy="731,246" group="n26_o9gh" scale="0.4,0.4"/>
+    <component id="n17_u2u3" name="btnChangeNotice" src="u2u319" fileName="components/Button1.xml" xy="965,373" size="66,66" group="n26_o9gh">
+      <relation target="n25_o9gh" sidePair="right-right,bottom-bottom"/>
+      <Button icon="ui://tw70qm9dwm6034"/>
+    </component>
+    <text id="n28_o9gh" name="txtName" xy="818,287" size="52,34" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" leading="-4" autoClearText="true" text="联盟"/>
+    <text id="n15_u2u3" name="txtNotice" xy="617,339" size="396,69" group="n26_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="-4" autoSize="height" autoClearText="true" text="联盟公告联盟公告联盟公盟公联盟联盟公告联盟公告联盟"/>
+    <text id="n29_o9gh" name="n29" xy="819,260" size="39,26" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="18" color="#fffbed" text="社长"/>
+    <group id="n26_o9gh" name="n26" xy="599,246" size="444,230"/>
+    <component id="n7_u2u3" name="n7" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,446" group="n9_u2u3"/>
+    <component id="n3_u2u3" name="btnPray" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,669" group="n9_u2u3"/>
+    <component id="n4_u2u3" name="n4" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,894" group="n9_u2u3"/>
+    <component id="n5_u2u3" name="n5" src="u2u310" fileName="components/ButtonModle4.xml" xy="663,1582" group="n9_u2u3"/>
+    <component id="n6_u2u3" name="n6" src="u2u312" fileName="components/ButtonModle5.xml" xy="118,1486" group="n9_u2u3"/>
+    <component id="n8_u2u3" name="n8" src="u2u316" fileName="components/ButtonModle7.xml" xy="615,1263" group="n9_u2u3"/>
+    <group id="n9_u2u3" name="n9" xy="70,446" size="1012,1496" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

+ 3 - 3
FGUIProject/assets/League/components/Button17.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="144,43" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <text id="n3_u2u3" name="title" xy="71,7" pivot="0.5,0" size="53,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="144,43" aspect="true" url="ui://tw70qm9do9gh4m" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="51,4" pivot="0.5,0" size="41,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

+ 5 - 4
FGUIProject/assets/League/components/Button2.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="157,50" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <text id="n3_u2u3" name="title" xy="67,8" pivot="0.5,0" size="61,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=70}">
+    <image id="n6_o9gh" name="n6" src="o9gh41" fileName="images/lm_zjm_zykuang_2.png" xy="35,1"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="157,50" aspect="true" url="ui://tw70qm9do9gh4n" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="49,5" pivot="0.5,0" size="59,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=70}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <text id="n5_a0cf" name="txtCount" xy="197,9" size="61,42" fontSize="30" vars="true" text="{value=0}/{maxValue=70}"/>
+    <text id="n5_a0cf" name="txtCount" xy="165,5" pivot="0.5,0" size="74,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=70}/{maxValue=70}"/>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

+ 4 - 2
FGUIProject/assets/League/components/Button20.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="189,58" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="0"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="3"/>
   <displayList>
     <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
       <gearDisplay controller="button" pages="4"/>
@@ -12,7 +12,9 @@
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
     <text id="n5_a0cf" name="txtTip" xy="89,59" pivot="0.5,0" size="10,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" text=""/>
-    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="29,53" pivot="0.5,0.5" scale="0.8,0.8"/>
+    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,53" pivot="0.5,0.5" scale="0.8,0.8" controller="c1,1">
+      <relation target="" sidePair="center-center"/>
+    </component>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

+ 5 - 8
FGUIProject/assets/League/components/Button3.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="179,50" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" group="n6_u2u3" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <loader id="n5_u2u3" name="loaCoin" xy="196,0" size="60,60" group="n6_u2u3" url="ui://eg2y0ldpg3nf9q" autoSize="true">
-      <relation target="" sidePair="middle-middle"/>
-    </loader>
-    <text id="n7_a0cf" name="txtCount" xy="256,9" size="45,41" group="n6_u2u3" fontSize="30" vars="true" text="{value=0}/{maxValue=0}">
+    <image id="n9_o9gh" name="n9" src="o9gh41" fileName="images/lm_zjm_zykuang_2.png" xy="120,1" size="280,47"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="179,50" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale"/>
+    <text id="n7_a0cf" name="txtCount" xy="182,5" pivot="0.5,0" size="204,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=300000}/{maxValue=300000}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <group id="n6_u2u3" name="n6" xy="0,0" size="301,60" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n3_u2u3" name="title" xy="75,7" pivot="0.5,0" size="45,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="67,5" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

+ 3 - 2
FGUIProject/assets/League/components/ButtonModle2.xml

@@ -5,17 +5,18 @@
     <graph id="n2_lki4" name="holder" xy="280,271" size="0,0" group="n13_mzf8" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u3v" fileName="images/zjm_tptp_3.png" xy="-205,80" group="n13_mzf8"/>
+    <image id="n11_mzf8" name="n11" src="u2u3v" fileName="imageTest/zjm_tptp_3.png" xy="-205,80" group="n13_mzf8"/>
     <graph id="n4_lki4" name="holder1" xy="280,271" size="0,0" group="n13_mzf8" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="428,0" size="77,256" group="n13_mzf8" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n10_mzf8" name="icon1" xy="437,0" size="68,288" group="n13_mzf8" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n8_v95q" name="loaLockIcon" xy="429,0" size="76,255" group="n13_mzf8" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n16_mzf8" name="n16" xy="17,97" size="419,286" group="n13_mzf8"/>
+    <text id="n17_o9gh" name="n17" xy="453,71" size="39,149" group="n13_mzf8" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="茶艺学习"/>
     <group id="n13_mzf8" name="n13" xy="-205,0" size="772,476"/>
   </displayList>
   <Button/>

+ 3 - 2
FGUIProject/assets/League/components/ButtonModle3.xml

@@ -5,17 +5,18 @@
     <graph id="n2_lki4" name="holder" xy="163,236" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u3z" fileName="images/zjm_tptp_2.png" xy="0,22"/>
+    <image id="n11_mzf8" name="n11" src="u2u3z" fileName="imageTest/zjm_tptp_2.png" xy="0,22"/>
     <graph id="n4_lki4" name="holder1" xy="163,236" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="195,0" size="77,256" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n10_mzf8" name="icon1" xy="204,0" size="68,288" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n8_v95q" name="loaLockIcon" xy="196,0" size="76,255" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n14_mzf8" name="n14" xy="29,109" size="193,194"/>
+    <text id="n15_o9gh" name="n15" xy="220,69" size="39,149" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="雅集福利"/>
   </displayList>
   <Button/>
   <customProperty target="loaLockIcon" propertyId="1"/>

+ 6 - 2
FGUIProject/assets/League/components/ButtonModle4.xml

@@ -5,17 +5,21 @@
     <graph id="n2_lki4" name="holder" xy="155,279" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u311" fileName="images/zjm_tptp_5.png" xy="0,100"/>
+    <image id="n11_mzf8" name="n11" src="u2u311" fileName="imageTest/zjm_tptp_5.png" xy="0,100"/>
     <graph id="n4_lki4" name="holder1" xy="155,279" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="230,0" size="77,256" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n10_mzf8" name="icon1" xy="239,0" size="68,288" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n8_v95q" name="loaLockIcon" xy="231,0" size="76,255" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n13_mzf8" name="n13" xy="28,141" size="215,194"/>
+    <text id="n14_o9gh" name="n14" xy="255,70" size="39,149" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="雅集夜宴"/>
+    <image id="n15_o9gh" name="n15" src="o9gh49" fileName="images/lm_zjm_djs.png" xy="11,284" group="n17_o9gh"/>
+    <text id="n16_o9gh" name="txtTime" xy="113,284" pivot="0.5,0" size="88,39" group="n17_o9gh" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#fffcf1" align="center" text="进行中"/>
+    <group id="n17_o9gh" name="n17" xy="11,284" size="296,40"/>
   </displayList>
   <Button/>
   <customProperty target="loaLockIcon" propertyId="1"/>

+ 9 - 4
FGUIProject/assets/League/components/ButtonModle5.xml

@@ -5,17 +5,22 @@
     <graph id="n2_lki4" name="holder" xy="266,163" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u313" fileName="images/zjm_tptp_6.png" xy="-117,138"/>
+    <image id="n11_mzf8" name="n11" src="u2u313" fileName="imageTest/zjm_tptp_6.png" xy="-117,138"/>
     <graph id="n4_lki4" name="holder1" xy="266,163" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="453,3" size="77,256" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n12_mzf8" name="n12" xy="29,132" size="435,194"/>
+    <loader id="n10_mzf8" name="icon1" xy="-1,3" size="68,288" group="n14_o9gh" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
-    <loader id="n8_v95q" name="loaLockIcon" xy="454,3" size="76,255" url="ui://tw70qm9du2u3x" autoSize="true">
+    <loader id="n8_v95q" name="loaLockIcon" xy="-9,3" size="76,255" group="n14_o9gh" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
-    <loader id="n12_mzf8" name="n12" xy="29,132" size="435,194"/>
+    <text id="n13_o9gh" name="n13" xy="15,73" size="39,114" group="n14_o9gh" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="茶话会"/>
+    <group id="n14_o9gh" name="n14" xy="-9,3" size="76,288"/>
+    <image id="n15_o9gh" name="n15" src="o9gh49" fileName="images/lm_zjm_djs.png" xy="119,226" group="n17_o9gh"/>
+    <text id="n16_o9gh" name="txtTime" xy="221,226" pivot="0.5,0" size="88,39" group="n17_o9gh" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#fffcf1" align="center" text="进行中"/>
+    <group id="n17_o9gh" name="n17" xy="119,226" size="296,40"/>
   </displayList>
   <Button/>
   <customProperty target="loaLockIcon" propertyId="1"/>

+ 3 - 2
FGUIProject/assets/League/components/ButtonModle6.xml

@@ -5,17 +5,18 @@
     <graph id="n2_lki4" name="holder" xy="139,260" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u315" fileName="images/zjm_tptp_1.png" xy="-71,18"/>
+    <image id="n11_mzf8" name="n11" src="u2u315" fileName="imageTest/zjm_tptp_1.png" xy="-71,18"/>
     <graph id="n4_lki4" name="holder1" xy="139,260" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="205,3" size="77,256" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n10_mzf8" name="icon1" xy="201,3" size="68,288" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n8_v95q" name="loaLockIcon" xy="206,3" size="76,255" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n12_mzf8" name="n12" xy="70,22" size="130,502"/>
+    <text id="n13_o9gh" name="n13" xy="217,74" size="39,149" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="雅集祈福"/>
   </displayList>
   <Button/>
   <customProperty target="loaLockIcon" propertyId="1"/>

+ 9 - 7
FGUIProject/assets/League/components/ButtonModle7.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="339,281" opaque="false" extention="Button">
+<component size="339,226" opaque="false" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n2_lki4" name="holder" xy="168,139" size="0,0" touchable="false">
+    <graph id="n2_lki4" name="holder" xy="168,111" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <image id="n11_mzf8" name="n11" src="u2u317" fileName="images/zjm_tptp_4.png" xy="0,72"/>
-    <graph id="n4_lki4" name="holder1" xy="168,139" size="0,0" touchable="false">
+    <image id="n11_mzf8" name="n11" src="u2u317" fileName="imageTest/zjm_tptp_4.png" xy="0,0"/>
+    <graph id="n4_lki4" name="holder1" xy="168,111" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="262,3" size="77,256" url="ui://tw70qm9du2u3w" autoSize="true">
+    <loader id="n12_mzf8" name="n12" xy="4,0" size="258,194"/>
+    <loader id="n10_mzf8" name="icon1" xy="209,-7" size="68,288" group="n14_o9gh" url="ui://tw70qm9do9gh48" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
-    <loader id="n8_v95q" name="loaLockIcon" xy="263,3" size="76,255" url="ui://tw70qm9du2u3x" autoSize="true">
+    <loader id="n8_v95q" name="loaLockIcon" xy="201,-7" size="76,255" group="n14_o9gh" url="ui://tw70qm9du2u3x" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
-    <loader id="n12_mzf8" name="n12" xy="4,88" size="258,194"/>
+    <text id="n13_o9gh" name="n13" xy="225,63" size="39,149" group="n14_o9gh" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffcf1" align="center" leading="-4" autoSize="height" text="雅集商店"/>
+    <group id="n14_o9gh" name="n14" xy="201,-7" size="76,288"/>
   </displayList>
   <Button/>
   <customProperty target="loaLockIcon" propertyId="1"/>

+ 4 - 4
FGUIProject/assets/League/components/ButtonToggle.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="130,58" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+<component size="70,29" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_d4iw" name="n0" src="rv0921" fileName="images/grxx_yx_dk.png" xy="0,0">
+    <image id="n0_d4iw" name="n0" src="o9gh3z" fileName="images/an_close.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_d4iw" name="n1" src="rv0922" fileName="images/grxx_yx_gb.png" xy="0,0">
+    <image id="n1_d4iw" name="n1" src="o9gh4t" fileName="images/an_open.png" xy="0,0">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

+ 8 - 7
FGUIProject/assets/League/components/ComConstruct.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="295,42">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="259,35">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <text id="n3_rv09" name="txtDesc" xy="0,0" size="152,41" fontSize="30" align="center" text="小酒馆等级"/>
-    <text id="n4_rv09" name="txtCurValue" xy="180,0" size="37,41" fontSize="30" align="center" text="70"/>
-    <image id="n5_rv09" name="n5" src="rv0924" fileName="imageTest/bpjly_jtjt_3.png" xy="220,0" group="n7_a0cf"/>
-    <text id="n6_rv09" name="txtNextAdd" xy="257,0" size="37,41" group="n7_a0cf" fontSize="30" align="center" text="70"/>
-    <group id="n7_a0cf" name="n7" xy="220,0" size="74,42" advanced="true">
+    <text id="n3_rv09" name="txtDesc" xy="0,0" size="128,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" align="center" text="小酒馆等级"/>
+    <text id="n4_rv09" name="txtCurValue" xy="170,-2" pivot="1,0" size="31,39" group="n8_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" align="right" text="70"/>
+    <image id="n5_rv09" name="n5" src="o9gh4v" fileName="images/tb_up.png" xy="205,7" group="n7_a0cf"/>
+    <text id="n6_rv09" name="txtNextAdd" xy="225,-2" size="31,39" group="n7_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" text="70"/>
+    <group id="n7_a0cf" name="n7" xy="205,-2" size="51,39" group="n8_o9gh" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
+    <group id="n8_o9gh" name="n8" xy="170,-2" size="86,39" advanced="true"/>
   </displayList>
   <customProperty target="txtDesc" propertyId="0"/>
 </component>

+ 17 - 0
FGUIProject/assets/League/components/ComConstruct1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="295,62">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <text id="n3_rv09" name="txtDesc" xy="83,0" pivot="0.5,0" size="128,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" align="center" text="小酒馆等级"/>
+    <text id="n4_rv09" name="txtCurValue" xy="70,28" pivot="1,0" size="72,39" group="n8_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" align="right" text="16000"/>
+    <image id="n5_rv09" name="n5" src="o9gh4v" fileName="images/tb_up.png" xy="146,37" group="n7_a0cf"/>
+    <text id="n6_rv09" name="txtNextAdd" xy="166,28" size="58,39" group="n7_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" text="8000"/>
+    <group id="n7_a0cf" name="n7" xy="146,28" size="78,39" group="n8_o9gh" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+    <group id="n8_o9gh" name="n8" xy="70,28" size="154,39" advanced="true" layout="hz" colGap="4" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <customProperty target="txtDesc" propertyId="0"/>
+</component>

+ 2 - 2
FGUIProject/assets/League/components/ComLeagueHead.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="135,136">
   <displayList>
-    <image id="n15_a0cf" name="n15" src="a0cf2l" fileName="images/lm_huizhangdk.png" xy="0,0"/>
+    <image id="n15_a0cf" name="n15" src="a0cf2l" fileName="images/lm_huizhangdk.png" xy="0,0" pkg="eg2y0ldp"/>
     <loader id="n17_a0cf" name="loaUnionIcon" xy="0,0" size="135,135" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <image id="n16_a0cf" name="n16" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="93,86"/>
+    <image id="n16_a0cf" name="n16" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="93,86" pkg="eg2y0ldp"/>
     <text id="n18_a0cf" name="txtUnionLv" xy="105,85" pivot="0.5,0" size="16,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#fffcf2" align="center" text="1"/>
   </displayList>
 </component>

+ 4 - 4
FGUIProject/assets/League/components/ComPary.xml

@@ -11,11 +11,11 @@
     <loader id="n2_rv09" name="LoaIcon" xy="74,109" pivot="0.5,0" size="128,128" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
     <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,48" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>
     <text id="n9_a0cf" name="n9" xy="15,361" size="103,35" group="n17_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" text="每次祈福"/>
-    <component id="n4_rv09" name="comGain" src="o9ghtln" fileName="components/ComCostColor1.xml" pkg="eg2y0ldp" xy="170,355" group="n17_o9gh" controller="c1,1"/>
-    <group id="n17_o9gh" name="n17" xy="15,355" size="248,46"/>
+    <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="170,361" group="n17_o9gh" scale="0.7,0.7" controller="c1,1"/>
+    <group id="n17_o9gh" name="n17" xy="15,361" size="289,46"/>
     <text id="n10_a0cf" name="n10" xy="15,405" pivot="0.5,0" size="153,35" group="n11_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" align="center" text="每日首次祈福"/>
-    <component id="n6_rv09" name="comFirstGain" src="o9ghtln" fileName="components/ComCostColor1.xml" pkg="eg2y0ldp" xy="169,401" group="n11_a0cf" controller="c1,1"/>
-    <group id="n11_a0cf" name="n11" xy="15,401" size="247,46" advanced="true">
+    <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="169,406" group="n11_a0cf" scale="0.7,0.7" controller="c1,1"/>
+    <group id="n11_a0cf" name="n11" xy="15,405" size="288,47" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
     <text id="n18_o9gh" name="n18" xy="61,522" pivot="0.5,0" size="94,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#915e15" align="center" letterSpacing="-3" ubb="true" vars="true" text="今日祈福"/>

+ 7 - 6
FGUIProject/assets/League/components/ListApplyItem.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="885,230">
+<component size="821,121">
   <displayList>
-    <component id="n1_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <text id="n4_a0cf" name="txtName" xy="216,102" size="40,42" fontSize="30" text=""/>
-    <component id="n2_rv09" name="btnAgree" src="rv091x" fileName="components/Button17.xml" xy="464,96">
+    <component id="n1_rv09" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,-12" scale="0.55,0.55"/>
+    <text id="n4_a0cf" name="txtName" xy="144,43" size="178,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#923c1a" text="玩家名字七个字"/>
+    <component id="n2_rv09" name="btnAgree" src="rv091x" fileName="components/Button17.xml" xy="495,39" size="144,43">
       <Button title="同意"/>
     </component>
-    <component id="n3_rv09" name="btnRefuse" src="rv091y" fileName="components/Button18.xml" xy="689,96">
-      <Button title="拒绝"/>
+    <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39">
+      <Button title="拒绝" icon="ui://tw70qm9do9gh4o"/>
     </component>
+    <image id="n5_o9gh" name="n5" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="0,108" size="816,12"/>
   </displayList>
 </component>

+ 7 - 5
FGUIProject/assets/League/components/ListLogItem.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="972,230">
+<component size="821,122">
   <displayList>
-    <component id="n0_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <text id="n1_rv09" name="txtName" xy="238,112" size="198,41" fontSize="30" autoClearText="true" text="玩家名字7个字"/>
-    <text id="n3_rv09" name="txtInfo" xy="526,110" pivot="0.5,0" size="122,41" fontSize="30" align="center" autoClearText="true" text="退出联盟"/>
-    <text id="n4_rv09" name="txtTime" xy="706,108" pivot="0.5,0" size="259,41" fontSize="30" align="center" autoClearText="true" text="2023.3.30 23:59:59"/>
+    <image id="n6_o9gh" name="n6" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="10,110" size="806,12"/>
+    <component id="n0_rv09" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="-38,-63" pivot="0.5,0.5" group="n7_o9gh" scale="0.55,0.55"/>
+    <text id="n1_rv09" name="txtName" xy="149,38" size="167,35" group="n7_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#923c1a" autoClearText="true" text="玩家名字7个字"/>
+    <text id="n3_rv09" name="txtInfo" xy="381,39" pivot="0.5,0" size="227,35" group="n7_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b6965f" align="center" autoClearText="true" text="从成员变更为副会长"/>
+    <text id="n4_rv09" name="txtTime" xy="682,35" pivot="0.5,0" size="113,39" group="n7_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" align="center" autoClearText="true" text="2023.3.30"/>
+    <group id="n7_o9gh" name="n7" xy="-38,-63" size="833,230"/>
   </displayList>
 </component>

+ 3 - 5
FGUIProject/assets/League/package.xml

@@ -68,8 +68,6 @@
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
     <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
     <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
-    <image id="a0cf2k" name="lm_db_lvl.png" path="/images/"/>
-    <image id="a0cf2l" name="lm_huizhangdk.png" path="/images/"/>
     <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
     <image id="a0cf2o" name="lm_an_yellow.png" path="/images/"/>
     <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
@@ -114,13 +112,12 @@
     <component id="wm603y" name="ListIconSmallItem.xml" path="/components/"/>
     <image id="o9gh3z" name="an_close.png" path="/images/"/>
     <image id="o9gh40" name="tanchuang.png" path="/images/"/>
-    <image id="o9gh41" name="lm_zjm_zykuang_2.png" path="/images/"/>
+    <image id="o9gh41" name="lm_zjm_zykuang_2.png" path="/images/" scale="9grid" scale9grid="57,11,114,22"/>
     <image id="o9gh42" name="lm_zjm_zykuang.png" path="/images/"/>
-    <image id="o9gh43" name="lm_zjm_sztxk.png" path="/images/"/>
     <image id="o9gh44" name="lm_zjm_mzkuang.png" path="/images/"/>
     <image id="o9gh45" name="lm_zjm_lmmzkuang.png" path="/images/"/>
     <image id="o9gh46" name="lm_zjm_jxz.png" path="/images/"/>
-    <image id="o9gh47" name="lm_zjm_gonggao.png" path="/images/"/>
+    <image id="o9gh47" name="lm_zjm_gonggao.png" path="/images/" scale="9grid" scale9grid="110,41,222,42"/>
     <image id="o9gh48" name="lm_zjm_gnkuang.png" path="/images/"/>
     <image id="o9gh49" name="lm_zjm_djs.png" path="/images/"/>
     <image id="o9gh4a" name="lm_zjm_chkuang.png" path="/images/"/>
@@ -146,6 +143,7 @@
     <image id="o9gh4u" name="lm_kuang_qifu.png" path="/images/"/>
     <image id="o9gh4v" name="tb_up.png" path="/images/"/>
     <component id="o9gh4w" name="Button141.xml" path="/components/"/>
+    <component id="o9gh4x" name="ComConstruct1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -101,7 +101,7 @@ namespace GFGGame
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("CommonGame"));
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("Main"));
 
-            LeagueSproxy.ReqGetLeagueInfo().Coroutine();
+            // LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             await ItemProxy.GetItemInfos();
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -214,9 +214,9 @@ namespace GFGGame
 
         public void UpdateLv(GComponent component, int lv)
         {
-            UI_ComLv comLv = UI_ComLv.Proxy(component);
+            UI_ComHeadLv comLv = UI_ComHeadLv.Proxy(component);
             comLv.m_txtLvl.text = lv > 0 ? lv.ToString() : "--";
-            UI_ComLv.ProxyEnd();
+            UI_ComHeadLv.ProxyEnd();
         }
     }
 }

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostColor1.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComCostColor1
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNeed;
+        public const string URL = "ui://eg2y0ldpo9ghtln";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComCostColor1";
+        private static UI_ComCostColor1 _proxy;
+
+        public static UI_ComCostColor1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCostColor1();
+            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_ComCostColor1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCostColor1();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaIcon = null;
+            m_txtNeed = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLv.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostColor1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95ce503cb5d3e6447b876e3dc497bcb9
+guid: 38e87674cfc1c04459ea377b3e0b4c79
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 78 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.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_ComHead1
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_ComHeadIcon m_comHead;
+        public GLoader m_loaBorder;
+        public const string URL = "ui://eg2y0ldpo9ghtlo";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHead1";
+        private static UI_ComHead1 _proxy;
+
+        public static UI_ComHead1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHead1();
+            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_ComHead1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHead1();
+            }
+            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_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_comHead.Dispose();
+            m_comHead = null;
+            m_loaBorder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead1.cs.meta

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

+ 78 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.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_ComHead2
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public UI_ComHeadIcon m_comHead;
+        public GLoader m_loaBorder;
+        public const string URL = "ui://eg2y0ldpo9ghtlq";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHead2";
+        private static UI_ComHead2 _proxy;
+
+        public static UI_ComHead2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHead2();
+            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_ComHead2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHead2();
+            }
+            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_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_comHead.Dispose();
+            m_comHead = null;
+            m_loaBorder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead2.cs.meta

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

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComLv.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComLv
+    public partial class UI_ComHeadLv
     {
         public GComponent target;
         public GTextField m_txtLvl;
         public const string URL = "ui://eg2y0ldppsphq";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComLv";
-        private static UI_ComLv _proxy;
+        public const string RES_NAME = "ComHeadLv";
+        private static UI_ComHeadLv _proxy;
 
-        public static UI_ComLv Create(GObject gObject = null)
+        public static UI_ComHeadLv Create(GObject gObject = null)
         {
-            var ui = new UI_ComLv();
+            var ui = new UI_ComHeadLv();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComLv Proxy(GObject gObject = null)
+        public static UI_ComHeadLv Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComLv();
+                _proxy = new UI_ComHeadLv();
             }
             var ui = _proxy;
             if(gObject == null)

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComHeadLv1
+    {
+        public GComponent target;
+        public GTextField m_txtLvl;
+        public const string URL = "ui://eg2y0ldpo9ghtlr";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHeadLv1";
+        private static UI_ComHeadLv1 _proxy;
+
+        public static UI_ComHeadLv1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHeadLv1();
+            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_ComHeadLv1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHeadLv1();
+            }
+            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_txtLvl = (GTextField)comp.GetChild("txtLvl");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLvl = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadLv1.cs.meta

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

+ 2 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv.cs

@@ -8,7 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public UI_ComHead m_comHead;
-        public UI_ComLv m_comLv;
+        public UI_ComHeadLv m_comLv;
         public const string URL = "ui://eg2y0ldppsph10";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComHeadWithLv";
@@ -57,7 +57,7 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
-            m_comLv = (UI_ComLv)UI_ComLv.Create(comp.GetChild("comLv"));
+            m_comLv = (UI_ComHeadLv)UI_ComHeadLv.Create(comp.GetChild("comLv"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 76 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs

@@ -0,0 +1,76 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComHeadWithLv2
+    {
+        public GComponent target;
+        public UI_ComHead2 m_comHead;
+        public UI_ComHeadLv1 m_comLv;
+        public const string URL = "ui://eg2y0ldpo9ghtlp";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHeadWithLv2";
+        private static UI_ComHeadWithLv2 _proxy;
+
+        public static UI_ComHeadWithLv2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHeadWithLv2();
+            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_ComHeadWithLv2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHeadWithLv2();
+            }
+            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_comHead = (UI_ComHead2)UI_ComHead2.Create(comp.GetChild("comHead"));
+            m_comLv = (UI_ComHeadLv1)UI_ComHeadLv1.Create(comp.GetChild("comLv"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead.Dispose();
+            m_comHead = null;
+            m_comLv.Dispose();
+            m_comLv = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs.meta

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

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button3.cs

@@ -7,7 +7,6 @@ namespace UI.League
     public partial class UI_Button3
     {
         public GButton target;
-        public GLoader m_loaCoin;
         public GTextField m_txtCount;
         public const string URL = "ui://tw70qm9du2u31b";
         public const string PACKAGE_NAME = "League";
@@ -56,12 +55,10 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaCoin = (GLoader)comp.GetChild("loaCoin");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaCoin = null;
             m_txtCount = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ButtonModle4.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GGraph m_holder1;
         public GLoader m_icon1;
         public GLoader m_loaLockIcon;
+        public GTextField m_txtTime;
         public const string URL = "ui://tw70qm9du2u310";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ButtonModle4";
@@ -62,6 +63,7 @@ namespace UI.League
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.League
             m_holder1 = null;
             m_icon1 = null;
             m_loaLockIcon = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ButtonModle5.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GGraph m_holder1;
         public GLoader m_icon1;
         public GLoader m_loaLockIcon;
+        public GTextField m_txtTime;
         public const string URL = "ui://tw70qm9du2u312";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ButtonModle5";
@@ -62,6 +63,7 @@ namespace UI.League
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.League
             m_holder1 = null;
             m_icon1 = null;
             m_loaLockIcon = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComConstruct1.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_ComConstruct1
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtDesc;
+        public GTextField m_txtCurValue;
+        public GTextField m_txtNextAdd;
+        public const string URL = "ui://tw70qm9do9gh4x";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ComConstruct1";
+        private static UI_ComConstruct1 _proxy;
+
+        public static UI_ComConstruct1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComConstruct1();
+            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_ComConstruct1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComConstruct1();
+            }
+            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_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtCurValue = (GTextField)comp.GetChild("txtCurValue");
+            m_txtNextAdd = (GTextField)comp.GetChild("txtNextAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtDesc = null;
+            m_txtCurValue = null;
+            m_txtNextAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueApplyUI.cs

@@ -7,8 +7,7 @@ namespace UI.League
     public partial class UI_LeagueApplyUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GButton m_btnClose;
         public GButton m_btnRule;
         public GList m_list;
         public GButton m_btnNoCheck;
@@ -59,16 +58,14 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_list = (GList)comp.GetChild("list");
             m_btnNoCheck = (GButton)comp.GetChild("btnNoCheck");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_btnback = null;
+            m_btnClose = null;
             m_btnRule = null;
             m_list = null;
             m_btnNoCheck = null;

+ 25 - 21
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueConstructUI.cs

@@ -7,28 +7,29 @@ namespace UI.League
     public partial class UI_LeagueConstructUI
     {
         public GComponent target;
+        public GButton m_btnClose;
         public GLoader m_loaIcon;
-        public GComponent m_comLv;
         public GTextField m_txtName;
+        public GTextField m_txtLv0;
         public UI_ComConstruct m_comHall0;
         public UI_ComConstruct m_comHall1;
         public UI_Button20 m_btnUpLv0;
         public GLoader m_loaIcon1;
-        public GComponent m_comLv1;
         public GTextField m_txtName1;
+        public GTextField m_txtLv1;
         public UI_ComConstruct m_comHotel0;
         public UI_ComConstruct m_comHotel1;
         public UI_ComConstruct m_comHotel2;
         public UI_ComConstruct m_comHotel3;
         public UI_Button20 m_btnUpLv1;
+        public GButton m_btnTips;
         public GLoader m_loaIcon2;
-        public GComponent m_comLv2;
         public GTextField m_txtName2;
-        public GTextField m_txtDesc;
-        public GTextField m_txtCurValue;
-        public GImage m_imgUp;
-        public GTextField m_txtNextAdd;
+        public GTextField m_txtLv2;
+        public UI_ComConstruct1 m_comStore0;
         public UI_Button20 m_btnUpLv2;
+        public GButton m_btnRule;
+        public GComponent m_comCost;
         public const string URL = "ui://tw70qm9du2u39";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueConstructUI";
@@ -76,34 +77,36 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_comLv = (GComponent)comp.GetChild("comLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtLv0 = (GTextField)comp.GetChild("txtLv0");
             m_comHall0 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHall0"));
             m_comHall1 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHall1"));
             m_btnUpLv0 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv0"));
             m_loaIcon1 = (GLoader)comp.GetChild("loaIcon1");
-            m_comLv1 = (GComponent)comp.GetChild("comLv1");
             m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtLv1 = (GTextField)comp.GetChild("txtLv1");
             m_comHotel0 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel0"));
             m_comHotel1 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel1"));
             m_comHotel2 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel2"));
             m_comHotel3 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel3"));
             m_btnUpLv1 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv1"));
+            m_btnTips = (GButton)comp.GetChild("btnTips");
             m_loaIcon2 = (GLoader)comp.GetChild("loaIcon2");
-            m_comLv2 = (GComponent)comp.GetChild("comLv2");
             m_txtName2 = (GTextField)comp.GetChild("txtName2");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_txtCurValue = (GTextField)comp.GetChild("txtCurValue");
-            m_imgUp = (GImage)comp.GetChild("imgUp");
-            m_txtNextAdd = (GTextField)comp.GetChild("txtNextAdd");
+            m_txtLv2 = (GTextField)comp.GetChild("txtLv2");
+            m_comStore0 = (UI_ComConstruct1)UI_ComConstruct1.Create(comp.GetChild("comStore0"));
             m_btnUpLv2 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv2"));
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_comCost = (GComponent)comp.GetChild("comCost");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnClose = null;
             m_loaIcon = null;
-            m_comLv = null;
             m_txtName = null;
+            m_txtLv0 = null;
             m_comHall0.Dispose();
             m_comHall0 = null;
             m_comHall1.Dispose();
@@ -111,8 +114,8 @@ namespace UI.League
             m_btnUpLv0.Dispose();
             m_btnUpLv0 = null;
             m_loaIcon1 = null;
-            m_comLv1 = null;
             m_txtName1 = null;
+            m_txtLv1 = null;
             m_comHotel0.Dispose();
             m_comHotel0 = null;
             m_comHotel1.Dispose();
@@ -123,15 +126,16 @@ namespace UI.League
             m_comHotel3 = null;
             m_btnUpLv1.Dispose();
             m_btnUpLv1 = null;
+            m_btnTips = null;
             m_loaIcon2 = null;
-            m_comLv2 = null;
             m_txtName2 = null;
-            m_txtDesc = null;
-            m_txtCurValue = null;
-            m_imgUp = null;
-            m_txtNextAdd = null;
+            m_txtLv2 = null;
+            m_comStore0.Dispose();
+            m_comStore0 = null;
             m_btnUpLv2.Dispose();
             m_btnUpLv2 = null;
+            m_btnRule = null;
+            m_comCost = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberLogUI.cs

@@ -7,8 +7,7 @@ namespace UI.League
     public partial class UI_LeagueMemberLogUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://tw70qm9du2u38";
         public const string PACKAGE_NAME = "League";
@@ -57,14 +56,12 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
-            m_btnback = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeaguePrayUI.cs

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeaguePrayUI
     {
         public GComponent target;
+        public GButton m_btnClose;
         public UI_ComPary m_comPary0;
         public UI_ComPary m_comPary1;
         public UI_ComPary m_comPary2;
@@ -57,12 +58,14 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_comPary0 = (UI_ComPary)UI_ComPary.Create(comp.GetChild("comPary0"));
             m_comPary1 = (UI_ComPary)UI_ComPary.Create(comp.GetChild("comPary1"));
             m_comPary2 = (UI_ComPary)UI_ComPary.Create(comp.GetChild("comPary2"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnClose = null;
             m_comPary0.Dispose();
             m_comPary0 = null;
             m_comPary1.Dispose();

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

@@ -10,13 +10,14 @@ namespace UI.League
         public GLoader m_loaBg;
         public GButton m_btnback;
         public GButton m_btnRule;
-        public GButton m_btnChangeNotice;
         public UI_Button2 m_btnMember;
         public UI_Button3 m_btnConstruct;
         public GTextField m_txtUnionName;
         public UI_ComLeagueHead m_comLeagueHead;
-        public GComponent m_comHead;
         public GTextField m_txtLeaderName;
+        public GComponent m_comHead;
+        public GButton m_btnChangeNotice;
+        public GTextField m_txtName;
         public GTextField m_txtNotice;
         public UI_ButtonModle2 m_btnPray;
         public const string URL = "ui://tw70qm9du2u32";
@@ -69,13 +70,14 @@ namespace UI.League
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
             m_btnMember = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMember"));
             m_btnConstruct = (UI_Button3)UI_Button3.Create(comp.GetChild("btnConstruct"));
             m_txtUnionName = (GTextField)comp.GetChild("txtUnionName");
             m_comLeagueHead = (UI_ComLeagueHead)UI_ComLeagueHead.Create(comp.GetChild("comLeagueHead"));
-            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLeaderName = (GTextField)comp.GetChild("txtLeaderName");
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtNotice = (GTextField)comp.GetChild("txtNotice");
             m_btnPray = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnPray"));
         }
@@ -84,7 +86,6 @@ namespace UI.League
             m_loaBg = null;
             m_btnback = null;
             m_btnRule = null;
-            m_btnChangeNotice = null;
             m_btnMember.Dispose();
             m_btnMember = null;
             m_btnConstruct.Dispose();
@@ -92,8 +93,10 @@ namespace UI.League
             m_txtUnionName = null;
             m_comLeagueHead.Dispose();
             m_comLeagueHead = null;
-            m_comHead = null;
             m_txtLeaderName = null;
+            m_comHead = null;
+            m_btnChangeNotice = null;
+            m_txtName = null;
             m_txtNotice = null;
             m_btnPray.Dispose();
             m_btnPray = null;

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -233,12 +233,12 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
 
         }
-        public static void UpdateItemNeedNum(GObject obj, int itemId, int needNum)
+        public static void UpdateItemNeedNum(GObject obj, int itemId, int needNum, bool checkNum = true, string color = "#716B59")
         {
             UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
             com.m_c1.selectedIndex = needNum == 0 ? 0 : 1;
             long hasNum = ItemDataManager.GetItemNum(itemId);
-            string strNeedNum = StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : "#716B59"); needNum.ToString();
+            string strNeedNum = !checkNum ? StringUtil.GetColorText(needNum.ToString(), color) : StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : color); needNum.ToString();
             com.m_txtNeed.text = strNeedNum;
 
 

+ 1 - 6
GameClient/Assets/Game/HotUpdate/Views/League/LeagueApplyView.cs

@@ -32,10 +32,9 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
             _ui.m_btnNoCheck.onClick.Add(OnBtnNoCheckClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnClose.onClick.Add(Hide);
 
             _ui.m_list.itemRenderer = RenderListItem;
 
@@ -63,10 +62,6 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
-        private void OnBtnBackClick()
-        {
-            ViewManager.GoBackFrom(typeof(LeagueApplyView).FullName);
-        }
         private void OnBtnRuleClick()
         {
             ViewManager.Show<RuleView>();

+ 26 - 16
GameClient/Assets/Game/HotUpdate/Views/League/LeagueConstructView.cs

@@ -39,6 +39,9 @@ namespace GFGGame
             _ui.m_btnUpLv1.target.data = LeagueBuildingType.Hotel;
             _ui.m_btnUpLv2.target.onClick.Add(OnBtnUpLvClick);
             _ui.m_btnUpLv2.target.data = LeagueBuildingType.Store;
+            _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
         }
         protected override void AddEventListener()
         {
@@ -64,7 +67,14 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
 
         }
-
+        private void OnBtnTipsClick()
+        {
+            ViewManager.Show<RuleView>();
+        }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>();
+        }
         private void OnBtnUpLvClick(EventContext context)
         {
             int type = (int)(context.sender as GObject).data;
@@ -114,7 +124,8 @@ namespace GFGGame
             LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
             LeagueHallCfg nextHallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv + 1);
 
-            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv, hallLv);
+            // ItemUtil.UpdateItemNeedNum(_ui.m_comCost,ConstItemID.LEAGUE_COIN,hallCfg.consumeArr)
+            _ui.m_txtLv0.text = hallLv.ToString();
 
             int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
             int hotelAdd = nextHallCfg == null ? 0 : nextHallCfg.levelHotel - hotelLv;
@@ -128,7 +139,7 @@ namespace GFGGame
             _ui.m_comHall1.m_txtNextAdd.text = storeAdd.ToString();
             _ui.m_comHall1.m_c1.selectedIndex = storeAdd > 0 ? 1 : 0;
 
-            _ui.m_btnUpLv0.target.touchable = nextHallCfg == null ? false : true;
+            _ui.m_btnUpLv0.target.enabled = nextHallCfg == null ? false : true;
             _ui.m_btnUpLv0.m_txtTip.text = nextHallCfg == null ? "已满级" : "";
             _ui.m_btnUpLv0.m_comCost.visible = nextHallCfg == null ? false : true;
             ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeArr[0][0], hallCfg.consumeArr[0][1]);
@@ -145,7 +156,7 @@ namespace GFGGame
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv);
             LeagueHotelCfg nextHotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv + 1);
 
-            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv1, hotelLv);
+            _ui.m_txtLv1.text = hotelLv.ToString();
 
             int memberLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limit - hotelCfg.limit;
             _ui.m_comHotel0.m_txtCurValue.text = hotelCfg.limit.ToString();
@@ -173,7 +184,7 @@ namespace GFGGame
             {
                 _ui.m_btnUpLv1.m_txtTip.text = "已满级";
                 _ui.m_btnUpLv1.m_comCost.visible = false;
-                _ui.m_btnUpLv1.target.touchable = false;
+                _ui.m_btnUpLv1.target.enabled = false;
             }
             else if (hallCfg.levelHotel == hotelLv)
             {
@@ -189,13 +200,13 @@ namespace GFGGame
                 }
                 _ui.m_btnUpLv1.m_txtTip.text = string.Format("宴客厅{0}级解锁", needHallLv);
                 _ui.m_btnUpLv1.m_comCost.visible = false;
-                _ui.m_btnUpLv1.target.touchable = false;
+                _ui.m_btnUpLv1.target.enabled = false;
             }
             else
             {
                 _ui.m_btnUpLv1.m_txtTip.text = "";
                 _ui.m_btnUpLv1.m_comCost.visible = true;
-                _ui.m_btnUpLv1.target.touchable = true;
+                _ui.m_btnUpLv1.target.enabled = true;
             }
         }
 
@@ -208,13 +219,12 @@ namespace GFGGame
             LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv);
             LeagueStoreCfg nextStoreCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv + 1);
 
-            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv2, storeLv);
-
+            _ui.m_txtLv2.text = storeLv.ToString();
             int coinLimitAdd = nextStoreCfg == null ? 0 : nextStoreCfg.limitStore - storeCfg.limitStore;
-            _ui.m_txtCurValue.text = storeCfg.limitStore.ToString();
-            _ui.m_txtNextAdd.text = coinLimitAdd.ToString();
-            _ui.m_txtNextAdd.visible = coinLimitAdd > 0 ? true : false;
-            _ui.m_imgUp.visible = coinLimitAdd > 0 ? true : false;
+
+            _ui.m_comStore0.m_txtCurValue.text = storeCfg.limitStore.ToString();
+            _ui.m_comStore0.m_txtNextAdd.text = coinLimitAdd.ToString();
+            _ui.m_comStore0.m_c1.selectedIndex = coinLimitAdd > 0 ? 1 : 0;
 
             ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv2.m_comCost, storeCfg.consumeArr[0][0], storeCfg.consumeArr[0][1]);
 
@@ -222,7 +232,7 @@ namespace GFGGame
             {
                 _ui.m_btnUpLv2.m_txtTip.text = "已满级";
                 _ui.m_btnUpLv2.m_comCost.visible = false;
-                _ui.m_btnUpLv2.target.touchable = false;
+                _ui.m_btnUpLv2.target.enabled = false;
             }
             else if (hallCfg.levelStore == storeLv)
             {
@@ -238,13 +248,13 @@ namespace GFGGame
                 }
                 _ui.m_btnUpLv2.m_txtTip.text = string.Format("宴客厅{0}级解锁", needHallLv);
                 _ui.m_btnUpLv2.m_comCost.visible = false;
-                _ui.m_btnUpLv2.target.touchable = false;
+                _ui.m_btnUpLv2.target.enabled = false;
             }
             else
             {
                 _ui.m_btnUpLv2.m_txtTip.text = "";
                 _ui.m_btnUpLv2.m_comCost.visible = true;
-                _ui.m_btnUpLv2.target.touchable = true;
+                _ui.m_btnUpLv2.target.enabled = true;
             }
         }
     }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs

@@ -33,6 +33,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
             _ui.m_btnKick.onClick.Add(OnBtnKickClick);
             _ui.m_btnAppoint0.target.onClick.Add(OnBtnAppointClick);

+ 2 - 6
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberLogView.cs

@@ -28,9 +28,8 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
         }
         protected override void AddEventListener()
         {
@@ -54,10 +53,7 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
-        private void OnBtnBackClick()
-        {
-            ViewManager.GoBackFrom(typeof(LeagueMemberLogView).FullName);
-        }
+
         private void RenderListItem(int index, GObject obj)
         {
             LeagueLogData logData = LeagueDataManager.Instance.ListLogDatas[index];

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {
@@ -66,8 +67,8 @@ namespace GFGGame
 
             LeaguePrayCfg prayCfg = LeaguePrayCfgArray.Instance.GetCfg(type);
             UI_ComPary item = UI_ComPary.Proxy(obj);
-            ItemUtil.UpdateItemNeedNum(item.m_comGain, prayCfg.bonusArr[0][0], prayCfg.bonusArr[0][1]);
-            ItemUtil.UpdateItemNeedNum(item.m_comFirstGain, prayCfg.bonusOnceArr[0][0], prayCfg.bonusOnceArr[0][1]);
+            ItemUtil.UpdateItemNeedNum(item.m_comGain, prayCfg.bonusArr[0][0], prayCfg.bonusArr[0][1], false, "#B38441");
+            ItemUtil.UpdateItemNeedNum(item.m_comFirstGain, prayCfg.bonusOnceArr[0][0], prayCfg.bonusOnceArr[0][1], false, "#B38441");
 
             int curTimes = LeagueDataManager.Instance.GetPrayTimesByType(type);
             if (type == LeaguePrayType.First && curTimes == 0)
@@ -79,8 +80,7 @@ namespace GFGGame
                 ItemUtil.UpdateItemNeedNum(item.m_btnPray.m_comCost, prayCfg.consumeArr[0][0], prayCfg.consumeArr[0][1]);
             }
             item.m_c1.selectedIndex = curTimes == 0 ? 0 : 1;
-            item.m_btnPray.target.touchable = curTimes < prayCfg.limit;
-            // item.m_btnPray.
+            item.m_btnPray.target.enabled = curTimes < prayCfg.limit;
             item.m_txtCount.SetVar("value", curTimes.ToString()).FlushVars();
             item.m_txtCount.SetVar("maxValue", prayCfg.limit.ToString()).FlushVars();
             if (item.m_btnPray.target.data == null)

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -118,7 +118,6 @@ namespace GFGGame
             LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(leagueData.StoreLevel);
             _ui.m_btnConstruct.m_txtCount.SetVar("maxValue", storeCfg.limitStore.ToString()).FlushVars();
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_COIN);
-            _ui.m_btnConstruct.m_loaCoin.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
 
         }
     }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes