联盟

FGUIProject/assets/CommonGame/components/ButtonBack1.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="90,90" extention="Button">
+<component size="111,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n2_dhoa" name="n2" src="uyuxtj4" fileName="imagesExport/xcpz_fhfh.png" xy="0,0"/>
+    <image id="n2_dhoa" name="n2" src="a0cftl1" fileName="imagesNew/back2.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ButtonBack2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="111,96" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n2_dhoa" name="n2" src="a0cf2i" fileName="imagesNew/back.png" xy="0,0"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="243,46">
+<component size="133,46">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="免费"/>
+    <remark page="1" value="付费"/>
+  </controller>
   <displayList>
-    <text id="n2_ojlz" name="n2" xy="0,0" size="76,46" group="n7_si5z" fontSize="34" color="#8e7c6b" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="91,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="156,0" size="87,46" group="n7_si5z" fontSize="34" color="#8e7c6b" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="243,50" advanced="true" layout="hz" colGap="15" excludeInvisibles="true">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="65,0" size="68,45" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="33" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <group id="n7_si5z" name="n7" xy="0,-2" size="133,50" advanced="true" layout="hz" colGap="15" excludeInvisibles="true">
+      <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
+    <text id="n11_a0cf" name="n11" xy="31,0" pivot="0.5,0" size="70,45" font="ui://eg2y0ldpa0cftks" fontSize="33" color="#716b59" align="center" text="免费">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
   </displayList>
   <relation target="n7_si5z" sidePair="width-width"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -241,7 +241,7 @@
     <component id="u2u3tkr" name="ListTagItem.xml" path="/components/" exported="true"/>
     <image id="jcej2l" name="jjsy_xx_1.png" path="/imagesExport/" exported="true"/>
     <image id="jcej2m" name="jjsy_xx_2.png" path="/imagesExport/" exported="true"/>
-    <font id="a0cftks" name="FangZhengKaiTiJianTi-1.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="a0cftks" name="FZKTJW--GB1-0.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="a0cftkt" name="SourceHanSerifCN-Bold-2.otf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="a0cftku" name="SourceHanSerifCN-ExtraLight-3.otf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="a0cftkv" name="SourceHanSerifCN-Heavy-4.otf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
@@ -250,6 +250,9 @@
     <font id="a0cftky" name="SourceHanSerifCN-Regular-1.otf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="a0cftkz" name="SourceHanSerifCN-SemiBold-7.otf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="a0cftl0" name="FangZhengHeiTiJianTi-1.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="a0cftl1" name="back2.png" path="/imagesNew/"/>
+    <image id="a0cf2i" name="back.png" path="/imagesNew/"/>
+    <component id="a0cftl2" name="ButtonBack2.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1113">
   <displayList>
-    <image id="n5_a0cf" name="n5" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
-    <text id="n1_rv09" name="txtName" xy="285,474" size="509,42" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入联盟名字，支持模糊搜索[/color]" maxLength="7"/>
-    <list id="n2_rv09" name="listIcon" xy="162,670" size="756,487" layout="flow_hz" overflow="scroll" defaultItem="ui://tw70qm9drv091h"/>
-    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/Button6.xml" xy="442,1530"/>
-    <component id="n4_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="421,1617" size="237,46"/>
-    <image id="n6_a0cf" name="n6" src="a0cf2a" fileName="images/biaotizi.png" xy="203,70"/>
-    <image id="n7_a0cf" name="n7" src="a0cf2g" fileName="images/lm_sousuok.png" xy="187,200"/>
+    <image id="n5_a0cf" name="n5" src="a0cf2e" fileName="images/lm_db.png" xy="0,49"/>
+    <image id="n6_a0cf" name="n6" src="a0cf2a" fileName="images/biaotizi.png" xy="203,118"/>
+    <image id="n8_a0cf" name="n8" src="a0cf2f" fileName="images/lm_db2.png" xy="186,305" group="n10_a0cf"/>
+    <text id="n9_a0cf" name="n9" xy="479,303" size="122,42" group="n10_a0cf" font="ui://eg2y0ldpa0cftky" fontSize="30" color="#ab8471" text="雅集徽章"/>
+    <group id="n10_a0cf" name="n10" xy="186,303" size="708,42"/>
+    <image id="n7_a0cf" name="n7" src="a0cf2g" fileName="images/lm_sousuok.png" xy="187,227"/>
+    <component id="n11_a0cf" name="btnBack" src="a0cftl2" fileName="components/ButtonBack2.xml" pkg="eg2y0ldp" xy="901,66"/>
+    <text id="n1_rv09" name="txtName" xy="213,233" size="509,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#775a33" autoSize="none" text="" input="true" prompt="[color=#A7957E]输入雅集名字，最多七个字[/color]" maxLength="7"/>
+    <list id="n2_rv09" name="listIcon" xy="133,353" size="827,449" layout="row" overflow="scroll" scroll="horizontal" colGap="30" defaultItem="ui://tw70qm9drv091h" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/Button6.xml" xy="410,830">
+      <Button title="创建雅集"/>
+    </component>
+    <component id="n4_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="473,890"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueJoinUI.xml

@@ -4,18 +4,27 @@
     <loader id="n0_u2u3" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_u2u3" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <image id="n7_a0cf" name="n7" src="a0cf2q" fileName="images/lm_db_chang.png" xy="0,220"/>
+    <image id="n8_a0cf" name="n8" src="a0cf2n" fileName="images/lm_sousuok2.png" xy="103,193"/>
+    <image id="n9_a0cf" name="n9" src="a0cf2x" fileName="images/biaotizi_2.png" xy="236,340"/>
+    <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <text id="n2_u2u3" name="txtSearch" xy="161,290" size="509,42" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入联盟名字，支持模糊搜索[/color]" maxLength="7"/>
-    <component id="n3_u2u3" name="btnSearch" src="u2u31c" fileName="components/Button4.xml" xy="654,282">
-      <Button title="搜索联盟"/>
+    <text id="n2_u2u3" name="txtSearch" xy="133,201" size="509,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#5d3d21" autoSize="none" text="" input="true" prompt="[color=#736451]输入联盟名字，支持模糊搜索[/color]" maxLength="7"/>
+    <component id="n3_u2u3" name="btnSearch" src="u2u31c" fileName="components/Button4.xml" xy="635,192">
+      <Button title="搜索雅集"/>
     </component>
-    <component id="n4_u2u3" name="btnCreat" src="u2u31c" fileName="components/Button4.xml" xy="850,283">
-      <Button title="创建联盟"/>
+    <component id="n4_u2u3" name="btnCreat" src="a0cf2y" fileName="components/Button41.xml" xy="867,192">
+      <Button title="创建雅集"/>
     </component>
-    <list id="n5_u2u3" name="list" xy="61,392" size="957,1325" overflow="scroll" defaultItem="ui://tw70qm9drv091f">
+    <image id="n10_a0cf" name="n10" src="a0cf2r" fileName="images/lm_kuang_1.png" xy="0,420" group="n15_a0cf"/>
+    <text id="n11_a0cf" name="n11" xy="188,422" size="116,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" text="雅集名称"/>
+    <text id="n12_a0cf" name="n12" xy="463,422" pivot="0.5,0" size="60,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="成员"/>
+    <text id="n13_a0cf" name="n13" xy="608,422" pivot="0.5,0" size="116,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="是否审核"/>
+    <text id="n14_a0cf" name="n14" xy="857,422" pivot="0.5,0" size="60,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="操作"/>
+    <group id="n15_a0cf" name="n15" xy="0,420" size="1080,41"/>
+    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" lineGap="17" defaultItem="ui://tw70qm9drv091f">
       <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>
@@ -23,11 +32,8 @@
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <component id="n6_u2u3" name="btnChange" src="u2u31c" fileName="components/Button4.xml" xy="442,1779">
+    <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1510">
       <Button title="换一批"/>
     </component>
   </displayList>

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -4,18 +4,22 @@
     <remark page="0" value="副会长"/>
     <remark page="1" value="会长"/>
   </controller>
+  <controller name="c2" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="712,581" size="29,29">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n0_rv09" name="n0" src="rv091s" fileName="components/Button15.xml" xy="387,673" group="n3_rv09">
+    <component id="n0_rv09" name="btnAppoint0" src="rv091s" fileName="components/Button15.xml" xy="387,673" group="n3_rv09">
       <gearDisplay controller="c1" pages="0,1"/>
+      <Button controller="c2" page="0"/>
     </component>
-    <component id="n1_rv09" name="n1" src="rv091s" fileName="components/Button15.xml" xy="387,756" group="n3_rv09">
+    <component id="n1_rv09" name="btnAppoint1" src="rv091s" fileName="components/Button15.xml" xy="387,756" group="n3_rv09">
       <gearDisplay controller="c1" pages="1"/>
+      <Button controller="c2" page="1"/>
     </component>
-    <component id="n2_rv09" name="n2" src="rv091s" fileName="components/Button15.xml" xy="387,839" group="n3_rv09">
+    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="387,839" group="n3_rv09">
       <gearDisplay controller="c1" pages="1"/>
+      <Button controller="c2" page="2"/>
     </component>
     <group id="n3_rv09" name="n3" xy="387,673" size="305,219" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
     <component id="n5_rv09" name="btnKick" src="rv091w" fileName="components/Button16.xml" xy="442,970">

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -1,5 +1,9 @@
 <?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>
   <displayList>
     <loader id="n0_rv09" name="loaBg" xy="534,969" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
@@ -22,19 +26,22 @@
       <item/>
       <item/>
     </list>
-    <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="73,1780" group="n25_rv09">
+    <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="442,1780" group="n25_rv09">
+      <gearDisplay controller="c1" pages="1"/>
       <Button title="招募成员"/>
     </component>
-    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/Button12.xml" xy="319,1780" group="n25_rv09">
+    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/Button12.xml" xy="688,1780" group="n25_rv09">
+      <gearDisplay controller="c1" pages="1"/>
       <Button title="申请列表"/>
     </component>
