zhaoyang hace 2 años
padre
commit
05b6689a6c
Se han modificado 69 ficheros con 654 adiciones y 75 borrados
  1. 20 0
      FGUIProject/assets/CommonGame/components/ComCostColor1.xml
  2. 1 1
      FGUIProject/assets/CommonGame/components/ComCostCurrency.xml
  3. 1 0
      FGUIProject/assets/CommonGame/package.xml
  4. 21 10
      FGUIProject/assets/League/LeagueMemberAppointUI.xml
  5. 6 5
      FGUIProject/assets/League/LeaguePrayUI.xml
  6. 28 0
      FGUIProject/assets/League/components/Button141.xml
  7. 8 9
      FGUIProject/assets/League/components/Button15.xml
  8. 11 6
      FGUIProject/assets/League/components/Button20.xml
  9. 15 11
      FGUIProject/assets/League/components/ComPary.xml
  10. BIN
      FGUIProject/assets/League/images/an_close.png
  11. BIN
      FGUIProject/assets/League/images/an_open.png
  12. BIN
      FGUIProject/assets/League/images/back.png
  13. BIN
      FGUIProject/assets/League/images/back2.png
  14. BIN
      FGUIProject/assets/League/images/biaotizi_10.png
  15. BIN
      FGUIProject/assets/League/images/biaotizi_7.png
  16. BIN
      FGUIProject/assets/League/images/biaotizi_8.png
  17. BIN
      FGUIProject/assets/League/images/biaotizi_9.png
  18. BIN
      FGUIProject/assets/League/images/lm_an__tongyi.png
  19. BIN
      FGUIProject/assets/League/images/lm_an__weixuan_qifu.png
  20. BIN
      FGUIProject/assets/League/images/lm_an__xuanzhong_qifu.png
  21. BIN
      FGUIProject/assets/League/images/lm_an_jujue.png
  22. BIN
      FGUIProject/assets/League/images/lm_an_pink_2.png
  23. BIN
      FGUIProject/assets/League/images/lm_biaotizi_6.png
  24. BIN
      FGUIProject/assets/League/images/lm_db_2.png
  25. BIN
      FGUIProject/assets/League/images/lm_kuang_3.png
  26. BIN
      FGUIProject/assets/League/images/lm_kuang_icon.png
  27. BIN
      FGUIProject/assets/League/images/lm_kuang_qifu.png
  28. BIN
      FGUIProject/assets/League/images/lm_kuang_qifu_name.png
  29. BIN
      FGUIProject/assets/League/images/lm_tb_db.png
  30. BIN
      FGUIProject/assets/League/images/lm_tb_db_weixuan.png
  31. BIN
      FGUIProject/assets/League/images/lm_tb_tishi.png
  32. BIN
      FGUIProject/assets/League/images/lm_zjm_chkuang.png
  33. BIN
      FGUIProject/assets/League/images/lm_zjm_djs.png
  34. BIN
      FGUIProject/assets/League/images/lm_zjm_gnkuang.png
  35. BIN
      FGUIProject/assets/League/images/lm_zjm_gonggao.png
  36. BIN
      FGUIProject/assets/League/images/lm_zjm_jxz.png
  37. BIN
      FGUIProject/assets/League/images/lm_zjm_lmmzkuang.png
  38. BIN
      FGUIProject/assets/League/images/lm_zjm_mzkuang.png
  39. BIN
      FGUIProject/assets/League/images/lm_zjm_sztxk.png
  40. BIN
      FGUIProject/assets/League/images/lm_zjm_zykuang.png
  41. BIN
      FGUIProject/assets/League/images/lm_zjm_zykuang_2.png
  42. BIN
      FGUIProject/assets/League/images/tanchuang.png
  43. BIN
      FGUIProject/assets/League/images/tb_gou.png
  44. BIN
      FGUIProject/assets/League/images/tb_up.png
  45. 34 2
      FGUIProject/assets/League/package.xml
  46. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  47. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button15.cs
  48. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button15.cs.meta
  49. 3 5
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComPary.cs
  50. 12 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberAppointUI.cs
  51. 17 13
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs
  52. 7 6
      GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs
  53. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  54. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  55. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  56. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  57. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  58. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  59. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  60. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  61. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  62. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png.meta
  63. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  64. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png.meta
  65. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  66. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png.meta
  67. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  68. 96 0
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png.meta
  69. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 20 - 0
