zhaoyang 2 年之前
父节点
当前提交
4192b22d2e
共有 52 个文件被更改,包括 31 次插入262 次删除
  1. 0 1
      FGUIProject/assets/League/LeagueApplyUI.xml
  2. 0 1
      FGUIProject/assets/League/LeagueJoinUI.xml
  3. 0 1
      FGUIProject/assets/League/LeagueMemberLogUI.xml
  4. 0 1
      FGUIProject/assets/League/LeagueMemberUI.xml
  5. 5 6
      FGUIProject/assets/League/LeagueUI.xml
  6. 0 9
      FGUIProject/assets/League/components/Button1.xml
  7. 0 12
      FGUIProject/assets/League/components/Button13.xml
  8. 1 1
      FGUIProject/assets/League/components/Button14.xml
  9. 0 28
      FGUIProject/assets/League/components/Button141.xml
  10. 0 12
      FGUIProject/assets/League/components/Button16.xml
  11. 0 12
      FGUIProject/assets/League/components/Button18.xml
  12. 0 12
      FGUIProject/assets/League/components/Button19.xml
  13. 0 14
      FGUIProject/assets/League/components/Button2.xml
  14. 12 7
      FGUIProject/assets/League/components/Button3.xml
  15. 0 12
      FGUIProject/assets/League/components/Button7.xml
  16. 0 12
      FGUIProject/assets/League/components/Button9.xml
  17. 0 8
      FGUIProject/assets/League/components/ComGain.xml
  18. 二进制
      FGUIProject/assets/League/imageTest/bpjly_jtjt_3.png
  19. 二进制
      FGUIProject/assets/League/imageTest/grxx_bjbj.png
  20. 二进制
      FGUIProject/assets/League/imageTest/grxx_yx_dk.png
  21. 二进制
      FGUIProject/assets/League/imageTest/grxx_yx_gb.png
  22. 二进制
      FGUIProject/assets/League/imageTest/hz_zdzddg_1.png
  23. 二进制
      FGUIProject/assets/League/imageTest/hz_zdzddg_2.png
  24. 二进制
      FGUIProject/assets/League/imageTest/xz_wss.png
  25. 二进制
      FGUIProject/assets/League/imageTest/zjm_ej_suo.png
  26. 二进制
      FGUIProject/assets/League/imageTest/zjm_rk_6.png
  27. 二进制
      FGUIProject/assets/League/images/beizif.png
  28. 二进制
      FGUIProject/assets/League/images/lm_an_pink_2.png
  29. 0 0
      FGUIProject/assets/League/images/zjm_tptp_1.png
  30. 0 0
      FGUIProject/assets/League/images/zjm_tptp_2.png
  31. 0 0
      FGUIProject/assets/League/images/zjm_tptp_3.png
  32. 0 0
      FGUIProject/assets/League/images/zjm_tptp_4.png
  33. 0 0
      FGUIProject/assets/League/images/zjm_tptp_5.png
  34. 0 0
      FGUIProject/assets/League/images/zjm_tptp_6.png
  35. 6 27
      FGUIProject/assets/League/package.xml
  36. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button2.cs
  37. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button2.cs.meta
  38. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button3.cs
  39. 4 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs
  40. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  41. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  42. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  43. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  44. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  45. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  46. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  47. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  48. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  49. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  50. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  51. 二进制
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  52. 二进制
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 0 - 1
FGUIProject/assets/League/LeagueApplyUI.xml

@@ -5,7 +5,6 @@
     <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="642,86" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>

+ 0 - 1
FGUIProject/assets/League/LeagueJoinUI.xml

@@ -11,7 +11,6 @@
     <image id="n8_a0cf" name="n8" src="a0cf2n" fileName="images/lm_sousuok2.png" xy="103,193" group="n16_a0cf"/>
     <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n16_a0cf">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://tw70qm9du2u3b"/>
     </component>
     <text id="n2_u2u3" name="txtSearch" xy="133,201" size="509,42" group="n16_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fffcf7" autoSize="none" text="" input="true" prompt="[color=#E1D7CA]输入雅集名字,支持模糊搜索[/color]" maxLength="7"/>
     <component id="n3_u2u3" name="btnSearch" src="u2u31c" fileName="components/Button4.xml" xy="635,192" group="n16_a0cf">

+ 0 - 1
FGUIProject/assets/League/LeagueMemberLogUI.xml

@@ -5,7 +5,6 @@
     <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="142,160" size="837,558" overflow="scroll" defaultItem="ui://tw70qm9drv0923" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>

+ 0 - 1
FGUIProject/assets/League/LeagueMemberUI.xml