-    <component id="n24_rv09" name="btnMemberLog" src="rv091q" fileName="components/Button13.xml" xy="565,1780" group="n25_rv09">
+    <component id="n24_rv09" name="btnMemberLog" src="rv091q" fileName="components/Button13.xml" xy="934,1780" group="n25_rv09">
+      <gearDisplay controller="c1" pages="1"/>
       <Button title="联盟信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="811,1780" group="n25_rv09">
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="442,1780" group="n25_rv09">
       <Button title="退出联盟"/>
     </component>
-    <group id="n25_rv09" name="n25" xy="73,1780" size="934,60" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">
+    <group id="n25_rv09" name="n25" xy="442,1780" size="196,60" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/League/LeagueUI.xml

@@ -8,6 +8,21 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
+    <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="436,110" size="29,29">
+      <Button icon="ui://eg2y0ldpjcej2k"/>
+    </component>
+    <component id="n17_u2u3" name="btnChangeNotice" src="u2u319" fileName="components/Button1.xml" xy="894,299"/>
+    <component id="n18_u2u3" name="btnMember" src="u2u31a" fileName="components/Button2.xml" xy="480,94">
+      <Button title="雅集成员"/>
+    </component>
+    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="757,94">
+      <Button title="雅集建设"/>
+    </component>
+    <text id="n10_u2u3" name="txtUnionName" xy="95,200" size="198,41" fontSize="30" autoClearText="true" text="联盟名字7个字"/>
+    <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
+    <component id="n13_u2u3" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="275,247" scale="0.4,0.4"/>
+    <text id="n14_u2u3" name="txtLeaderName" xy="363,281" size="198,41" fontSize="30" autoClearText="true" text="会长名字7个字"/>
+    <text id="n15_u2u3" name="txtNotice" xy="291,334" size="642,81" fontSize="30" autoSize="none" autoClearText="true" text="联盟公告联盟公告联盟公告联盟公告联盟公告联盟公告"/>
     <component id="n7_u2u3" name="n7" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,447" group="n9_u2u3"/>
     <component id="n3_u2u3" name="n3" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,670" group="n9_u2u3"/>
     <component id="n4_u2u3" name="n4" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,895" group="n9_u2u3"/>
@@ -17,14 +32,5 @@
     <group id="n9_u2u3" name="n9" xy="70,447" size="1012,1495" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <text id="n10_u2u3" name="txtUnionName" xy="95,200" size="196,42" fontSize="30" autoClearText="true" text="联盟名字7个字"/>
-    <loader id="n11_u2u3" name="loaUnionIcon" xy="125,266" size="136,136" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n12_u2u3" name="txtUnionLv" xy="240,362" pivot="0.5,0" size="21,42" fontSize="30" align="center" text="1"/>
-    <component id="n13_u2u3" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="275,247" scale="0.4,0.4"/>
-    <text id="n14_u2u3" name="txtLeaderName" xy="363,281" size="196,42" fontSize="30" autoClearText="true" text="会长名字7个字"/>
-    <text id="n15_u2u3" name="txtNotice" xy="291,334" size="642,81" fontSize="30" autoSize="none" autoClearText="true" text="联盟公告联盟公告联盟公告联盟公告联盟公告联盟公告"/>
-    <component id="n17_u2u3" name="btnChangeNotice" src="u2u319" fileName="components/Button1.xml" xy="894,299"/>
-    <component id="n18_u2u3" name="btnMember" src="u2u31a" fileName="components/Button2.xml" xy="480,94"/>
-    <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="757,94"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/Button14.xml

@@ -3,10 +3,13 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <text id="n3_u2u3" name="title" xy="71,7" pivot="0.5,0" size="53,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="75,7" pivot="0.5,0" size="45,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
     <text id="n5_rv09" name="txtTime" xy="52,64" pivot="0.5,0" size="91,19" fontSize="12" align="center" text="剩余时间23：59"/>
+    <component id="n6_a0cf" name="comcost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,51">
+      <relation target="" sidePair="center-center"/>
+    </component>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

FGUIProject/assets/League/components/Button15.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="305,53" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n3_rv09" name="icon" xy="32,1" size="50,50"/>
-    <text id="n4_rv09" name="title" xy="150,5" size="53,42" fontSize="30" vars="true" text="{value=0}/{maxValue=3}"/>
-    <image id="n5_rv09" name="n5" src="rv091t" fileName="images/hz_zdzddg_1.png" xy="237,-1">
+    <loader id="n3_rv09" name="icon" xy="32,1" size="50,50" url="ui://eg2y0ldpkztethq"/>
+    <text id="n4_rv09" name="title" xy="150,5" size="45,41" fontSize="30" vars="true" text="{value=0}/{maxValue=3}"/>
+    <image id="n5_rv09" name="n5" src="rv091t" fileName="imageTest/hz_zdzddg_1.png" xy="237,-1">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n6_rv09" name="n6" src="rv091u" fileName="images/hz_zdzddg_2.png" xy="237,-1">
+    <image id="n6_rv09" name="n6" src="rv091u" fileName="imageTest/hz_zdzddg_2.png" xy="237,-1">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_rv09" name="n7" src="rv091t" fileName="images/hz_zdzddg_1.png" xy="237,-1" visible="false" color="#999999">
+    <image id="n7_rv09" name="n7" src="rv091t" fileName="imageTest/hz_zdzddg_1.png" xy="237,-1" visible="false" color="#999999">
       <gearDisplay controller="button" pages="0"/>
     </image>
   </displayList>
-  <Button mode="Check"/>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/League/components/Button2.xml

@@ -2,10 +2,11 @@
 <component size="196,60" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <text id="n3_u2u3" name="title" xy="197,8" size="70,42" fontSize="30" vars="true" text="{value=0}/{maxValue=70}">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
+    <text id="n3_u2u3" name="title" xy="67,8" pivot="0.5,0" size="61,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=70}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
+    <text id="n5_a0cf" name="txtCount" xy="197,9" size="61,42" fontSize="30" vars="true" text="{value=0}/{maxValue=70}"/>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

FGUIProject/assets/League/components/Button3.xml

@@ -3,13 +3,16 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" group="n6_u2u3" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <loader id="n5_u2u3" name="n5" xy="196,0" size="60,60" group="n6_u2u3" url="ui://eg2y0ldpg3nf9q" autoSize="true">
+    <loader id="n5_u2u3" name="loaCoin" xy="196,0" size="60,60" group="n6_u2u3" url="ui://eg2y0ldpg3nf9q" autoSize="true">
       <relation target="" sidePair="middle-middle"/>
     </loader>
-    <text id="n3_u2u3" name="title" xy="256,7" size="53,42" group="n6_u2u3" fontSize="30" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n7_a0cf" name="txtCount" xy="256,9" size="45,41" group="n6_u2u3" fontSize="30" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+    <group id="n6_u2u3" name="n6" xy="0,0" size="301,60" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n3_u2u3" name="title" xy="75,7" pivot="0.5,0" size="45,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
-    <group id="n6_u2u3" name="n6" xy="0,0" size="309,60" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

FGUIProject/assets/League/components/Button4.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <text id="n3_u2u3" name="title" xy="71,7" pivot="0.5,0" size="53,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="67,11" pivot="0.5,0" size="116,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="搜索雅集">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
+    <image id="n5_a0cf" name="n5" src="a0cf2s" fileName="images/lm_tb_sousuo.png" xy="24,13"/>
   </displayList>
   <Button/>
   <relation target="n4_u2u3" sidePair="width-width,height-height"/>

FGUIProject/assets/League/components/Button41.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="168,61" 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="168,61" aspect="true" url="ui://tw70qm9da0cf2v" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="26,11" pivot="0.5,0" size="116,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="搜索雅集">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/League/components/Button42.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="330,77" 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="330,77" aspect="true" url="ui://tw70qm9da0cf2t" fill="scale" autoSize="true"/>
+    <text id="n3_u2u3" name="title" xy="107,12" pivot="0.5,0" size="154,52" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#925a31" align="center" vars="true" text="搜索雅集">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+    <image id="n6_a0cf" name="n6" src="a0cf2p" fileName="images/lm_tb_huanyp.png" xy="52,20"/>
+  </displayList>
+  <Button/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/League/components/Button5.xml

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

FGUIProject/assets/League/components/Button6.xml

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

FGUIProject/assets/League/components/ComCurrency.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="81,60">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="免费"/>
-    <remark page="1" value="付费"/>
-  </controller>
-  <displayList>
-    <loader id="n0_rv09" name="loaIcon" xy="-22,0" size="60,60" group="n2_rv09" url="ui://eg2y0ldpq08x6"/>
-    <text id="n1_rv09" name="txtCount" xy="48,8" size="55,42" group="n2_rv09" fontSize="30" text="999"/>
-    <group id="n2_rv09" name="n2" xy="-22,0" size="126,60" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <text id="n3_rv09" name="n3" xy="10,10" pivot="0.5,0" size="62,42" fontSize="30" align="center" text="免费">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-  </displayList>
-</component>

FGUIProject/assets/League/components/ComLeader.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="231,288">
   <displayList>
-    <loader id="n4_rv09" name="loaTitle" xy="90,0" size="50,50"/>
+    <loader id="n4_rv09" name="loaTitle" xy="90,0" size="50,50" url="ui://eg2y0ldpkztethq"/>
     <component id="n2_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,23"/>
-    <text id="n3_rv09" name="txtname" xy="6,246" pivot="0.5,0" size="208,42" fontSize="30" align="center" text="玩家名字七个字"/>
+    <text id="n3_rv09" name="txtname" xy="4,246" pivot="0.5,0" size="211,41" fontSize="30" align="center" text="玩家名字七个字"/>
     <component id="n5_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="192,35"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ComLeagueHead.xml

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

FGUIProject/assets/League/components/ComPary.xml

@@ -2,15 +2,13 @@
 <component size="196,594">
   <displayList>
     <loader id="n2_rv09" name="LoaIcon" xy="27,0" pivot="0.5,0" size="142,142" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