FGUIProject/assets/CommonGame/components/ComCostColor1.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="93,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,5" size="35,35" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="35,3" size="58,39" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b38441" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <group id="n7_si5z" name="n7" xy="0,3" size="93,39" advanced="true" layout="hz" excludeInvisibles="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <text id="n11_a0cf" name="n11" xy="10,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>
+  </displayList>
+  <relation target="n7_si5z" sidePair="width-width"/>
+</component>

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

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

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

@@ -269,6 +269,7 @@
     <image id="o9ghtlj" name="hz_bq_shuxing_2.png" path="/imagesNew/" exported="true"/>
     <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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 21 - 10
FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -1,30 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1000">
-  <controller name="c1" pages="0,,1," selected="0">
+<component size="1080,647">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="副会长"/>
     <remark page="1" value="会长"/>
   </controller>
   <controller name="c2" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <image id="n7_wm60" name="n7" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
-    <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="712,277" size="29,29">
-      <Button icon="ui://eg2y0ldpjcej2k"/>
+    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647"/>
+    <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
+    <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="911,26"/>
+    <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88">
+      <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <component id="n0_rv09" name="btnAppoint0" src="rv091s" fileName="components/Button15.xml" xy="387,369" group="n3_rv09">
+    <image id="n11_o9gh" name="n11" src="o9gh4h" fileName="images/lm_kuang_3.png" xy="60,149" group="n16_o9gh"/>
+    <text id="n12_o9gh" name="n12" xy="270,151" size="60,39" group="n16_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" text="职位"/>
+    <text id="n13_o9gh" name="n13" xy="530,151" pivot="0.5,0" size="60,39" group="n16_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="人数"/>
+    <text id="n14_o9gh" name="n14" xy="770,151" pivot="0.5,0" size="60,39" group="n16_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="任命"/>
+    <group id="n16_o9gh" name="n16" xy="60,149" size="960,41"/>
+    <component id="n0_rv09" name="btnAppoint0" src="rv091s" fileName="components/Button15.xml" xy="230,211" group="n3_rv09">
       <gearDisplay controller="c1" pages="1"/>
       <Button controller="c2" page="1"/>
+      <property target="txtName" propertyId="0" value="社长"/>
     </component>
-    <component id="n1_rv09" name="btnAppoint1" src="rv091s" fileName="components/Button15.xml" xy="387,452" group="n3_rv09">
+    <component id="n1_rv09" name="btnAppoint1" src="rv091s" fileName="components/Button15.xml" xy="230,284" group="n3_rv09">
       <gearDisplay controller="c1" pages="1"/>
       <Button controller="c2" page="2"/>
+      <property target="txtName" propertyId="0" value="副社长"/>
     </component>
-    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="387,369" group="n3_rv09">
+    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="230,357" group="n3_rv09">
       <gearDisplay controller="c1" pages="0,1"/>
       <Button checked="true" controller="c2" page="3"/>
+      <property target="txtName" propertyId="0" value="御史"/>
     </component>
-    <group id="n3_rv09" name="n3" xy="387,369" size="305,53" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n5_rv09" name="btnKick" src="rv091w" fileName="components/Button16.xml" xy="442,666">
+    <group id="n3_rv09" name="n3" xy="230,211" size="620,199" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
       <Button title="请离联盟"/>
     </component>
+    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480"/>
   </displayList>
 </component>

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

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1000">
+<component size="1080,1100">
   <displayList>
-    <image id="n12_wm60" name="n12" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
-    <component id="n9_rv09" name="comPary0" src="rv0929" fileName="components/ComPary.xml" xy="129,160">
+    <image id="n12_wm60" name="n12" src="o9gh4i" fileName="images/lm_db_2.png" xy="0,40"/>
+    <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="白檀香"/>
     </component>
-    <component id="n10_rv09" name="comPary1" src="rv0929" fileName="components/ComPary.xml" xy="410,175">
+    <component id="n10_rv09" name="comPary1" src="rv0929" fileName="components/ComPary.xml" xy="418,207">
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="苏合香"/>
     </component>
-    <component id="n11_rv09" name="comPary2" src="rv0929" fileName="components/ComPary.xml" xy="715,175">
+    <component id="n11_rv09" name="comPary2" src="rv0929" fileName="components/ComPary.xml" xy="720,207">
       <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 - 0
FGUIProject/assets/League/components/Button141.xml