@@ -10,7 +10,6 @@
     </loader>
     <component id="n1_rv09" 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>
     <image id="n26_wm60" name="n26" src="wm6039" fileName="images/lm_db_chang_2.png" xy="0,152">
       <relation target="" sidePair="height-height"/>

+ 5 - 6
FGUIProject/assets/League/LeagueUI.xml

@@ -7,15 +7,14 @@
     <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="296,88" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <component id="n18_u2u3" name="btnMember" src="u2u31a" fileName="components/Button2.xml" xy="770,81">
+    <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
       <Button title="雅集成员"/>
     </component>
-    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81">
+    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
       <Button title="雅集建设"/>
     </component>
     <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个字"/>
@@ -27,7 +26,7 @@
     <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">
+    <component id="n17_u2u3" name="btnChangeNotice" src="rv091l" fileName="components/Button10.xml" xy="965,373" size="66,66" group="n26_o9gh">
       <relation target="n25_o9gh" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://tw70qm9dwm6034"/>
     </component>
@@ -35,8 +34,8 @@
     <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="n7_u2u3" name="btnPray" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,446" group="n9_u2u3"/>
+    <component id="n3_u2u3" name="n3" 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"/>

+ 0 - 9
FGUIProject/assets/League/components/Button1.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="39,36" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <loader id="n3_u2u3" name="icon" xy="0,0" size="39,36" url="ui://tw70qm9du2u318" autoSize="true"/>
-  </displayList>
-  <Button/>
-  <relation target="n3_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 12
FGUIProject/assets/League/components/Button13.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 1 - 1
FGUIProject/assets/League/components/Button14.xml

@@ -12,7 +12,7 @@
     <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true">
       <gearDisplay controller="touchable" pages="1"/>
     </loader>
-    <text id="n3_u2u3" name="title" xy="71,6" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="71,8" 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>
     <text id="n5_rv09" name="txtTime" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="剩余时间23:59">

+ 0 - 28
FGUIProject/assets/League/components/Button141.xml

@@ -1,28 +0,0 @@
-<?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" selected="0"/>
-  <controller name="touchable" pages="0,,1," selected="1">
-    <remark page="0" value="不可点击"/>
-    <remark page="1" value="可点击"/>
-  </controller>
-  <displayList>
-    <image id="n7_wm60" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
-      <gearDisplay controller="touchable" pages="0"/>
-    </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://tw70qm9do9gh4k" fill="scale" autoSize="true">
-      <gearDisplay controller="touchable" pages="1"/>
-    </loader>
-    <text id="n3_u2u3" name="title" xy="65,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="祈福">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-    <text id="n5_rv09" name="txtDesc" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="剩余时间23:59">
-      <gearDisplay controller="touchable" pages="0"/>
-    </text>
-    <component id="n6_a0cf" name="comcost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="28,54">
-      <gearDisplay controller="touchable" pages="1"/>
-      <relation target="" sidePair="center-center"/>
-    </component>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 12
FGUIProject/assets/League/components/Button16.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 12
FGUIProject/assets/League/components/Button18.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 12
FGUIProject/assets/League/components/Button19.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 14
FGUIProject/assets/League/components/Button2.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="157,50" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <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="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"/>
-</component>

+ 12 - 7
FGUIProject/assets/League/components/Button3.xml

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="179,50" extention="Button">
+<component size="168,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <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"/>
+    <image id="n9_o9gh" name="n9" src="o9gh41" fileName="images/lm_zjm_zykuang_2.png" xy="120,7" size="146,47">
+      <gearSize controller="c1" pages="1" values="146,47,1,1" default="280,47,1,1"/>
+    </image>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="168,61" aspect="true" url="ui://tw70qm9da0cf2v" fill="scale" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="ui://tw70qm9da0cf2o|ui://tw70qm9da0cf2v"/>
+    </loader>
+    <text id="n7_a0cf" name="txtCount" xy="173,10" pivot="0.5,0" size="78,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=30}/{maxValue=30}">
+      <gearXY controller="c1" pages="0,1" values="264,10|173,10"/>
     </text>
-    <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 id="n3_u2u3" name="title" xy="61,11" 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="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>

+ 0 - 12
FGUIProject/assets/League/components/Button7.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 12
FGUIProject/assets/League/components/Button9.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" 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}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

+ 0 - 8
FGUIProject/assets/League/components/ComGain.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="120,109">
-  <displayList>
-    <text id="n4_rv09" name="txtDesc" xy="0,0" pivot="0.5,0" size="120,41" fontSize="30" text="每次祈福"/>
-    <component id="n5_rv09" name="comCurrency" src="rv0926" fileName="ComCurrency.xml" xy="19,49"/>
-  </displayList>
-  <customProperty target="txtDesc" propertyId="0"/>
-</component>