-    <text id="n3_rv09" name="txtName" xy="52,162" pivot="0.5,0" size="91,41" fontSize="30" text="白檀香"/>
-    <component id="n4_rv09" name="comGain" src="rv0927" fileName="ComGain.xml" xy="38,221"/>
-    <component id="n6_rv09" name="comFirstGain" src="rv0927" fileName="ComGain.xml" xy="38,335">
-      <property target="txtDesc" propertyId="0" value="每日首次祈福"/>
-    </component>
+    <text id="n3_rv09" name="txtName" xy="51,162" pivot="0.5,0" size="93,41" fontSize="30" text="白檀香"/>
+    <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="38,221"/>
+    <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="38,335"/>
     <component id="n7_rv09" name="btnPray" src="rv0928" fileName="components/Button19.xml" xy="0,460">
       <Button title="祈福"/>
     </component>
-    <component id="n8_rv09" name="comCurrency" src="rv0926" fileName="ComCurrency.xml" xy="57,534"/>
+    <component id="n8_rv09" name="comCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,534"/>
   </displayList>
   <customProperty target="LoaIcon" propertyId="1"/>
   <customProperty target="txtName" propertyId="0"/>

FGUIProject/assets/League/components/ListIconItem.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="50,50">
+<component size="170,333" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n5_rv09" name="n5" xy="0,0" size="50,50"/>
+    <image id="n6_a0cf" name="n6" src="a0cf2c" fileName="images/db_xuanzhong.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n7_a0cf" name="n7" src="a0cf2b" fileName="images/db_weixuanz.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <loader id="n5_rv09" name="loaIcon" xy="37,81" size="100,100" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/League/components/ListJoinItem.xml

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="935,137">
   <displayList>
-    <text id="n7_u2u3" name="txtUnionName" xy="154,44" size="196,41" group="n10_u2u3" fontSize="30" autoClearText="true" text="联盟名字7个字"/>
-    <loader id="n8_u2u3" name="loaUnionIcon" xy="0,0" size="136,136" group="n10_u2u3" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n9_u2u3" name="txtUnionLv" xy="115,96" pivot="0.5,0" size="21,41" group="n10_u2u3" fontSize="30" align="center" text="1"/>
-    <group id="n10_u2u3" name="n10" xy="0,0" size="350,137"/>
-    <text id="n11_u2u3" name="txtMemberCount" xy="429,44" pivot="0.5,0" size="70,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=70}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-    <text id="n12_rv09" name="txtCheck" xy="590,44" pivot="0.5,0" size="70,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=70}">
-      <relation target="" sidePair="middle-middle,left-right"/>
-    </text>
-    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="739,31">
+    <text id="n7_u2u3" name="txtLeagueName" xy="150,23" size="188,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" autoClearText="true" text="联盟名字7个字"/>
+    <text id="n11_u2u3" name="txtMemberCount" xy="401,49" pivot="0.5,0" size="55,38" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}/{maxValue=70}"/>
+    <text id="n12_rv09" name="txtCheck" xy="584,49" pivot="0.5,0" size="30,38" fontSize="27" color="#66512c" align="center" text="是"/>
+    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="704,43">
       <Button title="申请"/>
     </component>
+    <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0"/>
+    <image id="n17_a0cf" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="2,138"/>
+    <image id="n18_a0cf" name="imgAd" src="a0cf2j" fileName="images/lm_yz.png" xy="150,74"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListMemberItem.xml

@@ -2,11 +2,11 @@
 <component size="923,230">
   <displayList>
     <component id="n15_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <loader id="n17_rv09" name="loaTitle" xy="219,61" size="50,50"/>
-    <text id="n16_rv09" name="txtName" xy="218,115" size="208,41" fontSize="30" align="center" text="玩家名字七个字"/>
-    <text id="n11_rv09" name="txtWeekContribuation" xy="532,108" pivot="0.5,0" size="21,41" fontSize="30" align="center" vars="true" text="{value=0}"/>
-    <text id="n12_rv09" name="txtAllContribuation" xy="672,114" pivot="0.5,0" size="21,41" fontSize="30" align="center" vars="true" text="{value=0}"/>
-    <text id="n18_rv09" name="txtState" xy="790,111" pivot="0.5,0" size="62,41" fontSize="30" align="center" text="在线"/>
+    <loader id="n17_rv09" name="loaTitle" xy="219,61" size="50,50" url="ui://eg2y0ldpkztethq"/>
+    <text id="n16_rv09" name="txtName" xy="218,115" size="211,41" fontSize="30" align="center" text="玩家名字七个字"/>
+    <text id="n11_rv09" name="txtWeekContribuation" xy="478,108" pivot="0.5,0" size="128,42" fontSize="30" align="center" text="{value=0}"/>
+    <text id="n12_rv09" name="txtAllContribuation" xy="618,114" pivot="0.5,0" size="128,42" fontSize="30" align="center" text="{value=0}"/>
+    <text id="n18_rv09" name="txtState" xy="789,111" pivot="0.5,0" size="63,41" fontSize="30" align="center" text="在线"/>
     <component id="n19_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="884,113"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -59,7 +59,6 @@
     <component id="rv0923" name="ListLogItem.xml" path="/components/"/>
     <image id="rv0924" name="bpjly_jtjt_3.png" path="/imageTest/"/>
     <component id="rv0925" name="ComConstruct.xml" path="/components/"/>
-    <component id="rv0926" name="ComCurrency.xml" path="/components/"/>
     <component id="rv0927" name="ComGain.xml" path="/components/"/>
     <component id="rv0928" name="Button19.xml" path="/components/"/>
     <component id="rv0929" name="ComPary.xml" path="/components/"/>
@@ -71,7 +70,23 @@
     <image id="a0cf2f" name="lm_db2.png" path="/images/"/>
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
     <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
-    <image id="a0cf2i" name="back.png" path="/images/"/>
+    <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
+    <image id="a0cf2k" name="lm_db_lvl.png" path="/images/"/>
+    <image id="a0cf2l" name="lm_huizhangdk.png" path="/images/"/>
+    <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
+    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/"/>
+    <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
+    <image id="a0cf2q" name="lm_db_chang.png" path="/images/"/>
+    <image id="a0cf2r" name="lm_kuang_1.png" path="/images/"/>
+    <image id="a0cf2s" name="lm_tb_sousuo.png" path="/images/"/>
+    <image id="a0cf2t" name="lm_an_3.png" path="/images/"/>
+    <image id="a0cf2u" name="lm_zhuangshixian.png" path="/images/"/>
+    <image id="a0cf2v" name="lm_an_pink.png" path="/images/"/>
+    <image id="a0cf2w" name="lm_an_2.png" path="/images/"/>
+    <image id="a0cf2x" name="biaotizi_2.png" path="/images/"/>
+    <component id="a0cf2y" name="Button41.xml" path="/components/"/>
+    <component id="a0cf2z" name="Button42.xml" path="/components/"/>
+    <component id="a0cf30" name="ComLeagueHead.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -45,6 +45,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
+      <item url="ui://mfvz4q8kwg7t8y" name="btnLeague"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -129,6 +129,9 @@ namespace GFGEditor
         private static string[] HeadBorderPaths { get { return new string[] { ResRootPath + "头像/头像框/" }; } }
         public static string HeadBorderTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Head/HeadBorder/";
         public static string HeadBorderMd5FileSaveName = "HeadBorderMd5";
+        private static string[] LeagueIconPaths { get { return new string[] { ResRootPath + "联盟徽章/" }; } }
+        public static string LeagueIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/LeagueIcon/";
+        public static string LeagueIconMd5FileSaveName = "LeagueIconMd5";
 
         public static void Import()
         {
@@ -195,6 +198,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入玩家头像框资源", 1);
             ImportRes(HeadBorderPaths, HeadBorderTargetPath, HeadBorderMd5FileSaveName);
 
+            EditorUtility.DisplayProgressBar("进度", "正在导入联盟徽章资源", 1);
+            ImportRes(LeagueIconPaths, LeagueIconTargetPath, LeagueIconMd5FileSaveName);
+
             //清除冗余动画
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -278,6 +278,7 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath, new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath, new string[] { ImportArtResTool.HeadMd5FileSaveName });
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath, new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LeagueIconTargetPath, new string[] { ImportArtResTool.LeagueIconMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath, new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
 

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -103,8 +103,11 @@ namespace GFGGame
         public const string ARENA_FIGHT_RESULT = "ARENA_FIGHT_RESULT";//竞技场战斗结算
 
         public const string LEAGUE_MEMBER_CHANGE = "LEAGUE_MEMBER_CHANGE";//联盟成员变化
+        public const string LEAGUE_MEMBER_POS_CHANGE = "LEAGUE_MEMBER_POS_CHANGE";//联盟成员职位变化
         public const string LEAGUE_LOG_CHANGE = "LEAGUE_LOG_CHANGE";//联盟日志变化
         public const string LEAGUE_INFO_CHANGE = "LEAGUE_INFO_CHANGE";//联盟信息变化
         public const string LEAGUE_NUMBERIC_CHANGE = "LEAGUE_NUMBERIC_CHANGE";//联盟数值变化
+        public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE";//其他玩家信息变化
+
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -244,15 +244,8 @@ namespace GFGGame
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
-
-            // if (ArenaDataManager.Instance.IsSeasonOpen)
-            // {
             ArenaDataManager.Instance.ReqArenaInfo();
-            // }
-            // else
-            // {
-            //     ArenaDataManager.Instance.AddCheckSeasonOpenTimer();
-            // }
+            LeagueSproxy.ReqGetLeagueInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -24,13 +24,13 @@ namespace GFGGame
             switch (type)
             {
                 case LeagueNumericType.HallLevel:
-                    LeagueData.HallLevel = value;
+                    LeagueData.HallLevel = (int)value;
                     break;
                 case LeagueNumericType.HotelLevel:
-                    LeagueData.HotelLevel = value;
+                    LeagueData.HotelLevel = (int)value;
                     break;
                 case LeagueNumericType.StoreLevel:
-                    LeagueData.StoreLevel = value;
+                    LeagueData.StoreLevel = (int)value;
                     break;
                 case LeagueNumericType.LowKeepDay:
                     LeagueData.LowKeepDay = value;

GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -34,9 +34,6 @@ namespace GFGGame
             }
         }
 
-
-
-
         public void Add(int itemId)
         {
             ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);

GameClient/Assets/Game/HotUpdate/Data/VO/LeagueData.cs