@@ -0,0 +1,28 @@
+<?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>

+ 8 - 9
FGUIProject/assets/League/components/Button15.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="305,53" extention="Button">
+<component size="620,53" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n3_rv09" name="icon" xy="32,1" size="50,50" url="ui://eg2y0ldpkztethq"/>
-    <text id="n4_rv09" name="title" xy="150,5" size="45,41" fontSize="30" vars="true" text="{value=0}/{maxValue=3}"/>
-    <image id="n5_rv09" name="n5" src="rv091t" fileName="imageTest/hz_zdzddg_1.png" xy="237,-1">
-      <gearDisplay controller="button" pages="0"/>
+    <text id="n8_o9gh" name="txtName" xy="38,7" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" align="center" text="社长"/>
+    <text id="n4_rv09" name="title" xy="308,7" pivot="0.5,0" size="41,38" fontSize="27" color="#66512c" vars="true" text="{value=0}/{maxValue=3}"/>
+    <image id="n5_rv09" name="n5" src="o9gh4d" fileName="images/lm_tb_db.png" xy="554,6">
+      <gearDisplay controller="button" pages="0,1"/>
     </image>
-    <image id="n6_rv09" name="n6" src="rv091u" fileName="imageTest/hz_zdzddg_2.png" xy="237,-1">
+    <image id="n6_rv09" name="n6" src="o9gh4e" fileName="images/tb_gou.png" xy="553,1">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_rv09" name="n7" src="rv091t" fileName="imageTest/hz_zdzddg_1.png" xy="237,-1" visible="false" color="#999999">
-      <gearDisplay controller="button" pages="0"/>
-    </image>
+    <image id="n7_rv09" name="imgGrey" src="o9gh4c" fileName="images/lm_tb_db_weixuan.png" xy="554,6" visible="false" color="#999999"/>
   </displayList>
   <Button mode="Check"/>
+  <customProperty target="txtName" propertyId="0"/>
 </component>

+ 11 - 6
FGUIProject/assets/League/components/Button20.xml

@@ -1,13 +1,18 @@
 <?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"/>
+<component size="189,58" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" 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="75,7" pivot="0.5,0" size="45,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
+      <gearDisplay controller="button" pages="4"/>
+    </image>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://tw70qm9do9gh4k" fill="scale" autoSize="true">
+      <gearDisplay controller="button" pages="0,1,2,3"/>
+    </loader>
+    <text id="n3_u2u3" name="title" xy="64,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#683c28" align="center" vars="true" text="升级">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <text id="n5_a0cf" name="txtTip" xy="78,55" pivot="0.5,0" size="40,42" fontSize="30" text=""/>
-    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,61"/>
+    <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"/>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

+ 15 - 11
FGUIProject/assets/League/components/ComPary.xml

@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,594">
+<component size="274,736">
   <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="首次"/>
     <remark page="1" value="非首次"/>
   </controller>
   <displayList>
-    <loader id="n2_rv09" name="LoaIcon" xy="27,0" pivot="0.5,0" size="142,142" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
-    <text id="n3_rv09" name="txtName" xy="51,162" pivot="0.5,0" size="93,41" fontSize="30" text="白檀香"/>
-    <text id="n9_a0cf" name="n9" xy="37,227" pivot="0.5,0" size="122,41" fontSize="30" align="center" text="每次祈福"/>
-    <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="33,273"/>
-    <text id="n10_a0cf" name="n10" xy="7,336" pivot="0.5,0" size="182,41" group="n11_a0cf" fontSize="30" align="center" text="每日首次祈福"/>
-    <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="37,376" group="n11_a0cf"/>
-    <group id="n11_a0cf" name="n11" xy="7,336" size="182,86" advanced="true">
+    <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
+    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66"/>
+    <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
+    <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"/>
+    <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">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <text id="n12_wm60" name="txtCount" xy="12,432" pivot="0.5,0" size="172,42" fontSize="30" align="center" vars="true" text="今日祈福:{value=0}/{maxValue=5}"/>
-    <component id="n7_rv09" name="btnPray" src="rv0928" fileName="components/Button19.xml" xy="0,472">
+    <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="今日祈福"/>
+    <text id="n12_wm60" name="txtCount" xy="156,520" pivot="0.5,0" size="54,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#915e15" align="center" ubb="true" vars="true" text="([color=#A5360A]{value=0}[/color]/{maxValue=5})"/>
+    <component id="n7_rv09" name="btnPray" src="a0cf31" fileName="components/Button20.xml" xy="42,611">
       <Button title="祈福"/>
     </component>