二进制
FGUIProject/assets/League/imageTest/bpjly_jtjt_3.png


二进制
FGUIProject/assets/League/imageTest/grxx_bjbj.png


二进制
FGUIProject/assets/League/imageTest/grxx_yx_dk.png


二进制
FGUIProject/assets/League/imageTest/grxx_yx_gb.png


二进制
FGUIProject/assets/League/imageTest/hz_zdzddg_1.png


二进制
FGUIProject/assets/League/imageTest/hz_zdzddg_2.png


二进制
FGUIProject/assets/League/imageTest/xz_wss.png


二进制
FGUIProject/assets/League/imageTest/zjm_ej_suo.png


二进制
FGUIProject/assets/League/imageTest/zjm_rk_6.png


二进制
FGUIProject/assets/League/images/beizif.png


二进制
FGUIProject/assets/League/images/lm_an_pink_2.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_1.png → FGUIProject/assets/League/images/zjm_tptp_1.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_2.png → FGUIProject/assets/League/images/zjm_tptp_2.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_3.png → FGUIProject/assets/League/images/zjm_tptp_3.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_4.png → FGUIProject/assets/League/images/zjm_tptp_4.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_5.png → FGUIProject/assets/League/images/zjm_tptp_5.png


+ 0 - 0
FGUIProject/assets/League/imageTest/zjm_tptp_6.png → FGUIProject/assets/League/images/zjm_tptp_6.png


+ 6 - 27
FGUIProject/assets/League/package.xml

@@ -12,53 +12,35 @@
     <component id="u2u38" name="LeagueMemberLogUI.xml" path="/" exported="true"/>
     <component id="u2u39" name="LeagueConstructUI.xml" path="/" exported="true"/>
     <component id="u2u3a" name="LeaguePrayUI.xml" path="/" exported="true"/>
-    <image id="u2u3b" name="xz_wss.png" path="/imageTest/"/>
     <component id="u2u3u" name="ButtonModle2.xml" path="/components/"/>
-    <image id="u2u3v" name="zjm_tptp_3.png" path="/imageTest/"/>
-    <image id="u2u3w" name="zjm_rk_6.png" path="/imageTest/"/>
-    <image id="u2u3x" name="zjm_ej_suo.png" path="/imageTest/"/>
+    <image id="u2u3v" name="zjm_tptp_3.png" path="/images/"/>
     <component id="u2u3y" name="ButtonModle3.xml" path="/components/"/>
-    <image id="u2u3z" name="zjm_tptp_2.png" path="/imageTest/"/>
+    <image id="u2u3z" name="zjm_tptp_2.png" path="/images/"/>
     <component id="u2u310" name="ButtonModle4.xml" path="/components/"/>
-    <image id="u2u311" name="zjm_tptp_5.png" path="/imageTest/"/>
+    <image id="u2u311" name="zjm_tptp_5.png" path="/images/"/>
     <component id="u2u312" name="ButtonModle5.xml" path="/components/"/>
-    <image id="u2u313" name="zjm_tptp_6.png" path="/imageTest/"/>
+    <image id="u2u313" name="zjm_tptp_6.png" path="/images/"/>
     <component id="u2u314" name="ButtonModle6.xml" path="/components/"/>
-    <image id="u2u315" name="zjm_tptp_1.png" path="/imageTest/"/>
+    <image id="u2u315" name="zjm_tptp_1.png" path="/images/"/>
     <component id="u2u316" name="ButtonModle7.xml" path="/components/"/>
-    <image id="u2u317" name="zjm_tptp_4.png" path="/imageTest/"/>
-    <image id="u2u318" name="grxx_bjbj.png" path="/imageTest/"/>
-    <component id="u2u319" name="Button1.xml" path="/components/"/>
-    <component id="u2u31a" name="Button2.xml" path="/components/"/>
+    <image id="u2u317" name="zjm_tptp_4.png" path="/images/"/>
     <component id="u2u31b" name="Button3.xml" path="/components/"/>
     <component id="u2u31c" name="Button4.xml" path="/components/"/>
     <component id="rv091f" name="ListJoinItem.xml" path="/components/"/>
     <component id="rv091h" name="ListIconItem.xml" path="/components/"/>
-    <component id="rv091i" name="Button7.xml" path="/components/"/>
     <component id="rv091j" name="Button8.xml" path="/components/"/>