@@ -9,14 +9,17 @@ namespace GFGGame
         public string Icon;//联盟徽章（资源名）
         public string Notice;//联盟公告
         public int Num;//联盟人数
-        public int AdEndTime;//广告结束时间
-        public long HallLevel { get; set; } //会客厅等级 影响 小酒馆等级上限，小金库等级上限，
-        public long HotelLevel { get; set; } //小酒馆等级 影响 人数上限 会花上限 每日新加入联盟成员上限 招募额外增加的成员上限，
-        public long StoreLevel { get; set; } //金库等级 影响 联盟资金储存上限
+        public int FlowerNum;//联盟会花人数
+        public long AdEndTime;//广告结束时间
+        public int HallLevel { get; set; } //会客厅等级 影响 小酒馆等级上限，小金库等级上限，
+        public int HotelLevel { get; set; } //小酒馆等级 影响 人数上限 会花上限 每日新加入联盟成员上限 招募额外增加的成员上限，
+        public int StoreLevel { get; set; } //金库等级 影响 联盟资金储存上限
         public long LowKeepDay { get; set; } //低维护天数
         public long LeagueCoin { get; set; } //联盟资金
         public long DayAdd { get; set; } //新加入联盟成员人数
         public long NeedAudit { get; set; } //是否需要审核 0不用 1需要
+        public long OwnerId = 0;
+        public long SubOwnerId = 0;
         public Dictionary<long, LeagueMemberData> LeagueMemberDatas = new Dictionary<long, LeagueMemberData>();//联盟成员
     }
 
@@ -35,6 +38,7 @@ namespace GFGGame
         public string Name;//联盟名字
         public string Icon;//联盟徽章（资源名）
         public int Num;//联盟人数
+        public int MaxNum;//联盟人数上限
         public bool NeedAudit;//是否需要审核
         public bool IsAd;//是否是广告
         public int ApplyStatus;//0:可申请，1:申请中, 3:拒绝

GameClient/Assets/Game/HotUpdate/Data/VO/OtherRoleInfoData.cs

@@ -10,7 +10,18 @@ namespace GFGGame
         public int headId;//头像
         public int headBorderId;//头像框
         public string headRes = "";//头像资源，机器人用
-        public long offlineTimeSec;//离线时间戳，单位秒，0表示在线
+        private long _offlineTimeSec = 0;
+        public long offlineTimeSec
+        {
+            get
+            {
+                return _offlineTimeSec * 1000;
+            }
+            set
+            {
+                _offlineTimeSec = value;
+            }
+        }//离线时间戳，单位毫秒，0表示在线
 
 
     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComCostCurrency
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaIcon;
         public GTextField m_txtNeed;
         public const string URL = "ui://eg2y0ldpn3xha1";
@@ -56,11 +57,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaIcon = null;
             m_txtNeed = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button14.cs

