zhaoyang 2 ani în urmă
părinte
comite
1a3f3ce823
81 a modificat fișierele cu 2355 adăugiri și 39 ștergeri
  1. 10 4
      FGUIProject/assets/CommonGame/components/ComponentValueBar.xml
  2. 0 0
      FGUIProject/assets/CommonGame/components/ListScoreItem.xml
  3. 1 1
      FGUIProject/assets/CommonGame/package.xml
  4. 24 0
      FGUIProject/assets/League/LeagueAnswerRankUI.xml
  5. 31 0
      FGUIProject/assets/League/LeagueAnswerRewardUI.xml
  6. 17 0
      FGUIProject/assets/League/LeagueAnswerUI.xml
  7. 75 0
      FGUIProject/assets/League/LeagueAnsweringUI.xml
  8. 33 0
      FGUIProject/assets/League/LeagueGiftUI.xml
  9. 26 0
      FGUIProject/assets/League/LeagueSkillUI.xml
  10. 27 0
      FGUIProject/assets/League/LeagueSkillUpUI.xml
  11. 13 0
      FGUIProject/assets/League/components/Button121.xml
  12. 8 0
      FGUIProject/assets/League/components/ListAnswerJoinItem.xml
  13. 10 0
      FGUIProject/assets/League/components/ListAnswerRewardItem.xml
  14. 18 0
      FGUIProject/assets/League/components/ListChatItem.xml
  15. 18 0
      FGUIProject/assets/League/components/ListChatItemMine.xml
  16. 17 0
      FGUIProject/assets/League/components/ListGiftItem.xml
  17. 16 0
      FGUIProject/assets/League/components/ListRankItem.xml
  18. 9 0
      FGUIProject/assets/League/components/ListSkillItem.xml
  19. 11 0
      FGUIProject/assets/League/components/ListSkillLayerItem.xml
  20. 8 0
      FGUIProject/assets/League/components/ListSkillTypeItem.xml
  21. 18 1
      FGUIProject/assets/League/package.xml
  22. 55 1
      GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs
  23. 30 0
      GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs
  24. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs
  25. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs
  26. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs.meta
  27. 78 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRankUI.cs
  28. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRankUI.cs.meta
  29. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRewardUI.cs
  30. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRewardUI.cs.meta
  31. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerUI.cs
  32. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerUI.cs.meta
  33. 134 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs
  34. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs.meta
  35. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueGiftUI.cs
  36. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueGiftUI.cs.meta
  37. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUI.cs
  38. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUI.cs.meta
  39. 87 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs
  40. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs.meta
  41. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerJoinItem.cs
  42. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerJoinItem.cs.meta
  43. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerRewardItem.cs
  44. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerRewardItem.cs.meta
  45. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItem.cs
  46. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItem.cs.meta
  47. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftItem.cs
  48. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftItem.cs.meta
  49. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListRankItem.cs
  50. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListRankItem.cs.meta
  51. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs
  52. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs.meta
  53. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillLayerItem.cs
  54. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillLayerItem.cs.meta
  55. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillTypeItem.cs
  56. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillTypeItem.cs.meta
  57. 65 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/SkillSProxy.cs
  58. 13 10
      GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs
  59. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  60. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs
  61. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs
  62. 2 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs
  63. 2 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  64. 8 1
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs
  65. 67 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs
  66. 11 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs.meta
  67. 135 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs
  68. 11 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs.meta
  69. 103 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs
  70. 11 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs.meta
  71. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  72. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  73. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  74. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  75. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  76. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  77. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  78. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  79. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  80. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  81. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes

+ 10 - 4
FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,70" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12," selected="10">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13," selected="11">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -12,6 +12,7 @@
     <remark page="8" value="画廊积分兑换"/>
     <remark page="9" value="金币马蹄珍珠"/>
     <remark page="10" value="竞技场"/>
+    <remark page="11" value="雅集"/>
   </controller>
   <displayList>
     <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
@@ -44,12 +45,12 @@
       <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,0">
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="230,5">
       <gearDisplay controller="c1" pages="0,1,6,7,10,12"/>
       <gearXY controller="c1" pages="0,1,6,7,10,12" values="296,0|555,0|555,0|814,0|296,0|296,0" default="230,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x3"/>
     </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,0">
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
       <gearDisplay controller="c1" pages="0,1,5,6,10,12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,10,12" values="555,0|814,0|979,5|555,0|814,0|555,0|555,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x6"/>
@@ -59,10 +60,15 @@
       <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0" controller="c1,1">
+    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
       <gearDisplay controller="c1" pages="12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
+    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,1">
+      <gearDisplay controller="c1" pages="13"/>
+      <gearXY controller="c1" pages="0,1,3,5,6,8,10,12,13" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0|814,1" default="688,5"/>
+      <Button title="100" icon="ui://eg2y0ldpkztethq"/>
+    </component>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/CommonGame/components/ListPropertyItem.xml → FGUIProject/assets/CommonGame/components/ListScoreItem.xml


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

@@ -86,7 +86,7 @@
     <image id="9cth8y" name="tctc_xiant_1.png" path="/imagesExport/" exported="true"/>
     <image id="9cth8z" name="cj_hd_kdi.png" path="/imagesExport/"/>
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
-    <component id="ojlzk" name="ListPropertyItem.xml" path="/components/" exported="true"/>
+    <component id="ojlzk" name="ListScoreItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
     <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>

+ 24 - 0
FGUIProject/assets/League/LeagueAnswerRankUI.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1100">
+  <displayList>
+    <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,16" size="1080,1147" group="n26_pvb4"/>
+    <component id="n1_pvb4" name="btnBack" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,36" size="111,96" group="n26_pvb4"/>
+    <image id="n6_pvb4" name="n6" src="wm603l" fileName="images/biaotizi_5.png" xy="202,96" size="673,62" group="n26_pvb4"/>
+    <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,188" size="293,56" group="n5_pvb4"/>
+    <component id="n3_pvb4" name="n3" src="rv091j" fileName="components/Button8.xml" xy="162,185" group="n5_pvb4">
+      <Button checked="true" title="本周排行"/>
+    </component>
+    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="314,185" group="n5_pvb4">
+      <Button title="上周排行"/>
+    </component>
+    <group id="n5_pvb4" name="n5" xy="162,185" size="304,63" group="n26_pvb4"/>
+    <list id="n11_pvb4" name="list" xy="167,261" size="779,493" group="n26_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb451" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n25_pvb4" name="comMine" src="pvb451" fileName="components/ListRankItem.xml" xy="165,810" group="n26_pvb4"/>
+    <group id="n26_pvb4" name="n26" xy="0,16" size="1080,1147"/>
+  </displayList>
+</component>