-    <component id="n8_rv09" name="comCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,534"/>
   </displayList>
   <customProperty target="LoaIcon" propertyId="1"/>
   <customProperty target="txtName" propertyId="0"/>

BIN
FGUIProject/assets/League/images/an_close.png


BIN
FGUIProject/assets/League/images/an_open.png


BIN
FGUIProject/assets/League/images/back.png


BIN
FGUIProject/assets/League/images/back2.png


BIN
FGUIProject/assets/League/images/biaotizi_10.png


BIN
FGUIProject/assets/League/images/biaotizi_7.png


BIN
FGUIProject/assets/League/images/biaotizi_8.png


BIN
FGUIProject/assets/League/images/biaotizi_9.png


BIN
FGUIProject/assets/League/images/lm_an__tongyi.png


BIN
FGUIProject/assets/League/images/lm_an__weixuan_qifu.png


BIN
FGUIProject/assets/League/images/lm_an__xuanzhong_qifu.png


BIN
FGUIProject/assets/League/images/lm_an_jujue.png


BIN
FGUIProject/assets/League/images/lm_an_pink_2.png


BIN
FGUIProject/assets/League/images/lm_biaotizi_6.png


BIN
FGUIProject/assets/League/images/lm_db_2.png


BIN
FGUIProject/assets/League/images/lm_kuang_3.png


BIN
FGUIProject/assets/League/images/lm_kuang_icon.png


BIN
FGUIProject/assets/League/images/lm_kuang_qifu.png


BIN
FGUIProject/assets/League/images/lm_kuang_qifu_name.png


BIN
FGUIProject/assets/League/images/lm_tb_db.png


BIN
FGUIProject/assets/League/images/lm_tb_db_weixuan.png


BIN
FGUIProject/assets/League/images/lm_tb_tishi.png


BIN
FGUIProject/assets/League/images/lm_zjm_chkuang.png


BIN
FGUIProject/assets/League/images/lm_zjm_djs.png


BIN
FGUIProject/assets/League/images/lm_zjm_gnkuang.png


BIN
FGUIProject/assets/League/images/lm_zjm_gonggao.png


BIN
FGUIProject/assets/League/images/lm_zjm_jxz.png


BIN
FGUIProject/assets/League/images/lm_zjm_lmmzkuang.png


BIN
FGUIProject/assets/League/images/lm_zjm_mzkuang.png


BIN
FGUIProject/assets/League/images/lm_zjm_sztxk.png


BIN
FGUIProject/assets/League/images/lm_zjm_zykuang.png


BIN
FGUIProject/assets/League/images/lm_zjm_zykuang_2.png


BIN
FGUIProject/assets/League/images/tanchuang.png


BIN
FGUIProject/assets/League/images/tb_gou.png


BIN
FGUIProject/assets/League/images/tb_up.png


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

@@ -84,7 +84,6 @@
     <component id="a0cf2z" name="Button42.xml" path="/components/"/>
     <component id="a0cf30" name="ComLeagueHead.xml" path="/components/"/>
     <component id="a0cf31" name="Button20.xml" path="/components/"/>
-    <image id="wm6032" name="back.png" path="/images/"/>
     <image id="wm6033" name="lm_wz_tuichulm.png" path="/images/"/>
     <image id="wm6034" name="lm_tb_bianji.png" path="/images/"/>
     <image id="wm6035" name="lm_mz_db.png" path="/images/"/>
@@ -104,7 +103,6 @@
     <image id="wm603l" name="biaotizi_5.png" path="/images/"/>
     <image id="wm603m" name="biaotizi_4.png" path="/images/"/>
     <image id="wm603n" name="biaotizi_3.png" path="/images/"/>
-    <image id="wm603o" name="back2.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/"/>
@@ -114,6 +112,40 @@
     <image id="wm603w" name="lm_chenghao_3.png" path="/images/" exported="true"/>
     <component id="wm603x" name="Button111.xml" path="/components/"/>
     <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="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="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/"/>