-    <component id="rv091k" name="Button9.xml" path="/components/"/>
     <component id="rv091l" name="Button10.xml" path="/components/"/>
     <component id="rv091m" name="ComLeader.xml" path="/components/"/>
     <component id="rv091n" name="ListMemberItem.xml" path="/components/"/>
     <component id="rv091o" name="Button11.xml" path="/components/"/>
     <component id="rv091p" name="Button12.xml" path="/components/"/>
-    <component id="rv091q" name="Button13.xml" path="/components/"/>
     <component id="rv091r" name="Button14.xml" path="/components/"/>
     <component id="rv091s" name="Button15.xml" path="/components/"/>
-    <image id="rv091t" name="hz_zdzddg_1.png" path="/imageTest/"/>
-    <image id="rv091u" name="hz_zdzddg_2.png" path="/imageTest/"/>
-    <component id="rv091w" name="Button16.xml" path="/components/"/>
     <component id="rv091x" name="Button17.xml" path="/components/"/>
-    <component id="rv091y" name="Button18.xml" path="/components/"/>
     <component id="rv091z" name="ListApplyItem.xml" path="/components/"/>
     <component id="rv0920" name="ButtonToggle.xml" path="/components/"/>
-    <image id="rv0921" name="grxx_yx_dk.png" path="/imageTest/"/>
-    <image id="rv0922" name="grxx_yx_gb.png" path="/imageTest/"/>
     <component id="rv0923" name="ListLogItem.xml" path="/components/"/>
-    <image id="rv0924" name="bpjly_jtjt_3.png" path="/imageTest/"/>
     <component id="rv0925" name="ComConstruct.xml" path="/components/"/>
-    <component id="rv0927" name="ComGain.xml" path="/components/"/>
-    <component id="rv0928" name="Button19.xml" path="/components/"/>
     <component id="rv0929" name="ComPary.xml" path="/components/"/>
     <image id="a0cf2a" name="biaotizi.png" path="/images/"/>
     <image id="a0cf2b" name="db_weixuanz.png" path="/images/"/>
@@ -103,7 +85,6 @@
     <image id="wm603n" name="biaotizi_3.png" path="/images/"/>
     <image id="wm603q" name="lm_yeqian_xuanzhong.png" path="/images/"/>
     <component id="wm603r" name="ComHeadIcon.xml" path="/components/"/>
-    <image id="wm603s" name="beizif.png" path="/images/"/>
     <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="wm603u" name="lm_chenghao_1.png" path="/images/" exported="true"/>
     <image id="wm603v" name="lm_chenghao_2.png" path="/images/" exported="true"/>
@@ -133,7 +114,6 @@
     <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/images/"/>
     <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/images/"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/images/"/>
-    <image id="o9gh4n" name="lm_an_pink_2.png" path="/images/"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/images/"/>
     <image id="o9gh4p" name="biaotizi_9.png" path="/images/"/>
     <image id="o9gh4q" name="biaotizi_8.png" path="/images/"/>
@@ -142,7 +122,6 @@
     <image id="o9gh4t" name="an_open.png" path="/images/"/>
     <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"/>

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button2.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.League
-{
-    public partial class UI_Button2
-    {
-        public GButton target;
-        public GTextField m_txtCount;
-        public const string URL = "ui://tw70qm9du2u31a";
-        public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "Button2";
-        private static UI_Button2 _proxy;
-
-        public static UI_Button2 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button2();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Button2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button2();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

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

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

@@ -10,7 +10,7 @@ namespace UI.League
         public GLoader m_loaBg;
         public GButton m_btnback;
         public GButton m_btnRule;
-        public UI_Button2 m_btnMember;
+        public UI_Button3 m_btnMember;
         public UI_Button3 m_btnConstruct;
         public GTextField m_txtUnionName;
         public UI_ComLeagueHead m_comLeagueHead;
@@ -19,7 +19,7 @@ namespace UI.League
         public GButton m_btnChangeNotice;
         public GTextField m_txtName;
         public GTextField m_txtNotice;
-        public UI_ButtonModle2 m_btnPray;
+        public UI_ButtonModle6 m_btnPray;
         public const string URL = "ui://tw70qm9du2u32";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueUI";
@@ -70,7 +70,7 @@ namespace UI.League
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_btnMember = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMember"));
+            m_btnMember = (UI_Button3)UI_Button3.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"));
@@ -79,7 +79,7 @@ namespace UI.League
             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"));
+            m_btnPray = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnPray"));
         }
         public void Dispose(bool disposeTarget = false)
         {

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


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


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


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


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


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


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


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


二进制
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


二进制
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


二进制
GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png


二进制
GameClient/Assets/ResIn/UI/League/League_atlas0_5.png


二进制
GameClient/Assets/ResIn/UI/League/League_fui.bytes