+ 31 - 0
FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1100">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,16" size="1080,1147" group="n19_pvb4"/>
+    <component id="n1_pvb4" name="btnBack" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,36" size="111,96" group="n19_pvb4"/>
+    <image id="n6_pvb4" name="n6" src="wm603l" fileName="images/biaotizi_5.png" xy="202,96" size="673,62" group="n19_pvb4"/>
+    <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,188" size="293,56" group="n5_pvb4"/>
+    <component id="n3_pvb4" name="n3" src="rv091j" fileName="components/Button8.xml" xy="162,185" group="n5_pvb4">
+      <Button checked="true" title="活动规则" controller="c1" page="0"/>
+    </component>
+    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="314,185" group="n5_pvb4">
+      <Button title="活动奖励" controller="c1" page="1"/>
+    </component>
+    <group id="n5_pvb4" name="n5" xy="162,185" size="304,63" group="n19_pvb4"/>
+    <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="635,109" size="36,37" group="n19_pvb4">
+      <Button icon="ui://tw70qm9do9gh4b"/>
+    </component>
+    <text id="n18_pvb4" name="txtRule" xy="169,262" size="778,491" group="n19_pvb4" fontSize="30" align="center" autoSize="none" text="">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <list id="n11_pvb4" name="list" xy="167,261" size="779,493" group="n19_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n19_pvb4" name="n19" xy="0,16" size="1080,1147"/>
+  </displayList>
+</component>

+ 17 - 0
FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="900,589">
+  <displayList>
+    <component id="n3_pvb4" name="btnRank" src="rv091p" fileName="components/Button12.xml" xy="669,39" group="n7_pvb4">
+      <Button title="排行榜"/>
+    </component>
+    <component id="n0_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="21,82" group="n7_pvb4"/>
+    <text id="n1_pvb4" name="n1" xy="50,334" size="152,41" group="n7_pvb4" fontSize="30" text="上周大聪明"/>
+    <text id="n2_pvb4" name="txtName" xy="17,392" pivot="0.5,0" size="211,41" group="n7_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
+    <text id="n6_pvb4" name="txtRule" xy="305,141" size="542,296" group="n7_pvb4" fontSize="30" align="center" autoSize="none" text=""/>
+    <text id="n4_pvb4" name="txtTime" xy="401,496" pivot="0.5,0" size="40,42" group="n7_pvb4" fontSize="30" align="center" text=""/>
+    <component id="n5_pvb4" name="btnAnswer" src="wm603x" fileName="components/Button111.xml" xy="256,481" group="n7_pvb4">
+      <Button title="开始答题"/>
+    </component>
+    <group id="n7_pvb4" name="n7" xy="17,39" size="839,519"/>
+  </displayList>
+</component>

+ 75 - 0
FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="有图标"/>
+    <remark page="1" value="无图标"/>
+  </controller>
+  <controller name="c2" pages="0,,1," selected="0">
+    <remark page="0" value="答题中"/>
+    <remark page="1" value="cd中"/>
+  </controller>
+  <displayList>
+    <loader id="n4_pvb4" 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="n5_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <text id="n7_pvb4" name="txtTime" xy="397,144" pivot="0.5,0" size="285,41" fontSize="30" align="center" text="活动剩余时间:00:00"/>
+    <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="715,140" size="36,37">
+      <Button icon="ui://tw70qm9do9gh4b"/>
+    </component>
+    <text id="n10_pvb4" name="txtRightCount" xy="698,241" size="214,41" fontSize="30" align="center" text="全员已答对10题"/>
+    <text id="n9_pvb4" name="txtAnswerTime" xy="501,242" pivot="0.5,0" size="78,41" group="n15_pvb4" fontSize="30" align="center" text="00:55"/>
+    <text id="n11_pvb4" name="txtAnswerNum" xy="479,288" pivot="0.5,0" size="121,41" group="n15_pvb4" fontSize="30" align="center" text="第1/15题"/>
+    <loader id="n12_pvb4" name="loaIocn" xy="231,347" pivot="0.5,0.5" size="134,134" group="n15_pvb4" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+    <text id="n13_pvb4" name="txtContent" xy="407,347" pivot="0.5,0" size="425,142" group="n15_pvb4" fontSize="30" align="center" autoSize="none" text="">
+      <gearXY controller="c1" pages="1" values="282,347" default="407,347"/>
+      <gearSize controller="c1" pages="1" values="515,142,1,1" default="425,142,1,1"/>
+    </text>
+    <list id="n14_pvb4" name="listResult" xy="407,514" pivot="0.5,0" size="449,148" group="n15_pvb4" layout="flow_hz" lineGap="10" lineItemCount="2" defaultItem="ui://tw70qm9dpvb454" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
+      <gearXY controller="c1" pages="1" values="253,514" default="407,514"/>
+      <gearSize controller="c1" pages="1" values="573,148,1,1" default="449,148,1,1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n16_pvb4" name="n16" xy="406,516" size="241,41" group="n19_pvb4" fontSize="30" align="center" text="请填入您的答案:"/>
+    <text id="n17_pvb4" name="txtResult" xy="648,514" size="123,42" group="n19_pvb4" fontSize="30" align="center" autoSize="none" text="" input="true"/>
+    <text id="n18_pvb4" name="n18" xy="649,514" size="124,42" group="n19_pvb4" fontSize="30" align="center" autoSize="none" underline="true" text="                       "/>
+    <group id="n19_pvb4" name="n19" xy="406,514" size="367,44" group="n15_pvb4" advanced="true">
+      <gearXY controller="c1" pages="1" values="282,505" default="406,514"/>
+    </group>
+    <group id="n15_pvb4" name="n15" xy="231,242" size="625,420" advanced="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </group>
+    <component id="n20_pvb4" name="comRightHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="435,239" group="n24_pvb4"/>
+    <image id="n21_pvb4" name="imgFail" src="u2u3tkq" fileName="imgItemIcon/testBig.png" pkg="eg2y0ldp" xy="484,298" group="n24_pvb4"/>
+    <text id="n22_pvb4" name="txtInfo" xy="520,469" pivot="0.5,0" size="40,42" group="n24_pvb4" fontSize="30" align="center" underline="true" text=""/>
+    <text id="n23_pvb4" name="txtCdTime" xy="520,517" pivot="0.5,0" size="40,42" group="n24_pvb4" fontSize="30" align="center" underline="true" text=""/>
+    <group id="n24_pvb4" name="n24" xy="435,239" size="230,320" advanced="true">
+      <gearDisplay controller="c2" pages="1"/>
+    </group>
+    <text id="n25_pvb4" name="txtJoinNum" xy="55,735" pivot="0.5,0" size="269,41" fontSize="30" align="center" text="当前参与成员:0/30"/>
+    <list id="n26_pvb4" name="listJoin" xy="42,808" size="300,865" overflow="scroll" defaultItem="ui://tw70qm9dpvb455" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n30_pvb4" name="listChat" xy="366,813" size="664,862" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n35_pvb4" name="txtChat" xy="161,1701" size="558,60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A89067]最多输入50个字[/color]" maxLength="50"/>
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="737,1701">
+      <Button title="发送"/>
+    </component>
+  </displayList>
+</component>