@@ -8,6 +8,7 @@ namespace UI.League
     {
         public GButton target;
         public GTextField m_txtTime;
+        public GComponent m_comcost;
         public const string URL = "ui://tw70qm9drv091r";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "Button14";
@@ -56,10 +57,12 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_comcost = (GComponent)comp.GetChild("comcost");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtTime = null;
+            m_comcost = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComCurrency.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button2.cs

@@ -4,39 +4,37 @@ using FairyGUI;
 
 namespace UI.League
 {
-    public partial class UI_ComCurrency
+    public partial class UI_Button2
     {
-        public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
+        public GButton target;
         public GTextField m_txtCount;
-        public const string URL = "ui://tw70qm9drv0926";
+        public const string URL = "ui://tw70qm9du2u31a";
         public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "ComCurrency";
-        private static UI_ComCurrency _proxy;
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
 
-        public static UI_ComCurrency Create(GObject gObject = null)
+        public static UI_Button2 Create(GObject gObject = null)
         {
-            var ui = new UI_ComCurrency();
+            var ui = new UI_Button2();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_ComCurrency Proxy(GObject gObject = null)
+        public static UI_Button2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComCurrency();
+                _proxy = new UI_Button2();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -57,14 +55,10 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaIcon = null;
             m_txtCount = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComCurrency.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a1c09df5e5136fc4b9980268f7899184
+guid: ff81de8402f08a44f8c9424db837f1e6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button3.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_Button3
+    {
+        public GButton target;
+        public GLoader m_loaCoin;
+        public GTextField m_txtCount;
+        public const string URL = "ui://tw70qm9du2u31b";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "Button3";
+        private static UI_Button3 _proxy;
+
+        public static UI_Button3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button3();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button3();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaCoin = (GLoader)comp.GetChild("loaCoin");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCoin = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComGain.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button3.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 070648de1ac3dd1468d54c7d8689cfd5
+guid: f238d8cf3f0121642aea2f296a408a96
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComGain.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComLeagueHead.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.League
 {
-    public partial class UI_ComGain
+    public partial class UI_ComLeagueHead
     {
         public GComponent target;
-        public GTextField m_txtDesc;
-        public UI_ComCurrency m_comCurrency;
-        public const string URL = "ui://tw70qm9drv0927";
+        public GLoader m_loaUnionIcon;
+        public GTextField m_txtUnionLv;
+        public const string URL = "ui://tw70qm9da0cf30";
         public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "ComGain";
-        private static UI_ComGain _proxy;
+        public const string RES_NAME = "ComLeagueHead";
+        private static UI_ComLeagueHead _proxy;
 
-        public static UI_ComGain Create(GObject gObject = null)
+        public static UI_ComLeagueHead Create(GObject gObject = null)
         {
-            var ui = new UI_ComGain();
+            var ui = new UI_ComLeagueHead();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.League
             return ui;
         }
 
-        public static UI_ComGain Proxy(GObject gObject = null)
+        public static UI_ComLeagueHead Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComGain();
+                _proxy = new UI_ComLeagueHead();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,14 +56,13 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_comCurrency = (UI_ComCurrency)UI_ComCurrency.Create(comp.GetChild("comCurrency"));
+            m_loaUnionIcon = (GLoader)comp.GetChild("loaUnionIcon");
+            m_txtUnionLv = (GTextField)comp.GetChild("txtUnionLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtDesc = null;
-            m_comCurrency.Dispose();
-            m_comCurrency = null;
+            m_loaUnionIcon = null;
+            m_txtUnionLv = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComLeagueHead.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComPary.cs

@@ -9,10 +9,10 @@ namespace UI.League
         public GComponent target;
         public GLoader m_LoaIcon;
         public GTextField m_txtName;
-        public UI_ComGain m_comGain;
-        public UI_ComGain m_comFirstGain;
+        public GComponent m_comGain;
+        public GComponent m_comFirstGain;
         public GButton m_btnPray;
-        public UI_ComCurrency m_comCurrency;
+        public GComponent m_comCurrency;
         public const string URL = "ui://tw70qm9drv0929";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ComPary";
@@ -62,21 +62,18 @@ namespace UI.League
         {
             m_LoaIcon = (GLoader)comp.GetChild("LoaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_comGain = (UI_ComGain)UI_ComGain.Create(comp.GetChild("comGain"));
-            m_comFirstGain = (UI_ComGain)UI_ComGain.Create(comp.GetChild("comFirstGain"));
+            m_comGain = (GComponent)comp.GetChild("comGain");
+            m_comFirstGain = (GComponent)comp.GetChild("comFirstGain");
             m_btnPray = (GButton)comp.GetChild("btnPray");
-            m_comCurrency = (UI_ComCurrency)UI_ComCurrency.Create(comp.GetChild("comCurrency"));
+            m_comCurrency = (GComponent)comp.GetChild("comCurrency");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_LoaIcon = null;
             m_txtName = null;
-            m_comGain.Dispose();
             m_comGain = null;
-            m_comFirstGain.Dispose();
             m_comFirstGain = null;
             m_btnPray = null;
-            m_comCurrency.Dispose();
             m_comCurrency = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueCreatUI.cs

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeagueCreatUI
     {
         public GComponent target;
+        public GButton m_btnBack;
         public GTextInput m_txtName;
         public GList m_listIcon;
         public GButton m_btnCreat;
@@ -58,6 +59,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtName = (GTextInput)comp.GetChild("txtName");
             m_listIcon = (GList)comp.GetChild("listIcon");
             m_btnCreat = (GButton)comp.GetChild("btnCreat");
@@ -65,6 +67,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnBack = null;
             m_txtName = null;
             m_listIcon = null;
             m_btnCreat = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberAppointUI.cs

@@ -8,7 +8,11 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GButton m_btnRule;
+        public GButton m_btnAppoint0;
+        public GButton m_btnAppoint1;
+        public GButton m_btnAppoint2;
         public GButton m_btnKick;
         public const string URL = "ui://tw70qm9du2u36";
         public const string PACKAGE_NAME = "League";
@@ -58,13 +62,21 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_btnAppoint0 = (GButton)comp.GetChild("btnAppoint0");
+            m_btnAppoint1 = (GButton)comp.GetChild("btnAppoint1");
+            m_btnAppoint2 = (GButton)comp.GetChild("btnAppoint2");
             m_btnKick = (GButton)comp.GetChild("btnKick");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_btnRule = null;
+            m_btnAppoint0 = null;
+            m_btnAppoint1 = null;
+            m_btnAppoint2 = null;
             m_btnKick = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueMemberUI.cs

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeagueMemberUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
         public GButton m_btnback;
         public UI_ComLeader m_comChairman;
@@ -63,6 +64,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comChairman = (UI_ComLeader)UI_ComLeader.Create(comp.GetChild("comChairman"));
@@ -75,6 +77,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
             m_btnback = null;
             m_comChairman.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -9,15 +9,15 @@ namespace UI.League
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnback;
+        public GButton m_btnRule;
+        public GButton m_btnChangeNotice;
+        public UI_Button2 m_btnMember;
+        public UI_Button3 m_btnConstruct;
         public GTextField m_txtUnionName;
-        public GLoader m_loaUnionIcon;
-        public GTextField m_txtUnionLv;
+        public UI_ComLeagueHead m_comLeagueHead;
         public GComponent m_comHead;
         public GTextField m_txtLeaderName;
         public GTextField m_txtNotice;
-        public GButton m_btnChangeNotice;
-        public GButton m_btnMember;
-        public GButton m_btnConstruct;
         public const string URL = "ui://tw70qm9du2u32";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueUI";
@@ -67,29 +67,32 @@ namespace UI.League
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
+            m_btnMember = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMember"));
+            m_btnConstruct = (UI_Button3)UI_Button3.Create(comp.GetChild("btnConstruct"));
             m_txtUnionName = (GTextField)comp.GetChild("txtUnionName");
-            m_loaUnionIcon = (GLoader)comp.GetChild("loaUnionIcon");
-            m_txtUnionLv = (GTextField)comp.GetChild("txtUnionLv");
+            m_comLeagueHead = (UI_ComLeagueHead)UI_ComLeagueHead.Create(comp.GetChild("comLeagueHead"));
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLeaderName = (GTextField)comp.GetChild("txtLeaderName");
             m_txtNotice = (GTextField)comp.GetChild("txtNotice");
-            m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
-            m_btnMember = (GButton)comp.GetChild("btnMember");
-            m_btnConstruct = (GButton)comp.GetChild("btnConstruct");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnback = null;
+            m_btnRule = null;
+            m_btnChangeNotice = null;
+            m_btnMember.Dispose();
+            m_btnMember = null;
+            m_btnConstruct.Dispose();
+            m_btnConstruct = null;
             m_txtUnionName = null;
-            m_loaUnionIcon = null;
-            m_txtUnionLv = null;
+            m_comLeagueHead.Dispose();
+            m_comLeagueHead = null;
             m_comHead = null;
             m_txtLeaderName = null;
             m_txtNotice = null;
-            m_btnChangeNotice = null;
-            m_btnMember = null;
-            m_btnConstruct = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListIconItem.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_ListIconItem
+    {
+        public GButton target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://tw70qm9drv091h";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListIconItem";
+        private static UI_ListIconItem _proxy;
+
+        public static UI_ListIconItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListIconItem();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListIconItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListIconItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListIconItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListJoinItem.cs

@@ -7,12 +7,12 @@ namespace UI.League
     public partial class UI_ListJoinItem
     {
         public GComponent target;
-        public GTextField m_txtUnionName;
-        public GLoader m_loaUnionIcon;
-        public GTextField m_txtUnionLv;
+        public GTextField m_txtLeagueName;
         public GTextField m_txtMemberCount;
         public GTextField m_txtCheck;
         public GButton m_btnJoin;
+        public UI_ComLeagueHead m_comLeagueHead;
+        public GImage m_imgAd;
         public const string URL = "ui://tw70qm9drv091f";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListJoinItem";
@@ -60,21 +60,22 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_txtUnionName = (GTextField)comp.GetChild("txtUnionName");
-            m_loaUnionIcon = (GLoader)comp.GetChild("loaUnionIcon");
-            m_txtUnionLv = (GTextField)comp.GetChild("txtUnionLv");
+            m_txtLeagueName = (GTextField)comp.GetChild("txtLeagueName");
             m_txtMemberCount = (GTextField)comp.GetChild("txtMemberCount");
             m_txtCheck = (GTextField)comp.GetChild("txtCheck");
             m_btnJoin = (GButton)comp.GetChild("btnJoin");
+            m_comLeagueHead = (UI_ComLeagueHead)UI_ComLeagueHead.Create(comp.GetChild("comLeagueHead"));
+            m_imgAd = (GImage)comp.GetChild("imgAd");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtUnionName = null;
-            m_loaUnionIcon = null;
-            m_txtUnionLv = null;
+            m_txtLeagueName = null;
             m_txtMemberCount = null;
             m_txtCheck = null;
             m_btnJoin = null;
+            m_comLeagueHead.Dispose();
+            m_comLeagueHead = null;
+            m_imgAd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -18,7 +18,7 @@ namespace GFGGame
             await ETTask.CompletedTask;
         }
     }
-    //通知有人离开了联盟
+
     //通知有人申请加入联盟
     public class NoticeApplyLeague : AMHandler<L2C_NoticeApplyLeague>
     {
@@ -34,7 +34,8 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, L2C_NoticeLeaveLeague message)
         {
-            if (message.LeagueId == LeagueDataManager.Instance.LeagueData.LeagueId)
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
+            if (message.LeagueId == leagueData.LeagueId)
             {
                 if (message.LeaveRoleId == RoleDataManager.roleId)//自己离开联盟
                 {
@@ -48,7 +49,15 @@ namespace GFGGame
                 }
                 else
                 {
-                    LeagueDataManager.Instance.LeagueData.LeagueMemberDatas.Remove(message.LeaveRoleId);
+                    leagueData.LeagueMemberDatas.Remove(message.LeaveRoleId);
+                    if (message.LeaveRoleId == leagueData.OwnerId)
+                    {
+                        leagueData.OwnerId = 0;
+                    }
+                    else if (message.LeaveRoleId == leagueData.SubOwnerId)
+                    {
+                        leagueData.SubOwnerId = 0;
+                    }
                 }
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             }
@@ -71,8 +80,18 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, L2C_NoticeLeaguePosChange message)
         {
-            if (message.LeagueId == LeagueDataManager.Instance.LeagueData.LeagueId)
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
+
+            if (message.LeagueId == leagueData.LeagueId)
             {
+                if (message.Position == LeaguePosPower.Owner)
+                {
+                    leagueData.OwnerId = message.RoleId;
+                }
+                else if (message.Position == LeaguePosPower.SubOwner)
+                {
+                    leagueData.SubOwnerId = message.RoleId;
+                }
                 LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[message.RoleId].Pos = message.Position;
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             }
@@ -80,7 +99,7 @@ namespace GFGGame
         }
     }
 
-    //通知有人加入了联盟
+    //通知联盟信息变化
     public class NoticeLeagueInfoChange : AMHandler<L2C_NoticeLeagueInfoChange>
     {
         protected override async ETTask Run(Session session, L2C_NoticeLeagueInfoChange message)
@@ -117,6 +136,21 @@ namespace GFGGame
             await ETTask.CompletedTask;
         }
     }
+    //同步玩家联盟贡献统计
+    public class NoticeLeagueContribution : AMHandler<S2C_LeagueContribution>
+    {
+        protected override async ETTask Run(Session session, S2C_LeagueContribution message)
+        {
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
+            if (leagueData.LeagueMemberDatas.ContainsKey(message.RoleId))
+            {
+                leagueData.LeagueMemberDatas[message.RoleId].WeekContribution = message.WeekContribution;
+                leagueData.LeagueMemberDatas[message.RoleId].AllContribution = message.AllContribution;
+            }
+
+            await ETTask.CompletedTask;
+        }
+    }
 
 
     public static class LeagueSproxy
@@ -286,6 +320,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    LeagueDataManager.Instance.Clear();
                     return true;
                 }
             }
@@ -329,6 +364,21 @@ namespace GFGGame
             }
             return false;
         }
+        //发广告
+        public static async ETTask<bool> ReqSendLeagueAD()
+        {
+            S2C_SendLeagueAD response = null;
+            response = (S2C_SendLeagueAD)await MessageHelper.SendToServer(new C2S_SendLeagueAD() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LeagueDataManager.Instance.LeagueData.AdEndTime = response.AdEndTime;
+                    return true;
+                }
+            }
+            return false;
+        }
         //获取加入退出日志
         public static async ETTask<bool> ReqLeagueJoinQuitLog()
         {
@@ -390,11 +440,17 @@ namespace GFGGame
             leagueData.Icon = leagueDetailInfo.Icon;
             leagueData.Notice = leagueDetailInfo.Notice;
             leagueData.Num = leagueDetailInfo.Num;
+            leagueData.FlowerNum = 0;
+            leagueData.AdEndTime = leagueDetailInfo.AdEndTime;
+            leagueData.OwnerId = leagueDetailInfo.OwnerId;
+            leagueData.SubOwnerId = leagueDetailInfo.SubOwnerId;
+
             leagueData.LeagueMemberDatas.Clear();
             for (int i = 0; i < leagueDetailInfo.LeagueMemberDetailInfo.Count; i++)
             {
                 LeagueMemberData memberData = GetLeagueMemberData(leagueDetailInfo.LeagueMemberDetailInfo[i]);
                 leagueData.LeagueMemberDatas[memberData.RoleInfo.roleId] = memberData;
+                if (memberData.Pos == LeaguePos.Flower) leagueData.FlowerNum++;
             }
             for (int i = 0; i < leagueDetailInfo.NumberKeys.Count; i++)
             {
@@ -422,6 +478,7 @@ namespace GFGGame
             listData.Name = listInfoProto.Name;
             listData.Icon = listInfoProto.Icon;
             listData.Num = listInfoProto.Num;
+            listData.MaxNum = listInfoProto.MaxNum;
             listData.NeedAudit = listInfoProto.NeedAudit;
             listData.IsAd = listInfoProto.IsAd;
             listData.ApplyStatus = listInfoProto.ApplyStatus;

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -7,6 +7,31 @@ using UnityEngine.Networking;
 
 namespace GFGGame
 {
+    //推送其他玩家基础信息变化
+    public class NoticeOtherInfo : AMHandler<S2C_NoticeOtherInfo>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeOtherInfo message)
+        {
+            for (int i = 0; i < message.RoleInfos.Count; i++)
+            {
+                if (LeagueDataManager.Instance.LeagueData.LeagueMemberDatas.ContainsKey(message.RoleInfos[i].RoleId))
+                {
+                    UpdateRoleChange(LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[message.RoleInfos[i].RoleId].RoleInfo, message.RoleInfos[i]);
+                }
+            }
+            EventAgent.DispatchEvent(ConstMessage.OTHER_ROLE_INFO_CHANGE);
+            await ETTask.CompletedTask;
+        }
+        private void UpdateRoleChange(OtherRoleInfoData roleInfoData, OtherRoleInfoProto roleInfoProto)
+        {
+            roleInfoData.roleId = roleInfoProto.RoleId;
+            roleInfoData.roleLv = roleInfoProto.RoleLvl;
+            roleInfoData.roleName = roleInfoProto.RoleName;
+            roleInfoData.headId = roleInfoProto.HeadItemId;
+            roleInfoData.headBorderId = roleInfoProto.HeadBorderItemId;
+            roleInfoData.offlineTimeSec = roleInfoProto.OfflineTimeSec;
+        }
+    }
     public static class RoleInfoSProxy
     {
         //请求个人信息

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -221,7 +221,7 @@ namespace GFGGame
             return "png";
         }
 
-        public static void SetItemNumAndNeedNum(GObject obj, int itemId, int needNum, bool ChangeColor = false)
+        public static void UpdateItemNumAndNeedNum(GObject obj, int itemId, int needNum, bool ChangeColor = false)
         {
             UI_ComCostCurrencyWithHas com = UI_ComCostCurrencyWithHas.Proxy(obj);
             long hasNum = ItemDataManager.GetItemNum(itemId);
@@ -233,11 +233,12 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
 
         }
-        public static void SetItemNeedNum(GObject obj, int itemId, int needNum)
+        public static void UpdateItemNeedNum(GObject obj, int itemId, int needNum)
         {
             UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
+            com.m_c1.selectedIndex = needNum == 0 ? 0 : 1;
             long hasNum = ItemDataManager.GetItemNum(itemId);
-            string strNeedNum = StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : "#8E7C6B"); needNum.ToString();
+            string strNeedNum = StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : "#716B59"); needNum.ToString();
             com.m_txtNeed.text = strNeedNum;
 
 
@@ -245,18 +246,18 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
             UI_ComCostCurrency.ProxyEnd();
         }
-        public static void SetItemNeedNum1(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 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();
 
 
-            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)
         {

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -156,5 +156,10 @@ namespace GFGGame
         {
             return $"{Shader_DIR_PATH}/{res}.shader";
         }
+
+        public static string GetLeagueIconPath(string res, string extName = "png")
+        {
+            return $"{TEXTURE_DIR_PATH}/LeagueIcon/{res}.{extName}";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -67,6 +67,7 @@ namespace GFGGame
             str = "秒";
         }
 
+
         /// <summary>
         /// 将时间戳转换成yyyy/m/d格式
         /// </summary>
@@ -123,5 +124,18 @@ namespace GFGGame
 
             return str;
         }
+
+        /// <summary>
+        /// 输入一段时间（秒），将时间转换成hh:ss格式
+        /// </summary>
+        /// <param name="timeMsec"></param>
+        public static string FormattingTime5(int timeMsec)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, timeMsec);
+
+            return string.Format("{0}:{1}:{2}", ts.Hours, ts.Minutes, ts.Seconds);
+        }
+
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -327,7 +327,7 @@ namespace GFGGame
         private void UpdateNormal()
         {
             ItemUtil.UpdateTag(_ui.m_comTag, _dataManager.Tag);
-            ItemUtil.SetItemNeedNum1(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
             _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
             _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
             _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
@@ -359,7 +359,7 @@ namespace GFGGame
             {
                 _ui.m_txtRefreshCount.visible = false;
                 _ui.m_comCostCurrent.target.visible = true;
-                ItemUtil.SetItemNeedNum1(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -564,7 +564,7 @@ namespace GFGGame
                 }
                 _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
 
-                ItemUtil.SetItemNumAndNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
+                ItemUtil.UpdateItemNumAndNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
 
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -37,7 +37,7 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            if(_dressUpObjUI != null)
+            if (_dressUpObjUI != null)
             {
                 _dressUpObjUI.Dispose();
                 _dressUpObjUI = null;
@@ -324,7 +324,7 @@ namespace GFGGame
             long costHas = ItemDataManager.GetItemNum(renewCfg.costId);
             int costNeed = renewCfg.costNum;
 
-            ItemUtil.SetItemNeedNum(_ui.m_comRenewCost, renewCfg.costId, renewCfg.costNum);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comRenewCost, renewCfg.costId, renewCfg.costNum);
             long itemHas = ItemDataManager.GetItemNum(renewCfg.materialsArr[0][0]);
             int itemNeed = renewCfg.materialsArr[0][1];
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -304,12 +304,12 @@ namespace GFGGame
             ItemCfg clothingSyntheticCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
             // string costName = ItemUtil.GetItemName(clothingSyntheticCfg.syntheticCostID);
             // _ui.m_txtCost.SetVar("v1", "" + clothingSyntheticCfg.syntheticCostNum).SetVar("v2", costName).FlushVars();
-            if(clothingSyntheticCfg.syntheticCostID <= 0)
+            if (clothingSyntheticCfg.syntheticCostID <= 0)
             {
                 Log.Error($"请为物品 {clothingSyntheticCfg.id} 增加合成相关配置！");
                 return;
             }
-            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrency, clothingSyntheticCfg.syntheticCostID, clothingSyntheticCfg.syntheticCostNum);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrency, clothingSyntheticCfg.syntheticCostID, clothingSyntheticCfg.syntheticCostNum);
             _materiarsOfSelectedItem = ItemUtil.CreateItemDataList(clothingSyntheticCfg.syntheticMateriarsArr);
             _ui.m_listMaterias.numItems = _materiarsOfSelectedItem.Count;
 

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChangeNoticeView.cs

@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
 using UI.League;
@@ -25,10 +26,14 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeagueChangeNoticeUI.PACKAGE_NAME;
             _ui = UI_LeagueChangeNoticeUI.Create();
+
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
+            _ui.m_txtContent.onFocusOut.Add(OnFocuseOut);
         }
         protected override void AddEventListener()
         {
@@ -52,5 +57,23 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+        private void OnFocuseOut()
+        {
+            _ui.m_txtCount.SetVar("value", _ui.m_txtContent.text.Length.ToString());
+            _ui.m_txtCount.SetVar("maxValue", "50");
+        }
+        private async void OnBtnSaveClick()
+        {
+            if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
+                return;
+            }
+            bool result = await LeagueSproxy.ReqChangeLeagueNotice(_ui.m_txtContent.text);
+            if (result)
+            {
+                Hide();
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueCreatView.cs

@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
 using UI.League;
@@ -25,10 +26,16 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeagueCreatUI.PACKAGE_NAME;
             _ui = UI_LeagueCreatUI.Create();
+
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnBack.onClick.Add(Hide);
+            _ui.m_btnCreat.onClick.Add(OnBtnCreatClick);
+            _ui.m_listIcon.itemRenderer = RenderListItem;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {
@@ -38,7 +45,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_listIcon.numItems = GlobalCfgArray.globalCfg.badgeResArr.Length;
+            _ui.m_listIcon.selectedIndex = 0;
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCost, GlobalCfgArray.globalCfg.consumeCreateArr[0][0], GlobalCfgArray.globalCfg.consumeCreateArr[0][1]);
         }
 
         protected override void OnHide()
@@ -52,5 +61,47 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private async void OnBtnCreatClick()
+        {
+            string leagueName = _ui.m_txtName.text;
+            if (string.IsNullOrEmpty(leagueName))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集名字不能为空");
+                return;
+            }
+
+            if (leagueName.Length > GFGGame.GlobalConst.MaxNameLen)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集名字最多七个字");
+                return;
+            }
+
+            if (!Regex.IsMatch(leagueName, @"^[\u4e00-\u9fa5_0-9]+$"))//角色起名仅允许汉字、数字、底划线
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集名字仅允许汉字、数字、下划线");
+                return;
+            }
+            long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeCreateArr[0][0]);
+            long needCount = GlobalCfgArray.globalCfg.consumeCreateArr[0][1];
+            if (hasCount < needCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
+
+            bool result = await LeagueSproxy.ReqCreateLeague(leagueName, GlobalCfgArray.globalCfg.badgeResArr[_ui.m_listIcon.selectedIndex]);
+            if (result)
+            {
+                ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null }, true);
+            }
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListIconItem item = UI_ListIconItem.Proxy(obj);
+            item.m_loaIcon.url = ResPathUtil.GetLeagueIconPath(GlobalCfgArray.globalCfg.badgeResArr[index]);
+            UI_ListIconItem.ProxyEnd();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueJoinView.cs