+    <image id="o9gh4b" name="lm_tb_tishi.png" path="/images/"/>
+    <image id="o9gh4c" name="lm_tb_db_weixuan.png" path="/images/"/>
+    <image id="o9gh4d" name="lm_tb_db.png" path="/images/"/>
+    <image id="o9gh4e" name="tb_gou.png" path="/images/"/>
+    <image id="o9gh4f" name="lm_kuang_qifu_name.png" path="/images/"/>
+    <image id="o9gh4g" name="lm_kuang_icon.png" path="/images/"/>
+    <image id="o9gh4h" name="lm_kuang_3.png" path="/images/"/>
+    <image id="o9gh4i" name="lm_db_2.png" path="/images/"/>
+    <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
+    <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/"/>
+    <image id="o9gh4r" name="biaotizi_7.png" path="/images/"/>
+    <image id="o9gh4s" name="biaotizi_10.png" path="/images/"/>
+    <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/"/>
   </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();

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button15.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_Button15
+    {
+        public GButton target;
+        public GTextField m_txtName;
+        public GImage m_imgGrey;
+        public const string URL = "ui://tw70qm9drv091s";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "Button15";
+        private static UI_Button15 _proxy;
+
+        public static UI_Button15 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button15();
+            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_Button15 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button15();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+            m_imgGrey = (GImage)comp.GetChild("imgGrey");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            m_imgGrey = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 5
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComPary.cs

@@ -13,8 +13,7 @@ namespace UI.League
         public GComponent m_comGain;
         public GComponent m_comFirstGain;
         public GTextField m_txtCount;
-        public GButton m_btnPray;
-        public GComponent m_comCurrency;
+        public UI_Button20 m_btnPray;
         public const string URL = "ui://tw70qm9drv0929";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ComPary";
@@ -68,8 +67,7 @@ namespace UI.League
             m_comGain = (GComponent)comp.GetChild("comGain");
             m_comFirstGain = (GComponent)comp.GetChild("comFirstGain");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_btnPray = (GButton)comp.GetChild("btnPray");
-            m_comCurrency = (GComponent)comp.GetChild("comCurrency");
+            m_btnPray = (UI_Button20)UI_Button20.Create(comp.GetChild("btnPray"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,8 +77,8 @@ namespace UI.League
             m_comGain = null;
             m_comFirstGain = null;
             m_txtCount = null;
+            m_btnPray.Dispose();
             m_btnPray = null;
-            m_comCurrency = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberAppointUI.cs

@@ -9,10 +9,11 @@ namespace UI.League
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public GButton m_btnClose;
         public GButton m_btnRule;
-        public GButton m_btnAppoint0;
-        public GButton m_btnAppoint1;
-        public GButton m_btnAppoint2;
+        public UI_Button15 m_btnAppoint0;
+        public UI_Button15 m_btnAppoint1;
+        public UI_Button15 m_btnAppoint2;
         public GButton m_btnKick;
         public const string URL = "ui://tw70qm9du2u36";
         public const string PACKAGE_NAME = "League";
@@ -63,19 +64,24 @@ namespace UI.League
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_btnAppoint0 = (GButton)comp.GetChild("btnAppoint0");
-            m_btnAppoint1 = (GButton)comp.GetChild("btnAppoint1");
-            m_btnAppoint2 = (GButton)comp.GetChild("btnAppoint2");
+            m_btnAppoint0 = (UI_Button15)UI_Button15.Create(comp.GetChild("btnAppoint0"));
+            m_btnAppoint1 = (UI_Button15)UI_Button15.Create(comp.GetChild("btnAppoint1"));
+            m_btnAppoint2 = (UI_Button15)UI_Button15.Create(comp.GetChild("btnAppoint2"));
             m_btnKick = (GButton)comp.GetChild("btnKick");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_c2 = null;
+            m_btnClose = null;
             m_btnRule = null;
+            m_btnAppoint0.Dispose();
             m_btnAppoint0 = null;
+            m_btnAppoint1.Dispose();
             m_btnAppoint1 = null;
+            m_btnAppoint2.Dispose();
             m_btnAppoint2 = null;
             m_btnKick = null;
             if(disposeTarget && target != null)

+ 17 - 13
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs

@@ -35,12 +35,12 @@ namespace GFGGame
 
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
             _ui.m_btnKick.onClick.Add(OnBtnKickClick);
-            _ui.m_btnAppoint0.onClick.Add(OnBtnAppointClick);
-            _ui.m_btnAppoint0.data = LeaguePos.Owner;
-            _ui.m_btnAppoint1.onClick.Add(OnBtnAppointClick);
-            _ui.m_btnAppoint1.data = LeaguePos.SubOwner;
-            _ui.m_btnAppoint2.onClick.Add(OnBtnAppointClick);
-            _ui.m_btnAppoint2.data = LeaguePos.Flower;
+            _ui.m_btnAppoint0.target.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint0.target.data = LeaguePos.Owner;
+            _ui.m_btnAppoint1.target.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint1.target.data = LeaguePos.SubOwner;
+            _ui.m_btnAppoint2.target.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint2.target.data = LeaguePos.Flower;
 
         }
         protected override void AddEventListener()
@@ -123,16 +123,20 @@ namespace GFGGame
                 return;
             }
             _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner ? 1 : 0;
-            _ui.m_btnAppoint0.title = "1/1";
-            _ui.m_btnAppoint1.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 || _memberData.Pos == LeaguePos.SubOwner ? true : false;
-            _ui.m_btnAppoint1.selected = _memberData.Pos == LeaguePos.SubOwner ? true : false;
-            _ui.m_btnAppoint1.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
+            _ui.m_btnAppoint0.target.title = "1/1";
+            _ui.m_btnAppoint0.m_imgGrey.visible = false;
+
+            _ui.m_btnAppoint1.target.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 || _memberData.Pos == LeaguePos.SubOwner ? true : false;
+            _ui.m_btnAppoint1.m_imgGrey.visible = _memberData.Pos != LeaguePos.SubOwner && LeagueDataManager.Instance.LeagueData.SubOwnerId > 0 ? true : false;
+            _ui.m_btnAppoint1.target.selected = _memberData.Pos == LeaguePos.SubOwner ? true : false;
+            _ui.m_btnAppoint1.target.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
 
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
-            _ui.m_btnAppoint2.touchable = _memberData.Pos == LeaguePos.Flower || LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
-            _ui.m_btnAppoint2.selected = _memberData.Pos == LeaguePos.Flower ? true : false;
+            _ui.m_btnAppoint2.target.touchable = _memberData.Pos == LeaguePos.Flower || LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
+            _ui.m_btnAppoint2.m_imgGrey.visible = _memberData.Pos != LeaguePos.Flower && LeagueDataManager.Instance.LeagueData.FlowerNum == hotelCfg.limitPosition ? true : false; ;
+            _ui.m_btnAppoint2.target.selected = _memberData.Pos == LeaguePos.Flower ? true : false;
             Debug.Log("FlowerNum" + LeagueDataManager.Instance.LeagueData.FlowerNum);
-            _ui.m_btnAppoint2.title = LeagueDataManager.Instance.LeagueData.FlowerNum + "/" + hotelCfg.limitPosition;
+            _ui.m_btnAppoint2.target.title = LeagueDataManager.Instance.LeagueData.FlowerNum + "/" + hotelCfg.limitPosition;
 
         }
     }

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