+ 33 - 0
FGUIProject/assets/League/LeagueGiftUI.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1110">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,0" size="1080,1147" group="n11_pvb4"/>
+    <component id="n1_pvb4" name="btnBack" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,20" size="111,96" group="n11_pvb4"/>
+    <image id="n2_pvb4" name="n2" src="wm603l" fileName="images/biaotizi_5.png" xy="202,80" size="673,62" group="n11_pvb4"/>
+    <image id="n3_pvb4" name="n3" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,172" size="293,56" group="n6_pvb4"/>
+    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="162,169" group="n6_pvb4">
+      <Button title="领取福利" controller="c1" page="0"/>
+    </component>
+    <component id="n5_pvb4" name="n5" src="rv091j" fileName="components/Button8.xml" xy="314,169" group="n6_pvb4">
+      <Button checked="true" title="采购福利" controller="c1" page="1"/>
+    </component>
+    <group id="n6_pvb4" name="n6" xy="162,169" size="304,63" group="n11_pvb4"/>
+    <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="635,93" size="36,37" group="n11_pvb4">
+      <Button icon="ui://tw70qm9do9gh4b"/>
+    </component>
+    <component id="n8_pvb4" name="btnGet" src="wm603x" fileName="components/Button111.xml" xy="375,819" group="n11_pvb4">
+      <Button title="一键领取"/>
+    </component>
+    <list id="n9_pvb4" name="list" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n10_pvb4" name="txtTips" xy="392,450" size="330,80" group="n11_pvb4" fontSize="30" align="center" text="当前暂无可领取的福利&#xA;社长和副社长可采购福利">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <group id="n11_pvb4" name="n11" xy="0,0" size="1080,1147"/>
+  </displayList>
+</component>

+ 26 - 0
FGUIProject/assets/League/LeagueSkillUI.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_pvb4" 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="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
+    <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <list id="n4_pvb4" name="listScore" xy="105,301" size="868,58" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n8_pvb4" name="list" xy="26,513" size="1027,1281" overflow="scroll" defaultItem="ui://tw70qm9dpvb45b" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 27 - 0
FGUIProject/assets/League/LeagueSkillUpUI.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_pvb4" 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="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,12"/>
+    <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <list id="n4_pvb4" name="listScore" xy="105,301" size="868,58" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_pvb4" name="comSkillType" src="pvb45b" fileName="components/ListSkillTypeItem.xml" xy="0,387"/>
+    <list id="n13_pvb4" name="list" xy="66,860" size="947,1002" lineGap="17" defaultItem="ui://tw70qm9dpvb45f" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 13 - 0
FGUIProject/assets/League/components/Button121.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="187,56" opaque="false" 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="187,56" group="n5_pvb4" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" group="n5_pvb4" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}"/>
+    <group id="n5_pvb4" name="n5" xy="0,0" size="187,56" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <Button/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="299,104">
+  <displayList>
+    <component id="n27_pvb4" name="comHead" src="o9ghtlo" fileName="components/ComHead1.xml" pkg="eg2y0ldp" xy="-63,-60" pivot="0.5,0.5" size="230,230" scale="0.5,0.5"/>
+    <text id="n28_pvb4" name="txtName" xy="119,8" size="172,34" fontSize="24" align="center" text="玩家名字七个字"/>
+    <text id="n29_pvb4" name="txtAnswerCount" xy="117,55" size="40,42" fontSize="30" align="center" text=""/>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/League/components/ListAnswerRewardItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="635,50">
+  <displayList>
+    <text id="n19_pvb4" name="txtDesc" xy="0,2" pivot="0.5,0" size="109,41" fontSize="30" align="center" text="答对1题"/>
+    <list id="n20_pvb4" name="listReward" xy="279,0" size="356,50" layout="row" overflow="scroll" colGap="50" defaultItem="ui://eg2y0ldpn3xha1">
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="661,167">
+  <displayList>
+    <image id="n35_pvb4" name="n35" src="wm603d" fileName="images/lm_yeqian_db.png" xy="155,86" size="306,67">
+      <relation target="n34_pvb4" sidePair="height-height"/>
+    </image>
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" scale="0.7,0.7">
+      <relation target="" sidePair="height-height,left-left"/>
+    </component>
+    <text id="n32_pvb4" name="txtName" xy="165,41" size="211,41" group="n37_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
+    <loader id="n36_pvb4" name="loaTitle" xy="376,37" size="50,50" group="n37_pvb4"/>
+    <group id="n37_pvb4" name="n37" xy="165,37" size="261,50" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="left-left"/>
+    </group>
+    <text id="n34_pvb4" name="txtChatContent" xy="170,98" size="276,42" fontSize="30" autoSize="height" text=""/>
+  </displayList>
+  <relation target="n34_pvb4" sidePair="height-height"/>
+</component>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="661,167">
+  <displayList>
+    <image id="n35_pvb4" name="n35" src="wm603d" fileName="images/lm_yeqian_db.png" xy="197,86" size="306,67">
+      <relation target="n34_pvb4" sidePair="height-height"/>
+    </image>
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="465,-31" pivot="0.5,0.5" scale="0.7,0.7">
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <text id="n34_pvb4" name="txtChatContent" xy="212,98" size="276,42" fontSize="30" autoSize="height" text=""/>
+    <loader id="n36_pvb4" name="loaTitle" xy="235,34" size="50,50" group="n37_pvb4"/>
+    <text id="n32_pvb4" name="txtName" xy="285,41" size="211,41" group="n37_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
+    <group id="n37_pvb4" name="n37" xy="235,34" size="261,50" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
+  </displayList>
+  <relation target="n34_pvb4" sidePair="height-height"/>
+</component>

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

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

+ 16 - 0
FGUIProject/assets/League/components/ListRankItem.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="750,131">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <displayList>
+    <loader id="n19_pvb4" name="loaRank" xy="12,39" size="50,50">
+      <gearDisplay controller="c1" pages="0,1,2"/>
+    </loader>
+    <text id="n20_pvb4" name="txtRank" xy="17,42" size="40,42" fontSize="30" text="">
+      <gearDisplay controller="c1" pages="3"/>
+    </text>
+    <component id="n21_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="88,0" scale="0.5,0.5"/>
+    <text id="n22_pvb4" name="txtName" xy="207,22" size="172,34" fontSize="24" text="玩家名字七个字"/>
+    <loader id="n23_pvb4" name="loatitle" xy="206,64" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <text id="n24_pvb4" name="txtContent" xy="629,48" pivot="0.5,0" size="103,34" fontSize="24" align="center" text="答对10题"/>
+  </displayList>
+</component>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="85,91">
+  <displayList>
+    <loader id="n10_pvb4" name="loaScore" xy="0,0" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <text id="n11_pvb4" name="txtScore" xy="45,1" size="40,42" group="n13_pvb4" fontSize="30" text=""/>
+    <group id="n13_pvb4" name="n13" xy="0,0" size="85,44"/>
+    <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="-22,45" pivot="0.5,0" scale="0.6,0.6" controller="c1,1"/>
+  </displayList>
+</component>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="506,82">
+  <displayList>
+    <list id="n14_pvb4" name="listSkill" xy="0,0" size="506,82" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center">
+      <relation target="" sidePair="center-center"/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1021,413">
+  <displayList>
+    <loader id="n7_pvb4" name="loaBg" xy="0,0" size="1021,411" url="ui://tw70qm9do9gh40" fill="scaleFree"/>
+    <text id="n6_pvb4" name="txtTitle" xy="461,214" pivot="0.5,0" size="140,41" fontSize="30" align="center" autoClearText="true" text="茶艺-选茶"/>
+    <text id="n8_pvb4" name="txtProgress" xy="870,96" size="106,41" fontSize="30" text="进度0%"/>
+  </displayList>
+</component>