@@ -28,7 +28,14 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnSearch.onClick.Add(OnBtnSearchClick);
+            _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
+            _ui.m_btnCreat.onClick.Add(OnBtnCreatClick);
+            _ui.m_txtSearch.onFocusOut.Add(OnFocuseOut);
+            _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
         {
@@ -38,13 +45,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_list.numItems = LeagueDataManager.Instance.ListDatas.Count;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
@@ -52,5 +58,84 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueJoinView).FullName);
+        }
+        private void OnBtnSearchClick()
+        {
+            ReqLeagueList(_ui.m_txtSearch.text);
+        }
+        private void OnBtnChangeClick()
+        {
+            ReqLeagueList("");
+        }
+        private void OnFocuseOut()
+        {
+            if (string.IsNullOrEmpty(_ui.m_txtSearch.text))
+            {
+                ReqLeagueList("");
+            }
+        }
+        private void OnBtnCreatClick()
+        {
+            ViewManager.Show<LeagueCreatView>(null, new object[] { typeof(LeagueJoinView).FullName, null });
+        }
+        private async void ReqLeagueList(string leagueName)
+        {
+            bool result = await LeagueSproxy.ReqSearchLeagueInfo(leagueName);
+            if (result)
+            {
+                _ui.m_list.numItems = LeagueDataManager.Instance.ListDatas.Count;
+            }
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            LeagueListData leagueListData = LeagueDataManager.Instance.ListDatas[index];
+            UI_ListJoinItem item = UI_ListJoinItem.Proxy(obj);
+            item.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueListData.Icon);
+            item.m_comLeagueHead.m_txtUnionLv.text = "建筑等级";
+            item.m_txtLeagueName.text = leagueListData.Name;
+            item.m_imgAd.visible = leagueListData.IsAd;
+            item.m_txtMemberCount.SetVar("value", leagueListData.Num.ToString()).FlushVars();
+            item.m_txtMemberCount.SetVar("maxValue", leagueListData.MaxNum.ToString()).FlushVars();
+            item.m_txtCheck.text = leagueListData.NeedAudit ? "是" : "否";
+            item.m_btnJoin.title = "申请";
+            if (item.m_btnJoin.data == null)
+            {
+                item.m_btnJoin.onClick.Add(OnBtnJoinClick);
+            }
+            item.m_btnJoin.data = index;
+
+            UI_ListJoinItem.ProxyEnd();
+        }
+        private async void OnBtnJoinClick(EventContext context)
+        {
+            GButton obj = context.sender as GButton;
+            long index = (int)obj.data;
+            LeagueListData leagueListData = LeagueDataManager.Instance.ListDatas[index];
+            if (leagueListData.NeedAudit)
+            {
+                AlertUI.Show("该雅集需要审批同意后才可加入，是否仍需要申请？").
+                SetLeftButton(true, "取消").
+                 SetRightButton(true, "申请", async (object param) =>
+                 {
+                     bool result = await LeagueSproxy.ReqJoinLeague(leagueListData.LeagueId);
+                     if (result)
+                     {
+                         obj.title = "已申请";
+                     }
+                 });
+            }
+            else
+            {
+                bool result = await LeagueSproxy.ReqJoinLeague(leagueListData.LeagueId);
+                if (result)
+                {
+                    OnBtnBackClick();
+                    ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null });
+                }
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberAppointView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     public class LeagueMemberAppointView : BaseWindow
     {
         private UI_LeagueMemberAppointUI _ui;
+        private LeagueMemberData _memberData;
 
         public override void Dispose()
         {
@@ -25,10 +26,21 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeagueMemberAppointUI.PACKAGE_NAME;
             _ui = UI_LeagueMemberAppointUI.Create();
+
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_btnKick.onClick.Add(OnBtnKickClick);
+            _ui.m_btnAppoint0.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint0.data = LeaguePos.Owner;
+            _ui.m_btnAppoint1.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint1.data = LeaguePos.SubOwner;
+            _ui.m_btnAppoint2.onClick.Add(OnBtnAppointClick);
+            _ui.m_btnAppoint2.data = LeaguePos.Flower;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
         protected override void AddEventListener()
         {
@@ -38,7 +50,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _memberData = this.viewData as LeagueMemberData;
         }
 
         protected override void OnHide()
@@ -52,5 +64,37 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>();
+        }
+        private void OnBtnKickClick()
+        {
+            AlertUI.Show("是否确认请离这个小伙伴")
+            .SetLeftButton(true, "取消")
+            .SetRightButton(true, "确认", async (object param) =>
+            {
+                bool result = await LeagueSproxy.ReqKickLeague(_memberData.RoleInfo.roleId);
+                if (result)
+                {
+                    Hide();
+                }
+            });
+        }
+        private void OnBtnAppointClick()
+        {
+
+        }
+
+        private void UpdateView()
+        {
+            _ui.m_c1.selectedIndex = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos == LeaguePos.Owner ? 1 : 0;
+            _ui.m_btnAppoint0.title = "1/1";
+            _ui.m_btnAppoint1.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? true : false;
+            _ui.m_btnAppoint1.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
+
+            _ui.m_btnAppoint2.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? true : false;
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.League;
@@ -9,7 +10,8 @@ namespace GFGGame
     public class LeagueMemberView : BaseWindow
     {
         private UI_LeagueMemberUI _ui;
-
+        private LeagueData _leagueData;
+        private List<long> _memberIds;
         public override void Dispose()
         {
             if (_ui != null)
@@ -28,29 +30,240 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnRecruit.target.onClick.Add(OnBtnRecruitClick);
+            _ui.m_btnApplyList.onClick.Add(OnBtnApplyListClick);
+            _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);
+            _ui.m_btnExit.onClick.Add(OnBtnExitClick);
+
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.SetVirtual();
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateMember);
 
         }
         protected override void OnShown()
         {
             base.OnShown();
 
+            UpdateMember();
+            UpdateBtnRecruit();
+
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            Timers.inst.Remove(OnUpdateTimer);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateMember);
+        }
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueMemberView).FullName);
+        }
+        //招募
+        private void OnBtnRecruitClick()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.consumeWantedArr[0][0]);
+            long needCount = GlobalCfgArray.globalCfg.consumeWantedArr[0][1];
+            long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeWantedArr[0][0]);
+            if (needCount > hasCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
+            string tips = string.Format("是否花费{0}货币发布24小时招募成员信息，并临时增加新加入成员上限?", itemCfg.name);
+            AlertUI.Show(tips).
+            SetLeftButton(true, "取消").
+             SetRightButton(true, "确认", async (object param) =>
+             {
+                 bool result = await LeagueSproxy.ReqSendLeagueAD();
+                 if (result)
+                 {
+                     UpdateBtnRecruit();
+                 }
+             });
+        }
+        //申请列表
+        private void OnBtnApplyListClick()
+        {
+            ViewManager.Show<LeagueApplyView>(null, new object[] { typeof(LeagueMemberView).FullName, null });
+        }
+        //联盟日志
+        private void OnBtnMemberLogClick()
+        {
+            ViewManager.Show<LeagueMemberLogView>(null, new object[] { typeof(LeagueMemberView).FullName, null });
+        }
+        //退出联盟
+        private void OnBtnExitClick()
+        {
+            if (LeagueDataManager.Instance.LeagueData.OwnerId == RoleDataManager.roleId)
+            {
+                AlertUI.Show("一家之主不可无呀，先把会长职位给别人吧~").SetRightButton(true, "确认");
+            }
+            else
+            {
+                long joinLeagueTime = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].JoinLeagueTime;
+                long curTime = TimeHelper.ServerNow();
+                long seconds = (curTime - joinLeagueTime) / 1000;
+                if (seconds < TimeUtil.SECOND_PER_DAY)
+                {
+                    AlertUI.Show("您加入的时间不足一天").SetRightButton(true, "确认");
+                }
+                else
+                {
+                    AlertUI.Show("您加入的时间不足一天")
+                    .SetLeftButton(true, "取消")
+                    .SetRightButton(true, "确认", async (object param) =>
+                    {
+                        bool result = await LeagueSproxy.ReqQuitLeague();
+                        if (result)
+                        {
+                            ViewManager.Show<MainUIView>(null, null, true);
+                        }
+                    });
+                }
+            }
+        }
+        private void UpdateMember()
+        {
+            _leagueData = LeagueDataManager.Instance.LeagueData;
+            _memberIds = new List<long>(_leagueData.LeagueMemberDatas.Keys);
+
+            int ownerIndex = _memberIds.IndexOf(_leagueData.OwnerId);
+            if (ownerIndex >= 0) _memberIds.RemoveAt(ownerIndex);
+            int subOwnerIndex = _memberIds.IndexOf(_leagueData.SubOwnerId);
+            if (subOwnerIndex >= 0) _memberIds.RemoveAt(subOwnerIndex);
+
+            _memberIds = SortMemberIds(_memberIds);
+            _ui.m_list.numItems = _memberIds.Count;
+        }
+        private void UpdateBtnRecruit()
+        {
+            ItemUtil.UpdateItemNeedNum(_ui.m_btnRecruit.m_comcost, GlobalCfgArray.globalCfg.consumeWantedArr[0][0], GlobalCfgArray.globalCfg.consumeWantedArr[0][1]);
+            int myPos = _leagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
+            bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            long timeCount = (_leagueData.AdEndTime - TimeHelper.ServerNow()) / 1000;
+
+            _ui.m_btnRecruit.target.touchable = timeCount <= 0;
+            _ui.m_btnRecruit.m_comcost.visible = timeCount > 0 ? false : true;
+            _ui.m_btnRecruit.m_txtTime.text = "";
+
+            if (isLeader && timeCount > 0)
+            {
+                _ui.m_btnRecruit.m_txtTime.visible = timeCount > 0 ? true : false;
+                Timers.inst.Add(1, (int)timeCount, OnUpdateTimer);
+            }
+        }
+        private void OnUpdateTimer(object param)
+        {
+            int timeCount = (int)(_leagueData.AdEndTime - TimeHelper.ServerNow()) / 1000;
+            if (timeCount <= 0)
+            {
+                _ui.m_btnRecruit.target.touchable = true;
+                _ui.m_btnRecruit.m_txtTime.text = "";
+                Timers.inst.Remove(OnUpdateTimer);
+            }
+            string time = TimeUtil.FormattingTime5(timeCount);
+            _ui.m_btnRecruit.m_txtTime.text = string.Format("剩余时间：{0}", time);
+        }
+        private void UpdateLeader(GObject obj, long roleId)
+        {
+            LeagueMemberData memberData = _leagueData.LeagueMemberDatas.ContainsKey(roleId) ? _leagueData.LeagueMemberDatas[roleId] : null;
+            UI_ComLeader com = UI_ComLeader.Proxy(obj);
+            if (memberData == null)
+            {
+                RoleInfoManager.Instance.UpdateHead(com.m_comHead, 0, 0);
+                com.m_txtname.text = "虚位以待";
+                com.m_btnAppoint.visible = false;
+            }
+            else
+            {
+                RoleInfoManager.Instance.UpdateHead(com.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId);
+                com.m_txtname.text = memberData.RoleInfo.roleName;
+                com.m_btnAppoint.visible = memberData.Pos == LeaguePos.SubOwner && _leagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos == LeaguePos.Owner;
+                if (com.m_btnAppoint.data == null)
+                {
+                    com.m_btnAppoint.onClick.Add(OnBtnAppointClick);
+                }
+                com.m_btnAppoint.data = memberData;
+            }
+            UI_ComLeader.Proxy();
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            LeagueMemberData memberData = _leagueData.LeagueMemberDatas[_memberIds[index]];
+
+            UI_ListMemberItem item = UI_ListMemberItem.Proxy(obj);
+
+            RoleInfoManager.Instance.UpdateHead(item.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId);
+            item.m_txtName.text = memberData.RoleInfo.roleName;
+            item.m_txtWeekContribuation.text = memberData.WeekContribution.ToString();
+            item.m_txtAllContribuation.text = memberData.AllContribution.ToString();
+            if (memberData.RoleInfo.offlineTimeSec == 0)
+            {
+                item.m_txtState.text = "在线";
+            }
+            else
+            {
+                TimeUtil.FormattingTime(memberData.RoleInfo.offlineTimeSec, TimeHelper.ServerNow(), out int num, out string strState);
+                strState = strState == "秒" ? "刚刚" : num + strState + "前";
+                item.m_txtState.text = strState;
+            }
+            int myPos = _leagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
+
+            item.m_btnAppoint.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            if (item.m_btnAppoint.data == null)
+            {
+                item.m_btnAppoint.onClick.Add(OnBtnAppointClick);
+            }
+            item.m_btnAppoint.data = memberData;
+            UI_ListMemberItem.ProxyEnd();
+        }
+
+        private void OnBtnAppointClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            LeagueMemberData memberData = obj.data as LeagueMemberData;
+            if (!_leagueData.LeagueMemberDatas.ContainsKey(memberData.RoleInfo.roleId))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("该玩家已离开雅集");
+                return;
+            }
+            ViewManager.Show<LeagueMemberAppointView>(memberData, new object[] { typeof(LeagueMemberView).FullName, null });
+        }
+
+        private List<long> SortMemberIds(List<long> memberIds)
+        {
+            memberIds.Sort((long a, long b) =>
+            {
+                LeagueMemberData memberDataA = _leagueData.LeagueMemberDatas[a];
+                LeagueMemberData memberDataB = _leagueData.LeagueMemberDatas[b];
+                if (memberDataA.Pos == LeaguePos.Flower && memberDataB.Pos != LeaguePos.Flower) return 1;
+                if (memberDataA.Pos != LeaguePos.Flower && memberDataB.Pos == LeaguePos.Flower) return -1;
+                if (memberDataA.RoleInfo.offlineTimeSec == 0 && memberDataB.RoleInfo.offlineTimeSec != 0) return 1;
+                if (memberDataA.RoleInfo.offlineTimeSec != 0 && memberDataB.RoleInfo.offlineTimeSec == 0) return -1;
+                if (memberDataA.WeekContribution > memberDataB.WeekContribution) return 1;
+                if (memberDataA.WeekContribution < memberDataB.WeekContribution) return -1;
+                if (memberDataA.AllContribution > memberDataB.AllContribution) return 1;
+                if (memberDataA.AllContribution < memberDataB.AllContribution) return -1;
+                if (memberDataA.RoleInfo.roleLv > memberDataB.RoleInfo.roleLv) return 1;
+                if (memberDataA.RoleInfo.roleLv < memberDataB.RoleInfo.roleLv) return -1;
+                if (a > b) return 1;
+                if (a < b) return -1;
+                return 0;
+            });
 
+            return memberIds;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -29,16 +29,23 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnMember.target.onClick.Add(OnBtnMemberClick);
+            _ui.m_btnConstruct.target.onClick.Add(OnBtnConstructClick);
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateInfo);
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateValue);
         }
         protected override void OnShown()
         {
             base.OnShown();
-
+            LeagueMemberData MyMemberData = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId];
+            _ui.m_btnChangeNotice.visible = MyMemberData.Pos == LeaguePos.Owner || MyMemberData.Pos == LeaguePos.SubOwner;
+            UpdateValue();
         }
 
         protected override void OnHide()