@@ -72,21 +72,22 @@ namespace GFGGame
             int curTimes = LeagueDataManager.Instance.GetPrayTimesByType(type);
             if (type == LeaguePrayType.First && curTimes == 0)
             {
-                ItemUtil.UpdateItemNeedNum(item.m_comCurrency, prayCfg.consumeArr[0][0], 0);
+                ItemUtil.UpdateItemNeedNum(item.m_btnPray.m_comCost, prayCfg.consumeArr[0][0], 0);
             }
             else
             {
-                ItemUtil.UpdateItemNeedNum(item.m_comCurrency, prayCfg.consumeArr[0][0], prayCfg.consumeArr[0][1]);
+                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.touchable = curTimes < prayCfg.limit;
+            item.m_btnPray.target.touchable = curTimes < prayCfg.limit;
+            // item.m_btnPray.
             item.m_txtCount.SetVar("value", curTimes.ToString()).FlushVars();
             item.m_txtCount.SetVar("maxValue", prayCfg.limit.ToString()).FlushVars();
-            if (item.m_btnPray.data == null)
+            if (item.m_btnPray.target.data == null)
             {
-                item.m_btnPray.onClick.Add(OnBtnPrayClick);
+                item.m_btnPray.target.onClick.Add(OnBtnPrayClick);
             }
-            item.m_btnPray.data = type;
+            item.m_btnPray.target.data = type;
 
             UI_ComPary.ProxyEnd();
         }

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_atlas0_4!a.png


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

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

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


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

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

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


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

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

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


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

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

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