+ 18 - 1
FGUIProject/assets/League/package.xml

@@ -92,7 +92,7 @@
     <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="o9gh40" name="tanchuang.png" path="/images/" scale="9grid" scale9grid="255,165,510,239"/>
     <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="o9gh44" name="lm_zjm_mzkuang.png" path="/images/"/>
@@ -123,6 +123,23 @@
     <image id="o9gh4u" name="lm_kuang_qifu.png" path="/images/"/>
     <image id="o9gh4v" name="tb_up.png" path="/images/"/>
     <component id="o9gh4x" name="ComConstruct1.xml" path="/components/"/>
+    <component id="pvb44z" name="ListGiftItem.xml" path="/components/"/>
+    <component id="pvb450" name="LeagueAnswerRankUI.xml" path="/" exported="true"/>
+    <component id="pvb451" name="ListRankItem.xml" path="/components/"/>
+    <component id="pvb452" name="LeagueAnswerUI.xml" path="/" exported="true"/>
+    <component id="pvb453" name="LeagueAnsweringUI.xml" path="/" exported="true"/>
+    <component id="pvb454" name="Button121.xml" path="/components/"/>
+    <component id="pvb455" name="ListAnswerJoinItem.xml" path="/components/"/>
+    <component id="pvb456" name="ListChatItem.xml" path="/components/"/>
+    <component id="pvb457" name="ListChatItemMine.xml" path="/components/"/>
+    <component id="pvb458" name="LeagueAnswerRewardUI.xml" path="/" exported="true"/>
+    <component id="pvb459" name="ListAnswerRewardItem.xml" path="/components/"/>
+    <component id="pvb45a" name="LeagueSkillUI.xml" path="/" exported="true"/>
+    <component id="pvb45b" name="ListSkillTypeItem.xml" path="/components/"/>
+    <component id="pvb45c" name="LeagueSkillUpUI.xml" path="/" exported="true"/>
+    <component id="pvb45d" name="ListSkillItem.xml" path="/components/"/>
+    <component id="pvb45f" name="ListSkillLayerItem.xml" path="/components/"/>
+    <component id="pvb45h" name="LeagueGiftUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

+ 55 - 1
GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 namespace GFGGame
@@ -5,11 +6,13 @@ namespace GFGGame
     public class LeagueDataManager : SingletonBase<LeagueDataManager>
     {
         public int Type = 2;// 1:已经加入军团 2:未加入军团
+        public int MaxFinishType { get { return GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueSkillMaxType); } }
+        public int MaxFinishLayer { get { return GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueSkillMaxLayer); } }
         public LeagueData LeagueData;//联盟信息
         public int HallLevel { get { return (int)GetNumeriValue(LeagueNumericType.HallLevel); } }
         public int HotelLevel { get { return (int)GetNumeriValue(LeagueNumericType.HotelLevel); } }
         public int StoreLevel { get { return (int)GetNumeriValue(LeagueNumericType.StoreLevel); } }
-        public Dictionary<int, long> LeagueNumber = new Dictionary<int, long>();//联盟数值
+        public Dictionary<int, long> LeagueNumber = new Dictionary<int, long>();//联盟数值,LeagueNumericType
         public Dictionary<long, LeagueListData> ListDatas = new Dictionary<long, LeagueListData>();//联盟列表
         public Dictionary<long, OtherRoleInfoData> ListApplyDatas = new Dictionary<long, OtherRoleInfoData>();//联盟申请列表
         public List<LeagueLogData> ListLogDatas = new List<LeagueLogData>();//日志数据
@@ -93,5 +96,56 @@ namespace GFGGame
             }
             return curCount;
         }
+
+        public int GetAllSkillScore(int scoreType)
+        {
+            int score = 0;
+            foreach (int key in SkillDataManager.Instance.LeagueSkillScoreDatas.Keys)
+            {
+                score += SkillDataManager.Instance.LeagueSkillScoreDatas[key][scoreType];
+            }
+            return score;
+        }
+        public int GetSkillScoreByType(int skillType, int scoreType)
+        {
+            int score = 0;
+            if (!SkillDataManager.Instance.LeagueSkillScoreDatas.ContainsKey(skillType)) return score;
+            return SkillDataManager.Instance.LeagueSkillScoreDatas[skillType][scoreType];
+        }
+        //检测一个技能是否激活
+        public bool CheckIsSkillActive(int skillType, int skillId)
+        {
+            if (!SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(skillType)) return false;
+            return SkillDataManager.Instance.LeagueSkillDatas[skillType].IndexOf(skillId) >= 0;
+        }
+
+        //根据技能类型获取该类型进度
+        public double GetSkillProgressByType(int skillType)
+        {
+            LeagueSkillCountCfg skillCountCfg = LeagueSkillCountCfgArray.Instance.GetCfg(skillType);
+            // int maxFinishType = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueSkillMaxType);
+            if (skillCountCfg.type - MaxFinishType <= 0) return 100;
+            if (skillCountCfg.type - MaxFinishType > 1) return 0;
+            // int layer = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueSkillMaxLayer);
+            if (MaxFinishLayer == 0) return 0;
+
+            List<LeagueSkillCfg> firstSkillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(skillType, 1);
+            int startId = firstSkillCfgs[0].id;
+            List<LeagueSkillCfg> curSkillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(skillType, MaxFinishLayer + 1);
+            int curId = curSkillCfgs[0].id;
+
+            for (int i = 0; i < curSkillCfgs.Count; i++)
+            {
+                if (SkillDataManager.Instance.LeagueSkillDatas[skillType].IndexOf(curSkillCfgs[i].id) < 0)
+                {
+                    curId = curSkillCfgs[i].id;
+                    break;
+                }
+            }
+            float count = curId - startId;
+            float maxCount = skillCountCfg.skillCount;
+
+            return Math.Round(count / maxCount * 100, 1); ;
+        }
     }
 }

+ 30 - 0
GameClient/Assets/Game/HotUpdate/Data/SkillDataManager.cs

@@ -6,10 +6,14 @@ namespace GFGGame
     public class SkillDataManager : SingletonBase<SkillDataManager>
     {
         public Dictionary<int, Dictionary<int, int>> CardSkillData = new Dictionary<int, Dictionary<int, int>>();
+        public Dictionary<int, List<int>> LeagueSkillDatas = new Dictionary<int, List<int>>();//雅集技能
+        public Dictionary<int, Dictionary<int, int>> LeagueSkillScoreDatas = new Dictionary<int, Dictionary<int, int>>();//雅集技能增加属性
 
         public void Clear()
         {
             CardSkillData.Clear();
+            LeagueSkillDatas.Clear();
+            LeagueSkillScoreDatas.Clear();
         }
         /*********************************************************卡牌技能****************************************************/
         public void InitCardData(int cardId, List<int> skillIds, List<int> skillLvs)
@@ -51,5 +55,31 @@ namespace GFGGame
         }
         /*************************************************************************************************************/
 