@@ -50,6 +57,48 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateInfo);
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateValue);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+        }
+        private void OnBtnMemberClick()
+        {
+            ViewManager.Show<LeagueMemberView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
+        private void OnBtnConstructClick()
+        {
+            ViewManager.Show<LeagueConstructView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>();
+        }
+        private void UpdateInfo()
+        {
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
+            _ui.m_txtUnionName.text = leagueData.Name;
+            _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);
+            _ui.m_comLeagueHead.m_txtUnionLv.text = leagueData.HallLevel.ToString();
+            _ui.m_txtNotice.text = leagueData.Notice;
+            _ui.m_txtLeaderName.text = leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleName;
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId);
+        }
+        private void UpdateValue()
+        {
+            LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
+            _ui.m_btnMember.m_txtCount.SetVar("value", leagueData.Num.ToString()).FlushVars();
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(leagueData.HotelLevel);
+            _ui.m_btnMember.m_txtCount.SetVar("maxValue", hotelCfg.limit.ToString()).FlushVars();
+
+            _ui.m_btnConstruct.m_txtCount.SetVar("value", leagueData.LeagueCoin.ToString()).FlushVars();
+            LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(leagueData.StoreLevel);
+            _ui.m_btnConstruct.m_txtCount.SetVar("maxValue", storeCfg.limitStore.ToString()).FlushVars();
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(ConstItemID.LEAGUE_COIN);
+            _ui.m_btnConstruct.m_loaCoin.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
 
         }
     }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -231,7 +231,7 @@ namespace GFGGame
 
                 _fightTimes = _fightType == 1 ? 1 : _fightTimes;
                 int power = _fightTimes * levelCfg.power;
-                ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, power);
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, power);
                 _ui.m_comCostCurrent.visible = _fightTimes > 0 && power > 0;
 
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -199,7 +199,7 @@ namespace GFGGame
             }
             _ui.m_txtTitle.text = title;
             _ui.m_txtLevelDesc.text = levelCfg.desc;
-            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, levelCfg.power);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, levelCfg.power);
             _ui.m_comCostCurrent.visible = levelCfg.power > 0;
             // _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
         private GButton _btnPengYouQuan;
         private GButton _btnJInShu;
         private GButton _btnTianGong;
+        private GButton _btnLeague;
         private GButton _btnStore;
         private GButton _btnTuJian;
         private GButton _btnStudio;
@@ -104,6 +105,7 @@ namespace GFGGame
             _btnYouJian = _ui.m_list.GetChild("btnYouJian").asButton;
             _btnRenWu = _ui.m_list.GetChild("btnRenWu").asButton;
             _btnPengYouQuan = _ui.m_list.GetChild("btnPengYouQuan").asButton;
+            _btnLeague = _ui.m_list.GetChild("btnLeague").asButton;
             _btnStore = _ui.m_list.GetChild("btnStore").asButton;
             _btnTianGong = _ui.m_list.GetChild("btnTianGong").asButton;
             _btnTuJian = _ui.m_list.GetChild("btnTuJian").asButton;
@@ -133,6 +135,7 @@ namespace GFGGame
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
 
+            _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
             _btnYouJian.onClick.Add(OnClickBtnYouJian);
@@ -503,6 +506,19 @@ namespace GFGGame
             ViewManager.Show<BagView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
 
+        private void OnClickBtnLeague()
+        {
+            // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LeagueView).Name)) return;
+            if (LeagueDataManager.Instance.Type == 2)//已加入联盟
+            {
+                ViewManager.Show<LeagueView>();
+            }
+            else//未加入联盟
+            {
+                ViewManager.Show<LeagueJoinView>();
+            }
+        }
         private void OnClickBtnStore()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
@@ -596,6 +612,7 @@ namespace GFGGame
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
+            _btnLeague.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LeagueView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
 

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs

@@ -100,7 +100,7 @@ namespace GFGGame
 
             _ui.m_txtShow.text = "选择购买数量";
             _ui.m_txtTips.text = string.Format("确定购买{0}个{1}？", _buyCount, itemCfg.name);
-            ItemUtil.SetItemNeedNum(_ui.m_comCost.target, cfg.costId, (int)_buyCount * cfg.costNum);
+            ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, cfg.costId, (int)_buyCount * cfg.costNum);
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -62,12 +62,12 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 0;
             _ui.m_txtNum.text = string.Format("(今天已兑换{0}/{1}次)", _studioData.BuyTimes, _studioCfg.buyNum);
 
-            ItemUtil.SetItemNumAndNeedNum(_ui.m_comCostItem, _studioCfg.itemID, _studioCfg.itemNum, true);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, _studioCfg.itemID, _studioCfg.itemNum, true);
 
             if (_studioCfg.moneyId <= 0) return;
             _ui.m_c1.selectedIndex = 1;
             StudioCfgArray.Instance.GetMoneyIdAndNum(_studioCfg.id, _studioData.BuyTimes, 1, out int moneyId, out int moneyNum);
-            ItemUtil.SetItemNumAndNeedNum(_ui.m_comCostCurrent, _studioCfg.moneyId, moneyNum, true);
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostCurrent, _studioCfg.moneyId, moneyNum, true);
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -28,23 +28,13 @@ namespace GFGGame
         {
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("Common"));
             UIConfig.buttonSound = (NAudioClip)UIPackage.GetItemAsset("Common", "click");
-            // Font afont = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("ALIBABAPUHUITI-2-55-REGULAR"));
-            // FontManager.RegisterFont(new DynamicFont("ALIBABAPUHUITI-2-55-REGULAR", afont));
-            // UIConfig.defaultFont = "ALIBABAPUHUITI-2-55-REGULAR";
-
-            // Font afont4 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("YUNJINSONG"));
-            // FontManager.RegisterFont(new DynamicFont("YUNJINSONG", afont4));
-
-            // Font afont6 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FANGZHENGYANSONG"));
-            // FontManager.RegisterFont(new DynamicFont("FANGZHENGYANSONG", afont6));
-
 
             Font font0 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FangZhengHeiTiJianTi-1", "ttf"));
             FontManager.RegisterFont(new DynamicFont("FangZhengHeiTiJianTi-1", font0));
             UIConfig.defaultFont = "FangZhengHeiTiJianTi-1";
 
-            Font font1 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FangZhengKaiTiJianTi-1", "ttf"));
-            FontManager.RegisterFont(new DynamicFont("FangZhengKaiTiJianTi-1", font1));
+            Font font1 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FZKTJW--GB1-0", "ttf"));
+            FontManager.RegisterFont(new DynamicFont("FZKTJW--GB1-0", font1));
             Font font2 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SourceHanSerifCN-Regular-1", "otf"));
             FontManager.RegisterFont(new DynamicFont("SourceHanSerifCN-Regular-1", font2));
             Font font3 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("SourceHanSerifCN-Bold-2", "otf"));

GameClient/Assets/ResIn/Font/FangZhengKaiTiJianTi-1.ttf.meta → GameClient/Assets/ResIn/Font/FZKTJW--GB1-0.ttf.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7c139bc764ebe3b4385c33a0218d1ace
+guid: 4ec98f09765768b49a2fee6aa2f5ca26
 TrueTypeFontImporter:
   externalObjects: {}
   serializedVersion: 4