+        public void UpdateSkillDatas(int skillType, List<int> skillIds)
+        {
+            switch (skillType)
+            {
+                case SkillType.LeagueSkill:
+                    for (int i = 0; i < skillIds.Count; i++)
+                    {
+                        LeagueSkillCfg skillCfg = LeagueSkillCfgArray.Instance.GetCfg(skillIds[i]);
+                        if (!LeagueSkillDatas.ContainsKey(skillCfg.type))
+                        {
+                            LeagueSkillDatas.Add(skillCfg.type, new List<int>());
+                            LeagueSkillScoreDatas.Add(skillCfg.type, new Dictionary<int, int>());
+                            LeagueSkillScoreDatas[skillType][ConstDressUpScoreType.SCORE_FENG] = 0;
+                            LeagueSkillScoreDatas[skillType][ConstDressUpScoreType.SCORE_HUA] = 0;
+                            LeagueSkillScoreDatas[skillType][ConstDressUpScoreType.SCORE_XUE] = 0;
+                            LeagueSkillScoreDatas[skillType][ConstDressUpScoreType.SCORE_YUE] = 0;
+                        }
+                        if (LeagueSkillDatas[skillCfg.type].IndexOf(skillIds[i]) < 0)
+                        {
+                            LeagueSkillDatas[skillCfg.type].Add(skillIds[i]);
+                            LeagueSkillScoreDatas[skillType][skillCfg.score] = LeagueSkillScoreDatas[skillType][skillCfg.score] + skillCfg.value;
+                        }
+                    }
+                    break;
+            }
+        }
     }
 }

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComponentValueBar.cs

@@ -18,6 +18,7 @@ namespace UI.CommonGame
         public GButton m_btnDiamondRed;
         public GButton m_btnDiamondPurple;
         public GButton m_btnArena;
+        public GButton m_btnLeagueContribuation;
         public const string URL = "ui://eg2y0ldpv3541v";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComponentValueBar";
@@ -76,6 +77,7 @@ namespace UI.CommonGame
             m_btnDiamondRed = (GButton)comp.GetChild("btnDiamondRed");
             m_btnDiamondPurple = (GButton)comp.GetChild("btnDiamondPurple");
             m_btnArena = (GButton)comp.GetChild("btnArena");
+            m_btnLeagueContribuation = (GButton)comp.GetChild("btnLeagueContribuation");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +92,7 @@ namespace UI.CommonGame
             m_btnDiamondRed = null;
             m_btnDiamondPurple = null;
             m_btnArena = null;
+            m_btnLeagueContribuation = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListPropertyItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ListPropertyItem
+    public partial class UI_ListScoreItem
     {
         public GComponent target;
         public GTextField m_txtProperty;
         public GLoader m_loaIcon;
         public const string URL = "ui://eg2y0ldpojlzk";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ListPropertyItem";
-        private static UI_ListPropertyItem _proxy;
+        public const string RES_NAME = "ListScoreItem";
+        private static UI_ListScoreItem _proxy;
 
-        public static UI_ListPropertyItem Create(GObject gObject = null)
+        public static UI_ListScoreItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListPropertyItem();
+            var ui = new UI_ListScoreItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ListPropertyItem Proxy(GObject gObject = null)
+        public static UI_ListScoreItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListPropertyItem();
+                _proxy = new UI_ListScoreItem();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListPropertyItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListScoreItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad8f0605480545d4ab4feced5cb09658
+guid: e4f8f0468ef248a46a0dd1438580e2ba
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 78 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRankUI.cs

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueAnswerRankUI
+    {
+        public GComponent target;
+        public GButton m_btnBack;
+        public GList m_list;
+        public UI_ListRankItem m_comMine;
+        public const string URL = "ui://tw70qm9dpvb450";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueAnswerRankUI";
+        private static UI_LeagueAnswerRankUI _proxy;
+
+        public static UI_LeagueAnswerRankUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueAnswerRankUI();
+            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_LeagueAnswerRankUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueAnswerRankUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
+            m_comMine = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("comMine"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_list = null;
+            m_comMine.Dispose();
+            m_comMine = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerRewardUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueAnswerRewardUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnBack;
+        public GButton m_btnRule;
+        public GTextField m_txtRule;
+        public GList m_list;
+        public const string URL = "ui://tw70qm9dpvb458";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueAnswerRewardUI";
+        private static UI_LeagueAnswerRewardUI _proxy;
+
+        public static UI_LeagueAnswerRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueAnswerRewardUI();
+            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_LeagueAnswerRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueAnswerRewardUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtRule = (GTextField)comp.GetChild("txtRule");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_btnRule = null;
+            m_txtRule = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnswerUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueAnswerUI
+    {
+        public GComponent target;
+        public GButton m_btnRank;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GTextField m_txtRule;
+        public GTextField m_txtTime;
+        public GButton m_btnAnswer;
+        public const string URL = "ui://tw70qm9dpvb452";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueAnswerUI";
+        private static UI_LeagueAnswerUI _proxy;
+
+        public static UI_LeagueAnswerUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueAnswerUI();
+            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_LeagueAnswerUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueAnswerUI();
+            }
+            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_btnRank = (GButton)comp.GetChild("btnRank");
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtRule = (GTextField)comp.GetChild("txtRule");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnAnswer = (GButton)comp.GetChild("btnAnswer");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnRank = null;
+            m_comHead = null;
+            m_txtName = null;
+            m_txtRule = null;
+            m_txtTime = null;
+            m_btnAnswer = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 134 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs

@@ -0,0 +1,134 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueAnsweringUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GTextField m_txtTime;
+        public GButton m_btnRule;
+        public GTextField m_txtRightCount;
+        public GTextField m_txtAnswerTime;
+        public GTextField m_txtAnswerNum;
+        public GLoader m_loaIocn;
+        public GTextField m_txtContent;
+        public GList m_listResult;
+        public GTextInput m_txtResult;
+        public GComponent m_comRightHead;
+        public GImage m_imgFail;
+        public GTextField m_txtInfo;
+        public GTextField m_txtCdTime;
+        public GTextField m_txtJoinNum;
+        public GList m_listJoin;
+        public GList m_listChat;
+        public GTextInput m_txtChat;
+        public GButton m_btnSend;
+        public const string URL = "ui://tw70qm9dpvb453";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueAnsweringUI";
+        private static UI_LeagueAnsweringUI _proxy;
+
+        public static UI_LeagueAnsweringUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueAnsweringUI();
+            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_LeagueAnsweringUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueAnsweringUI();
+            }
+            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_c2 = comp.GetController("c2");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtRightCount = (GTextField)comp.GetChild("txtRightCount");
+            m_txtAnswerTime = (GTextField)comp.GetChild("txtAnswerTime");
+            m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
+            m_loaIocn = (GLoader)comp.GetChild("loaIocn");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_listResult = (GList)comp.GetChild("listResult");
+            m_txtResult = (GTextInput)comp.GetChild("txtResult");
+            m_comRightHead = (GComponent)comp.GetChild("comRightHead");
+            m_imgFail = (GImage)comp.GetChild("imgFail");
+            m_txtInfo = (GTextField)comp.GetChild("txtInfo");
+            m_txtCdTime = (GTextField)comp.GetChild("txtCdTime");
+            m_txtJoinNum = (GTextField)comp.GetChild("txtJoinNum");
+            m_listJoin = (GList)comp.GetChild("listJoin");
+            m_listChat = (GList)comp.GetChild("listChat");
+            m_txtChat = (GTextInput)comp.GetChild("txtChat");
+            m_btnSend = (GButton)comp.GetChild("btnSend");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_loaBg = null;
+            m_btnBack = null;
+            m_txtTime = null;
+            m_btnRule = null;
+            m_txtRightCount = null;
+            m_txtAnswerTime = null;
+            m_txtAnswerNum = null;
+            m_loaIocn = null;
+            m_txtContent = null;
+            m_listResult = null;
+            m_txtResult = null;
+            m_comRightHead = null;
+            m_imgFail = null;
+            m_txtInfo = null;
+            m_txtCdTime = null;
+            m_txtJoinNum = null;
+            m_listJoin = null;
+            m_listChat = null;
+            m_txtChat = null;
+            m_btnSend = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueGiftUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueGiftUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnBack;
+        public GButton m_btnRule;
+        public GButton m_btnGet;
+        public GList m_list;
+        public GTextField m_txtTips;
+        public const string URL = "ui://tw70qm9dpvb45h";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueGiftUI";
+        private static UI_LeagueGiftUI _proxy;
+
+        public static UI_LeagueGiftUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueGiftUI();
+            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_LeagueGiftUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueGiftUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_list = (GList)comp.GetChild("list");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_btnRule = null;
+            m_btnGet = null;
+            m_list = null;
+            m_txtTips = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueSkillUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_comValue;
+        public GButton m_btnBack;
+        public GList m_listScore;
+        public GList m_list;
+        public const string URL = "ui://tw70qm9dpvb45a";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueSkillUI";
+        private static UI_LeagueSkillUI _proxy;
+
+        public static UI_LeagueSkillUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueSkillUI();
+            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_LeagueSkillUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueSkillUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comValue = (GComponent)comp.GetChild("comValue");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listScore = (GList)comp.GetChild("listScore");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_comValue = null;
+            m_btnBack = null;
+            m_listScore = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 87 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueSkillUpUI.cs

@@ -0,0 +1,87 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueSkillUpUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_comValue;
+        public GButton m_btnBack;
+        public GList m_listScore;
+        public UI_ListSkillTypeItem m_comSkillType;
+        public GList m_list;
+        public const string URL = "ui://tw70qm9dpvb45c";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueSkillUpUI";
+        private static UI_LeagueSkillUpUI _proxy;
+
+        public static UI_LeagueSkillUpUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueSkillUpUI();
+            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_LeagueSkillUpUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueSkillUpUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comValue = (GComponent)comp.GetChild("comValue");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listScore = (GList)comp.GetChild("listScore");
+            m_comSkillType = (UI_ListSkillTypeItem)UI_ListSkillTypeItem.Create(comp.GetChild("comSkillType"));
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_comValue = null;
+            m_btnBack = null;
+            m_listScore = null;
+            m_comSkillType.Dispose();
+            m_comSkillType = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerJoinItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListAnswerJoinItem
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GTextField m_txtAnswerCount;
+        public const string URL = "ui://tw70qm9dpvb455";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListAnswerJoinItem";
+        private static UI_ListAnswerJoinItem _proxy;
+
+        public static UI_ListAnswerJoinItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListAnswerJoinItem();
+            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_ListAnswerJoinItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListAnswerJoinItem();
+            }
+            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 = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtAnswerCount = (GTextField)comp.GetChild("txtAnswerCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_txtName = null;
+            m_txtAnswerCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListAnswerRewardItem.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_ListAnswerRewardItem
+    {
+        public GComponent target;
+        public GTextField m_txtDesc;
+        public GList m_listReward;
+        public const string URL = "ui://tw70qm9dpvb459";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListAnswerRewardItem";
+        private static UI_ListAnswerRewardItem _proxy;
+
+        public static UI_ListAnswerRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListAnswerRewardItem();
+            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_ListAnswerRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListAnswerRewardItem();
+            }
+            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_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDesc = null;
+            m_listReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItem.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_ListChatItem
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GLoader m_loaTitle;
+        public GTextField m_txtChatContent;
+        public const string URL = "ui://tw70qm9dpvb456";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListChatItem";
+        private static UI_ListChatItem _proxy;
+
+        public static UI_ListChatItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListChatItem();
+            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_ListChatItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListChatItem();
+            }
+            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 = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_txtName = null;
+            m_loaTitle = null;
+            m_txtChatContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListGiftItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GList m_listGift;
+        public GButton m_btnBuy;
+        public GTextField m_txtCount;
+        public GComponent m_comCost;
+        public GGroup m_grpLeader;
+        public const string URL = "ui://tw70qm9dpvb44z";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListGiftItem";
+        private static UI_ListGiftItem _proxy;
+
+        public static UI_ListGiftItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListGiftItem();
+            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_ListGiftItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListGiftItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_listGift = (GList)comp.GetChild("listGift");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+            m_grpLeader = (GGroup)comp.GetChild("grpLeader");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_listGift = null;
+            m_btnBuy = null;
+            m_txtCount = null;
+            m_comCost = null;
+            m_grpLeader = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListRankItem.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListRankItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaRank;
+        public GTextField m_txtRank;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GLoader m_loatitle;
+        public GTextField m_txtContent;
+        public const string URL = "ui://tw70qm9dpvb451";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListRankItem";
+        private static UI_ListRankItem _proxy;
+
+        public static UI_ListRankItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRankItem();
+            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_ListRankItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRankItem();
+            }
+            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_loaRank = (GLoader)comp.GetChild("loaRank");
+            m_txtRank = (GTextField)comp.GetChild("txtRank");
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loatitle = (GLoader)comp.GetChild("loatitle");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaRank = null;
+            m_txtRank = null;
+            m_comHead = null;
+            m_txtName = null;
+            m_loatitle = null;
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListSkillItem
+    {
+        public GComponent target;
+        public GLoader m_loaScore;
+        public GTextField m_txtScore;
+        public GComponent m_comCost;
+        public const string URL = "ui://tw70qm9dpvb45d";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListSkillItem";
+        private static UI_ListSkillItem _proxy;
+
+        public static UI_ListSkillItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSkillItem();
+            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_ListSkillItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSkillItem();
+            }
+            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_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaScore = null;
+            m_txtScore = null;
+            m_comCost = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillTypeItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListSkillTypeItem
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GTextField m_txtTitle;
+        public GTextField m_txtProgress;
+        public const string URL = "ui://tw70qm9dpvb45b";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListSkillTypeItem";
+        private static UI_ListSkillTypeItem _proxy;
+
+        public static UI_ListSkillTypeItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSkillTypeItem();
+            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_ListSkillTypeItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSkillTypeItem();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_txtTitle = null;
+            m_txtProgress = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 65 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/SkillSProxy.cs

@@ -4,7 +4,33 @@ using GFGGame;
 
 namespace ET
 {
-
+    public class NoticeAddSkill : AMHandler<S2C_SyncAddSkill>
+    {
+        protected override async ETTask Run(Session session, S2C_SyncAddSkill message)
+        {
+            Dictionary<int, List<int>> skillDatas = new Dictionary<int, List<int>>();
+            for (int i = 0; i < message.SkillInfos.Count; i++)
+            {
+                int skillType = message.SkillInfos[i].SkillType;
+                int skillId = message.SkillInfos[i].SkillId;
+                if (!skillDatas.ContainsKey(skillType))
+                {
+                    skillDatas[skillType] = new List<int>();
+                }
+                skillDatas[skillType].Add(skillId);
+            }
+            foreach (int key in skillDatas.Keys)
+            {
+                switch (key)
+                {
+                    case SkillType.LeagueSkill:
+                        SkillDataManager.Instance.UpdateSkillDatas(SkillType.LeagueSkill, skillDatas[key]);
+                        break;
+                }
+            }
+            await ETTask.CompletedTask;
+        }
+    }
 }
 namespace GFGGame
 {
@@ -25,5 +51,43 @@ namespace GFGGame
             }
             return false;
         }
+        public static async ETTask<bool> ReqGetSkillList(int skillType)
+        {
+            S2C_GetSkillList response = null;
+            response = (S2C_GetSkillList)await MessageHelper.SendToServer(new C2S_GetSkillList() { SKillType = skillType });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    switch (skillType)
+                    {
+                        case SkillType.LeagueSkill:
+                            SkillDataManager.Instance.UpdateSkillDatas(SkillType.LeagueSkill, response.SkillId);
+                            break;
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqActiveSkill(int skillType, int skillId)
+        {
+            S2C_ActiveSkill response = null;
+            response = (S2C_ActiveSkill)await MessageHelper.SendToServer(new C2S_ActiveSkill() { SkillType = skillType, SkillId = skillId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    switch (skillType)
+                    {
+                        case SkillType.LeagueSkill:
+                            SkillDataManager.Instance.UpdateSkillDatas(SkillType.LeagueSkill, new List<int>(skillId));
+                            break;
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

+ 13 - 10
GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -246,18 +246,21 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
             UI_ComCostCurrency.ProxyEnd();
         }
-        // public static void UpdateItemNeedNum1(GObject obj, int itemId, int needNum)
-        // {
-        //     UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
-        //     long hasNum = ItemDataManager.GetItemNum(itemId);
-        //     // string strNeedNum = StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : "#FBF6ED"); needNum.ToString();
-        //     com.m_txtNeed.text = needNum.ToString();
+        public static void UpdateItemNeedNum(GObject obj, int[] cost, bool checkNum = true, string color = "#716B59")
+        {
+            int itemId = cost[0];
+            int needNum = cost[1];
+            UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
+            com.m_c1.selectedIndex = needNum == 0 ? 0 : 1;
+            long hasNum = ItemDataManager.GetItemNum(itemId);
+            string strNeedNum = !checkNum ? StringUtil.GetColorText(needNum.ToString(), color) : StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : color); needNum.ToString();
+            com.m_txtNeed.text = strNeedNum;
 
 
-        //     ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
-        //     com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
-        //     UI_ComCostCurrency.ProxyEnd();
-        // }
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
+            com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+            UI_ComCostCurrency.ProxyEnd();
+        }
 
         public static void UpdateTag(GObject obj, string tag)
         {

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -239,11 +239,11 @@ namespace GFGGame
         }
         private void RenderListPropertyItem(int index, GObject obj)
         {
-            UI_ListPropertyItem listItem = UI_ListPropertyItem.Proxy(obj);
+            UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
 
             listItem.m_txtProperty.text = _cardData.scores[index + 1].ToString();
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
-            UI_ListPropertyItem.ProxyEnd();
+            UI_ListScoreItem.ProxyEnd();
         }
 
         /***********************************************************升级***************************************************/

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -66,11 +66,11 @@ namespace GFGGame
         private void RenderListPropertyItem(int index, GObject obj)
         {
 
-            UI_ListPropertyItem listItem = UI_ListPropertyItem.Proxy(obj);
+            UI_ListScoreItem listItem = UI_ListScoreItem.Proxy(obj);
 
             listItem.m_txtProperty.text = _scores[index + 1].ToString();
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
-            UI_ListPropertyItem.ProxyEnd();
+            UI_ListScoreItem.ProxyEnd();
         }
         //private void OnClickBtnBack()
         //{

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterFinishView.cs

@@ -58,17 +58,17 @@ namespace GFGGame
             for (int i = 0; i < count; i++)
             {
                 int score = i + 1;
-                UI_ListPropertyItem comPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comProperty" + i));
+                UI_ListScoreItem comPrpperty = UI_ListScoreItem.Proxy(_ui.target.GetChild("comProperty" + i));
                 int property = (int)_lastPropertyList[score];
                 comPrpperty.m_txtProperty.text = StringUtil.GetColorText(property.ToString(), "#5B4A3B");
                 comPrpperty.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
-                UI_ListPropertyItem.ProxyEnd();
+                UI_ListScoreItem.ProxyEnd();
 
-                UI_ListPropertyItem comAddPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comAddProperty" + i));
+                UI_ListScoreItem comAddPrpperty = UI_ListScoreItem.Proxy(_ui.target.GetChild("comAddProperty" + i));
                 int addProperty = (int)_curPropertyList[score];
                 comAddPrpperty.m_txtProperty.text = StringUtil.GetColorText(addProperty.ToString(), addProperty == property ? "#5B4A3B" : "#FFDE9E");
                 comAddPrpperty.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
-                UI_ListPropertyItem.ProxyEnd();
+                UI_ListScoreItem.ProxyEnd();
             }
             _ui.m_grpProperty.visible = true;
             _ui.m_t0.Play(() =>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
         private void ListPropertyItemRender(int index, GObject obj)
         {
             UI_ListPropertyAddItem item = UI_ListPropertyAddItem.Proxy(obj);
-            UI_ListPropertyItem comProperty = UI_ListPropertyItem.Proxy(item.m_comProperty);
+            UI_ListScoreItem comProperty = UI_ListScoreItem.Proxy(item.m_comProperty);
 
             int score = (int)_propertyList.GetKey(index);
             comProperty.m_txtProperty.text = _propertyList[score].ToString();
@@ -114,7 +114,7 @@ namespace GFGGame
             double addition = _addPropertyList[score] * 100 / 10000;
             item.m_txtAdd.text = string.Format("+{0}%", addition);
             UI_ListPropertyAddItem.ProxyEnd();
-            UI_ListPropertyItem.ProxyEnd();
+            UI_ListScoreItem.ProxyEnd();
         }
         private async void OnClickBtnFoster()
         {

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -221,11 +221,11 @@ namespace GFGGame
 
         private void ListPropertyItemRender(int index, GObject obj)
         {
-            UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(obj);
+            UI_ListScoreItem item = UI_ListScoreItem.Proxy(obj);
             int score = (int)_propertyList.GetKey(index);
             item.m_txtProperty.text = _propertyList[score].ToString();
             item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
-            UI_ListPropertyItem.ProxyEnd();
+            UI_ListScoreItem.ProxyEnd();
         }
 
         private void OnClickListFosterItem(EventContext context)

+ 8 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -103,6 +103,7 @@ namespace GFGGame
             UpdateTravel();
             UpdateGallery();
             UpdateArena();
+            UpdateLeagueContribution();
         }
         private void UpdateCurrency()
         {
@@ -152,7 +153,13 @@ namespace GFGGame
         {
             _valueBar.m_btnArena.GetChild("n3").asImage.visible = false;
             _valueBar.m_btnArena.text = "" + ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]);
-            // _valueBar.m_btnArena.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]).res);
+            _valueBar.m_btnArena.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.bonusSpecialWinArr[0][0]).res);
+        }
+        private void UpdateLeagueContribution()
+        {
+            _valueBar.m_btnLeagueContribuation.GetChild("n3").asImage.visible = false;
+            _valueBar.m_btnLeagueContribuation.text = "" + ItemDataManager.GetItemNum(ConstItemID.LEAGUE_CONTRIBUTION);
+            _valueBar.m_btnLeagueContribuation.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_CONTRIBUTION).res);
         }
     }
 }

+ 67 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs

@@ -0,0 +1,67 @@
+using System.Text.RegularExpressions;
+using ET;
+using FairyGUI;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //联盟答题
+    public class LeagueAnswerView : BaseWindow
+    {
+        private UI_LeagueAnswerUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueAnswerUI.PACKAGE_NAME;
+            _ui = UI_LeagueAnswerUI.Create();
+
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void UpdateView()
+        {
+
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs.meta

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

+ 135 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -0,0 +1,135 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //联盟技能激活
+    public class LeagueSkillUpView : BaseWindow
+    {
+        private UI_LeagueSkillUpUI _ui;
+        private ValueBarController _valueBarController;
+        private int _type;
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueSkillUpUI.PACKAGE_NAME;
+            _ui = UI_LeagueSkillUpUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listScore.itemRenderer = RenderListScoreItem;
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _valueBarController = new ValueBarController(_ui.m_comValue);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _type = (int)this.viewData;
+            _valueBarController.OnShown();
+            _valueBarController.Controller(11);
+            _ui.m_list.numItems = LeagueSkillCountCfgArray.Instance.dataArray.Length;
+            if (_type > LeagueDataManager.Instance.MaxFinishType)
+            {
+                _ui.m_list.ScrollToView(LeagueDataManager.Instance.MaxFinishLayer);
+            }
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueSkillView).FullName);
+        }
+        private void UpdateView()
+        {
+            _ui.m_listScore.numItems = 4;
+            UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(_ui.m_comSkillType.target);
+            item.m_txtProgress.text = LeagueDataManager.Instance.GetSkillProgressByType(_type).ToString();
+            UI_ListSkillTypeItem.ProxyEnd();
+        }
+        private void RenderListScoreItem(int index, GObject obj)
+        {
+            UI_ListScoreItem item = UI_ListScoreItem.Proxy(obj);
+            item.m_loaIcon.url = ResPathUtil.GetScorePath(index + 1);
+            item.m_txtProperty.text = LeagueDataManager.Instance.GetAllSkillScore(index + 1).ToString();
+            UI_ListScoreItem.ProxyEnd();
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            List<LeagueSkillCfg> skillCfgs = LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, index + 1);
+            UI_ListSkillLayerItem item = UI_ListSkillLayerItem.Proxy(obj);
+            if (item.m_listSkill.data == null)
+            {
+                item.m_listSkill.itemRenderer = RenderListSkillItem;
+            }
+            item.m_listSkill.data = skillCfgs;
+            item.m_listSkill.numItems = skillCfgs.Count;
+            UI_ListSkillLayerItem.ProxyEnd();
+        }
+        private void RenderListSkillItem(int index, GObject obj)
+        {
+            List<LeagueSkillCfg> skillCfgs = obj.parent.data as List<LeagueSkillCfg>;
+            UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
+            item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
+            item.m_txtScore.text = skillCfgs[index].value.ToString();
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], true);
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnActiveSkill);
+            }
+            item.target.data = skillCfgs[index].id;
+            UI_ListSkillItem.ProxyEnd();
+
+        }
+        private async void OnActiveSkill(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int skillId = (int)obj.data;
+            bool result = await SkillSProxy.ReqActiveSkill(SkillType.LeagueSkill, skillId);
+            if (result)
+            {
+                LeagueSkillCfg skillCfg = LeagueSkillCfgArray.Instance.GetCfg(skillId);
+
+            }
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs.meta

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

+ 103 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs

@@ -0,0 +1,103 @@
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //联盟技能
+    public class LeagueSkillView : BaseWindow
+    {
+        private UI_LeagueSkillUI _ui;
+        private ValueBarController _valueBarController;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueSkillUI.PACKAGE_NAME;
+            _ui = UI_LeagueSkillUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listScore.itemRenderer = RenderListScoreItem;
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _valueBarController = new ValueBarController(_ui.m_comValue);
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _valueBarController.OnShown();
+            _valueBarController.Controller(11);
+            _ui.m_listScore.numItems = 4;
+            _ui.m_list.numItems = LeagueSkillCountCfgArray.Instance.dataArray.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            _valueBarController.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueSkillView).FullName);
+        }
+
+        private void RenderListScoreItem(int index, GObject obj)
+        {
+            UI_ListScoreItem item = UI_ListScoreItem.Proxy(obj);
+            item.m_loaIcon.url = ResPathUtil.GetScorePath(index + 1);
+            item.m_txtProperty.text = LeagueDataManager.Instance.GetAllSkillScore(index + 1).ToString();
+            UI_ListScoreItem.ProxyEnd();
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            LeagueSkillCountCfg skillCountCfg = LeagueSkillCountCfgArray.Instance.GetCfg(index);
+            UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(obj);
+            item.m_txtProgress.text = LeagueDataManager.Instance.GetSkillProgressByType(skillCountCfg.type).ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnUpSkillClick);
+            }
+            UI_ListSkillTypeItem.ProxyEnd();
+        }
+
+        private void OnUpSkillClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int type = (int)obj.data;
+            ViewManager.Show<LeagueSkillUpView>(type);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs.meta

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

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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


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


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


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