联盟

FGUIProject/assets/League/components/Button6.xml → FGUIProject/assets/Common/components/BtnBig.xml

@@ -2,7 +2,7 @@
 <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="260,62" aspect="true" url="ui://tw70qm9da0cf2d" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="260,62" aspect="true" url="ui://mk0fwx0xa0cf2d" 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>

FGUIProject/assets/League/components/Button5.xml → FGUIProject/assets/Common/components/BtnSmall.xml

@@ -2,7 +2,7 @@
 <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="214,51" aspect="true" url="ui://tw70qm9da0cf2w" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="214,51" aspect="true" url="ui://mk0fwx0xa0cf2w" 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>

FGUIProject/assets/Common/package.xml

@@ -15,7 +15,7 @@
     <component id="qp4l4v" name="FloatingTextPromptSuccessUI.xml" path="/" exported="true"/>
     <component id="g9264w" name="LogUI.xml" path="/" exported="true"/>
     <component id="g9264x" name="ListLogItem.xml" path="/components/"/>
-    <component id="g9264z" name="Button7.xml" path="/components/" exported="true"/>
+    <component id="g9264z" name="Button7.xml" path="/components/"/>
     <image id="g92650" name="kp_anniu_3.png" path="/imagesExport/"/>
     <image id="g92651" name="kp_anniu_4.png" path="/imagesExport/"/>
     <image id="g92652" name="zx_jq_tbdi_1.png" path="/imagesExport/" exported="true"/>
@@ -54,6 +54,10 @@
     <image id="f2bftjy" name="cpjl_anniuty_1.png" path="/imagesExport/"/>
     <component id="f2bftjz" name="Button23.xml" path="/components/" exported="true"/>
     <component id="f2bftk0" name="Button24.xml" path="/components/" exported="true"/>
+    <component id="rv091e" name="BtnSmall.xml" path="/components/" exported="true"/>
+    <component id="rv091g" name="BtnBig.xml" path="/components/" exported="true"/>
+    <image id="a0cf2d" name="lm_an.png" path="/imagesExport/"/>
+    <image id="a0cf2w" name="lm_an_2.png" path="/imagesExport/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/package.xml

@@ -48,7 +48,7 @@
     <component id="hinb5t" name="ButtonMinus1.xml" path="/components/" exported="true"/>
     <component id="pjip1a" name="BonusBoxDetailUI.xml" path="/" exported="true"/>
     <image id="9xlo2" name="tzhc_fanhui.png" path="/imagesExport/" exported="true"/>
-    <component id="9xlo8" name="ButtonBack1.xml" path="/components/" exported="true"/>
+    <component id="9xlo8" name="BtnBack.xml" path="/components/" exported="true"/>
     <image id="lwri5v" name="hc_anniu_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="75,0,150,70"/>
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
@@ -252,7 +252,7 @@
     <font id="a0cftl0" name="FangZhengHeiTiJianTi-1.ttf" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="a0cftl1" name="back2.png" path="/imagesNew/"/>
     <image id="a0cf2i" name="back.png" path="/imagesNew/"/>
-    <component id="a0cftl2" name="ButtonBack2.xml" path="/components/" exported="true"/>
+    <component id="a0cftl2" name="BtnCloose.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0">
+<component size="1080,1000">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="改徽章"/>
     <remark page="1" value="改名字"/>
   </controller>
   <displayList>
-    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="421,1478" size="237,46"/>
-    <component id="n2_rv09" name="n2" src="rv091j" fileName="components/Button8.xml" xy="325,495">
-      <Button checked="true" title="改徽章" controller="c1" page="0"/>
+    <image id="n8_wm60" name="n8" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
+    <component id="n2_rv09" name="n2" src="rv091j" fileName="components/Button8.xml" xy="325,73">
+      <Button title="改徽章" controller="c1" page="0"/>
     </component>
-    <component id="n3_rv09" name="n3" src="rv091j" fileName="components/Button8.xml" xy="520,495">
-      <Button title="改名字" controller="c1" page="1"/>
+    <component id="n3_rv09" name="n3" src="rv091j" fileName="components/Button8.xml" xy="520,73">
+      <Button checked="true" title="改名字" controller="c1" page="1"/>
     </component>
-    <list id="n1_rv09" name="listIcon" xy="183,749" size="756,487" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://tw70qm9drv091h" align="center">
+    <list id="n1_rv09" name="listIcon" xy="183,254" size="756,487" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://tw70qm9drv091h" align="center">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -20,13 +20,14 @@
       <item/>
       <item/>
     </list>
-    <text id="n5_rv09" name="txtName" xy="285,817" size="509,42" group="n7_rv09" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入联盟名字，支持模糊搜索[/color]" maxLength="7"/>
-    <text id="n6_rv09" name="n6" xy="348,748" size="389,41" group="n7_rv09" fontSize="30" text="请输入您想要修改的联盟名字"/>
-    <group id="n7_rv09" name="n7" xy="285,748" size="509,110" advanced="true">
+    <text id="n5_rv09" name="txtName" xy="285,322" size="509,42" group="n7_rv09" fontSize="30" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入雅集名字，最多七个字[/color]" maxLength="7"/>
+    <text id="n6_rv09" name="n6" xy="348,253" size="389,42" group="n7_rv09" fontSize="30" text="请输入您想要修改的雅集名字"/>
+    <group id="n7_rv09" name="n7" xy="285,253" size="509,111" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <component id="n4_rv09" name="btnChange" src="rv091k" fileName="components/Button9.xml" xy="442,1388">
+    <component id="n4_rv09" name="btnChange" src="rv091k" fileName="components/Button9.xml" xy="442,769">
       <Button title="修改"/>
     </component>
+    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="421,859" size="237,46"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueChangeNoticeUI.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1000">
   <displayList>
-    <text id="n0_rv09" name="txtContent" xy="285,414" size="509,462" fontSize="30" vars="true" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入联盟名字，支持模糊搜索[/color]" maxLength="50"/>
-    <text id="n2_rv09" name="txtCount" xy="715,902" size="80,42" fontSize="30" vars="true" autoSize="none" text="已输入{value=0}/{maxValue=0}"/>
-    <component id="n1_rv09" name="btnSave" src="rv091i" fileName="components/Button7.xml" xy="442,975"/>
+    <image id="n3_wm60" name="n3" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
+    <text id="n0_rv09" name="txtContent" xy="285,219" size="509,462" fontSize="30" vars="true" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]这是一个有爱的大家庭，欢迎小伙伴们的加入~[/color]" maxLength="50"/>
+    <text id="n2_rv09" name="txtCount" xy="715,707" size="134,42" fontSize="30" vars="true" text="已输入{value=0}/{maxValue=0}"/>
+    <component id="n1_rv09" name="btnSave" src="rv091i" fileName="components/Button7.xml" xy="442,780"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1000">
   <displayList>
-    <loader id="n0_rv09" name="loaIcon" xy="179,324" size="167,167" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n1_rv09" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="302,447" group="n7_rv09"/>
-    <text id="n2_rv09" name="txtName" xy="216,519" pivot="0.5,0" size="93,41" group="n7_rv09" fontSize="30" align="center" text="宴客厅"/>
-    <group id="n7_rv09" name="n7" xy="179,324" size="167,237" group="n10_rv09"/>
-    <component id="n8_rv09" name="comHall0" src="rv0925" fileName="components/ComConstruct.xml" xy="98,595" group="n10_rv09">
+    <image id="n38_wm60" name="n38" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
+    <loader id="n0_rv09" name="loaIcon" xy="179,225" size="167,167" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <component id="n1_rv09" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="302,348" group="n7_rv09"/>
+    <text id="n2_rv09" name="txtName" xy="216,420" pivot="0.5,0" size="93,41" group="n7_rv09" fontSize="30" align="center" text="宴客厅"/>
+    <group id="n7_rv09" name="n7" xy="179,225" size="167,237" group="n10_rv09"/>
+    <component id="n8_rv09" name="comHall0" src="rv0925" fileName="components/ComConstruct.xml" xy="98,496" group="n10_rv09">
       <property target="txtDesc" propertyId="0" value="小酒馆等级"/>
     </component>
-    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="components/ComConstruct.xml" xy="98,653" group="n10_rv09">
+    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="components/ComConstruct.xml" xy="98,554" group="n10_rv09">
       <property target="txtDesc" propertyId="0" value="小金库等级"/>
     </component>
-    <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="157,911" group="n10_rv09"/>
-    <group id="n10_rv09" name="n10" xy="98,324" size="295,647"/>
-    <loader id="n11_rv09" name="loaIcon1" xy="489,321" size="167,167" group="n14_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n12_rv09" name="comLv1" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="612,444" group="n14_rv09"/>
-    <text id="n13_rv09" name="txtName1" xy="526,516" pivot="0.5,0" size="93,41" group="n14_rv09" fontSize="30" align="center" text="小酒馆"/>
-    <group id="n14_rv09" name="n14" xy="489,321" size="167,237" group="n17_rv09"/>
-    <component id="n15_rv09" name="comHotel0" src="rv0925" fileName="components/ComConstruct.xml" xy="408,592" group="n17_rv09">
+    <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="157,812" group="n10_rv09"/>
+    <group id="n10_rv09" name="n10" xy="98,225" size="295,647"/>
+    <loader id="n11_rv09" name="loaIcon1" xy="489,222" size="167,167" group="n14_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <component id="n12_rv09" name="comLv1" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="612,345" group="n14_rv09"/>
+    <text id="n13_rv09" name="txtName1" xy="526,417" pivot="0.5,0" size="93,41" group="n14_rv09" fontSize="30" align="center" text="小酒馆"/>
+    <group id="n14_rv09" name="n14" xy="489,222" size="167,237" group="n17_rv09"/>
+    <component id="n15_rv09" name="comHotel0" src="rv0925" fileName="components/ComConstruct.xml" xy="408,493" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="成员上限"/>
     </component>
-    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="components/ComConstruct.xml" xy="408,650" group="n17_rv09">
+    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="components/ComConstruct.xml" xy="408,551" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="会花上限"/>
     </component>
-    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="components/ComConstruct.xml" xy="408,711" group="n17_rv09">
+    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="components/ComConstruct.xml" xy="408,612" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="每日新加上限"/>
     </component>
-    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="components/ComConstruct.xml" xy="408,766" group="n17_rv09">
+    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="components/ComConstruct.xml" xy="408,667" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="招募额外上限"/>
     </component>
-    <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="455,915" group="n17_rv09"/>
-    <group id="n17_rv09" name="n17" xy="408,321" size="295,654"/>
-    <loader id="n20_rv09" name="loaIcon2" xy="807,320" size="167,167" group="n23_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <component id="n21_rv09" name="comLv2" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="930,443" group="n23_rv09"/>
-    <text id="n22_rv09" name="txtName2" xy="844,515" pivot="0.5,0" size="93,41" group="n23_rv09" fontSize="30" align="center" text="小金库"/>
-    <group id="n23_rv09" name="n23" xy="807,320" size="167,237" group="n28_rv09"/>
-    <text id="n29_rv09" name="txtDesc" xy="797,592" size="182,41" group="n34_rv09" fontSize="30" align="center" text="资金存储上限"/>
-    <text id="n30_rv09" name="txtCurValue" xy="797,650" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <image id="n31_rv09" name="imgUp" src="rv0924" fileName="imageTest/bpjly_jtjt_3.png" xy="836,650" group="n33_rv09"/>
-    <text id="n32_rv09" name="txtNextAdd" xy="880,650" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <group id="n33_rv09" name="n33" xy="797,650" size="120,42" group="n34_rv09" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <group id="n34_rv09" name="n34" xy="797,592" size="182,100" group="n28_rv09"/>
-    <component id="n37_a0cf" name="btnUpLv2" src="a0cf31" fileName="components/Button20.xml" xy="786,910" group="n28_rv09"/>
-    <group id="n28_rv09" name="n28" xy="786,320" size="196,650"/>
+    <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="455,816" group="n17_rv09"/>
+    <group id="n17_rv09" name="n17" xy="408,222" size="295,654"/>
+    <loader id="n20_rv09" name="loaIcon2" xy="807,221" size="167,167" group="n23_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <component id="n21_rv09" name="comLv2" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="930,344" group="n23_rv09"/>
+    <text id="n22_rv09" name="txtName2" xy="844,416" pivot="0.5,0" size="93,41" group="n23_rv09" fontSize="30" align="center" text="小金库"/>
+    <group id="n23_rv09" name="n23" xy="807,221" size="167,237" group="n28_rv09"/>
+    <text id="n29_rv09" name="txtDesc" xy="797,493" size="182,41" group="n34_rv09" fontSize="30" align="center" text="资金存储上限"/>
+    <text id="n30_rv09" name="txtCurValue" xy="797,551" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
+    <image id="n31_rv09" name="imgUp" src="rv0924" fileName="imageTest/bpjly_jtjt_3.png" xy="836,551" group="n33_rv09"/>
+    <text id="n32_rv09" name="txtNextAdd" xy="880,551" size="37,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
+    <group id="n33_rv09" name="n33" xy="797,551" size="120,42" group="n34_rv09" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n34_rv09" name="n34" xy="797,493" size="182,100" group="n28_rv09"/>
+    <component id="n37_a0cf" name="btnUpLv2" src="a0cf31" fileName="components/Button20.xml" xy="786,811" group="n28_rv09"/>
+    <group id="n28_rv09" name="n28" xy="786,221" size="196,650"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -16,7 +16,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/Button6.xml" xy="410,830">
+    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/Button6.xml" xy="410,830" pkg="mk0fwx0x">
       <Button title="创建雅集"/>
     </component>
     <component id="n4_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="473,890"/>

FGUIProject/assets/League/LeagueJoinUI.xml

@@ -4,14 +4,14 @@
     <loader id="n0_u2u3" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n7_a0cf" name="n7" src="a0cf2q" fileName="images/lm_db_chang.png" xy="0,220" group="n16_a0cf"/>
+    <image id="n7_a0cf" name="n7" src="a0cf2q" fileName="images/lm_db_chang.png" xy="0,140" group="n16_a0cf"/>
+    <image id="n9_a0cf" name="n9" src="a0cf2x" fileName="images/biaotizi_2.png" xy="236,323" group="n16_a0cf"/>
     <image id="n8_a0cf" name="n8" src="a0cf2n" fileName="images/lm_sousuok2.png" xy="103,193" group="n16_a0cf"/>
-    <image id="n9_a0cf" name="n9" src="a0cf2x" fileName="images/biaotizi_2.png" xy="236,340" group="n16_a0cf"/>
-    <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n16_a0cf">
+    <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n16_a0cf">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <text id="n2_u2u3" name="txtSearch" xy="133,201" size="509,42" group="n16_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#5d3d21" autoSize="none" text="" input="true" prompt="[color=#736451]输入雅集名字，支持模糊搜索[/color]" maxLength="7"/>
+    <text id="n2_u2u3" name="txtSearch" xy="133,201" size="509,42" group="n16_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fffcf7" autoSize="none" text="" input="true" prompt="[color=#E1D7CA]输入雅集名字，支持模糊搜索[/color]" maxLength="7"/>
     <component id="n3_u2u3" name="btnSearch" src="u2u31c" fileName="components/Button4.xml" xy="635,192" group="n16_a0cf">
       <Button title="搜索雅集"/>
     </component>
@@ -36,7 +36,7 @@
     <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1510" group="n16_a0cf">
       <Button title="换一批"/>
     </component>
-    <group id="n16_a0cf" name="n16" xy="0,80" size="1080,1677" advanced="true">
+    <group id="n16_a0cf" name="n16" xy="0,80" size="1080,1666" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
   </displayList>

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1">
+<component size="1080,1000">
+  <controller name="c1" pages="0,,1," selected="0">
     <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">
+    <image id="n7_wm60" name="n7" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
+    <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="712,277" size="29,29">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n0_rv09" name="btnAppoint0" 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,369" group="n3_rv09">
       <gearDisplay controller="c1" pages="0,1"/>
-      <Button controller="c2" page="0"/>
+      <Button checked="true" controller="c2" page="0"/>
     </component>
-    <component id="n1_rv09" name="btnAppoint1" 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,452" group="n3_rv09">
       <gearDisplay controller="c1" pages="1"/>
       <Button controller="c2" page="1"/>
     </component>
-    <component id="n2_rv09" name="btnAppoint2" 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,535" 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">
+    <group id="n3_rv09" name="n3" xy="387,369" size="305,53" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n5_rv09" name="btnKick" src="rv091w" fileName="components/Button16.xml" xy="442,666">
       <Button title="请离联盟"/>
     </component>
   </displayList>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -5,7 +5,7 @@
     <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">
+    <loader id="n0_rv09" 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_rv09" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">

FGUIProject/assets/League/LeaguePrayUI.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1000">
   <displayList>
-    <component id="n9_rv09" name="comPary0" src="rv0929" fileName="ComPary.xml" xy="129,487">
+    <image id="n12_wm60" name="n12" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
+    <component id="n9_rv09" name="comPary0" src="rv0929" fileName="components/ComPary.xml" xy="129,160">
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="白檀香"/>
     </component>
-    <component id="n10_rv09" name="comPary1" src="rv0929" fileName="ComPary.xml" xy="410,502">
+    <component id="n10_rv09" name="comPary1" src="rv0929" fileName="components/ComPary.xml" xy="410,175">
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="苏合香"/>
     </component>
-    <component id="n11_rv09" name="comPary2" src="rv0929" fileName="ComPary.xml" xy="715,502">
+    <component id="n11_rv09" name="comPary2" src="rv0929" fileName="components/ComPary.xml" xy="715,175">
       <property target="LoaIcon" propertyId="1" value="ui://eg2y0ldpu2u3tkq"/>
       <property target="txtName" propertyId="0" value="天木香"/>
     </component>

FGUIProject/assets/League/LeagueUI.xml

@@ -18,13 +18,13 @@
     <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个字"/>
+    <text id="n10_u2u3" name="txtUnionName" xy="95,200" pivot="0.5,0" size="198,41" fontSize="30" align="center" autoClearText="true" text="联盟名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
     <component id="n13_u2u3" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="275,247" scale="0.4,0.4"/>
     <text id="n14_u2u3" name="txtLeaderName" xy="363,281" size="198,41" fontSize="30" autoClearText="true" text="会长名字7个字"/>
     <text id="n15_u2u3" name="txtNotice" xy="291,334" size="642,81" fontSize="30" autoSize="none" autoClearText="true" text="联盟公告联盟公告联盟公告联盟公告联盟公告联盟公告"/>
     <component id="n7_u2u3" name="n7" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,447" group="n9_u2u3"/>
-    <component id="n3_u2u3" name="n3" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,670" group="n9_u2u3"/>
+    <component id="n3_u2u3" name="btnPray" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,670" group="n9_u2u3"/>
     <component id="n4_u2u3" name="n4" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,895" group="n9_u2u3"/>
     <component id="n5_u2u3" name="n5" src="u2u310" fileName="components/ButtonModle4.xml" xy="663,1583" group="n9_u2u3"/>
     <component id="n6_u2u3" name="n6" src="u2u312" fileName="components/ButtonModle5.xml" xy="118,1487" group="n9_u2u3"/>

FGUIProject/assets/League/components/ListApplyItem.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="885,230">
   <displayList>
-    <component id="n1_rv09" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <component id="n5_a0cf" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="154,151"/>
+    <component id="n1_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
     <text id="n4_a0cf" name="txtName" xy="216,102" size="40,42" fontSize="30" text=""/>
     <component id="n2_rv09" name="btnAgree" src="rv091x" fileName="components/Button17.xml" xy="464,96">
       <Button title="同意"/>

FGUIProject/assets/League/components/ListJoinItem.xml

@@ -4,7 +4,7 @@
     <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,37" 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" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" text="是"/>
-    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="704,43">
+    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="704,43" pkg="mk0fwx0x">
       <Button title="申请"/>
     </component>
     <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0"/>

FGUIProject/assets/League/components/ListLogItem.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="972,230">
   <displayList>
-    <component id="n0_rv09" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="0,0"/>
-    <component id="n5_a0cf" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="150,158"/>
+    <component id="n0_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
     <text id="n1_rv09" name="txtName" xy="238,112" size="198,41" fontSize="30" autoClearText="true" text="玩家名字7个字"/>
     <text id="n3_rv09" name="txtInfo" xy="526,110" pivot="0.5,0" size="122,41" fontSize="30" align="center" autoClearText="true" text="退出联盟"/>
     <text id="n4_rv09" name="txtTime" xy="706,108" pivot="0.5,0" size="259,41" fontSize="30" align="center" autoClearText="true" text="2023.3.30 23:59:59"/>

FGUIProject/assets/League/components/ListMemberItem.xml

@@ -4,8 +4,8 @@
     <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" 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="n11_rv09" name="txtWeekContribuation" xy="478,108" pivot="0.5,0" size="128,41" fontSize="30" align="center" text="{value=0}"/>
+    <text id="n12_rv09" name="txtAllContribuation" xy="618,114" pivot="0.5,0" size="128,41" 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>

FGUIProject/assets/League/package.xml

@@ -32,9 +32,7 @@
     <component id="u2u31a" name="Button2.xml" path="/components/"/>
     <component id="u2u31b" name="Button3.xml" path="/components/"/>
     <component id="u2u31c" name="Button4.xml" path="/components/"/>
-    <component id="rv091e" name="Button5.xml" path="/components/"/>
     <component id="rv091f" name="ListJoinItem.xml" path="/components/"/>
-    <component id="rv091g" name="Button6.xml" path="/components/"/>
     <component id="rv091h" name="ListIconItem.xml" path="/components/"/>
     <component id="rv091i" name="Button7.xml" path="/components/"/>
     <component id="rv091j" name="Button8.xml" path="/components/"/>
@@ -65,7 +63,6 @@
     <image id="a0cf2a" name="biaotizi.png" path="/images/"/>
     <image id="a0cf2b" name="db_weixuanz.png" path="/images/"/>
     <image id="a0cf2c" name="db_xuanzhong.png" path="/images/"/>
-    <image id="a0cf2d" name="lm_an.png" path="/images/"/>
     <image id="a0cf2e" name="lm_db.png" path="/images/"/>
     <image id="a0cf2f" name="lm_db2.png" path="/images/"/>
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
@@ -82,7 +79,6 @@
     <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/"/>

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

@@ -67,5 +67,18 @@ namespace GFGGame
             }
             return title;
         }
+        public int GetMyPos()
+        {
+            if (LeagueDataManager.Instance.LeagueData.LeagueMemberDatas.TryGetValue(RoleDataManager.roleId, out LeagueMemberData memberData))
+            {
+                return memberData.Pos;
+            }
+            return LeaguePos.Member;
+        }
+        // //判断一个玩家是否是会长副会长
+        // public bool CheckPlayerIsLeader()
+        // {
+
+        // }
     }
 }

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

@@ -163,10 +163,19 @@ namespace GFGGame
 
         }
 
-        public void UpdateHead(GComponent component, int roleId, int roleBorderId)
+        public void UpdateHeadWithLv(GComponent component, int headId, int roleBorderId, int lv)
         {
 
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleId == 0 ? ConstItemID.HEADID : roleId);
+            UI_ComHeadWithLv comHeadWithLv = UI_ComHeadWithLv.Proxy(component);
+            UpdateHead(comHeadWithLv.m_comHead.target, headId, roleBorderId);
+            UpdateLv(comHeadWithLv.m_comLv.target, lv);
+            UI_ComHeadWithLv.ProxyEnd();
+
+        }
+        public void UpdateHead(GComponent component, int headId, int roleBorderId)
+        {
+
+            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
 
             UI_ComHead comHead = UI_ComHead.Proxy(component);

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

@@ -8,10 +8,10 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_comCost;
         public GList m_listIcon;
         public GTextInput m_txtName;
         public GButton m_btnChange;
+        public GComponent m_comCost;
         public const string URL = "ui://tw70qm9du2u34";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueChangeNameUI";
@@ -60,18 +60,18 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_comCost = (GComponent)comp.GetChild("comCost");
             m_listIcon = (GList)comp.GetChild("listIcon");
             m_txtName = (GTextInput)comp.GetChild("txtName");
             m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_comCost = (GComponent)comp.GetChild("comCost");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_comCost = null;
             m_listIcon = null;
             m_txtName = null;
             m_btnChange = null;
+            m_comCost = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -18,6 +18,7 @@ namespace UI.League
         public GComponent m_comHead;
         public GTextField m_txtLeaderName;
         public GTextField m_txtNotice;
+        public UI_ButtonModle2 m_btnPray;
         public const string URL = "ui://tw70qm9du2u32";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueUI";
@@ -76,6 +77,7 @@ namespace UI.League
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLeaderName = (GTextField)comp.GetChild("txtLeaderName");
             m_txtNotice = (GTextField)comp.GetChild("txtNotice");
+            m_btnPray = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnPray"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -93,6 +95,8 @@ namespace UI.League
             m_comHead = null;
             m_txtLeaderName = null;
             m_txtNotice = null;
+            m_btnPray.Dispose();
+            m_btnPray = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.League
     {
         public GComponent target;
         public GComponent m_comHead;
-        public GComponent m_comLv;
         public GTextField m_txtName;
         public GButton m_btnAgree;
         public GButton m_btnRefuse;
@@ -60,7 +59,6 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_comHead = (GComponent)comp.GetChild("comHead");
-            m_comLv = (GComponent)comp.GetChild("comLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAgree = (GButton)comp.GetChild("btnAgree");
             m_btnRefuse = (GButton)comp.GetChild("btnRefuse");
@@ -68,7 +66,6 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead = null;
-            m_comLv = null;
             m_txtName = null;
             m_btnAgree = null;
             m_btnRefuse = null;

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

@@ -8,7 +8,6 @@ namespace UI.League
     {
         public GComponent target;
         public GComponent m_comHead;
-        public GComponent m_comLv;
         public GTextField m_txtName;
         public GTextField m_txtInfo;
         public GTextField m_txtTime;
@@ -60,7 +59,6 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_comHead = (GComponent)comp.GetChild("comHead");
-            m_comLv = (GComponent)comp.GetChild("comLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtInfo = (GTextField)comp.GetChild("txtInfo");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -68,7 +66,6 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead = null;
-            m_comLv = null;
             m_txtName = null;
             m_txtInfo = null;
             m_txtTime = null;

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

@@ -5,6 +5,24 @@ using ET;
 namespace GFGGame
 {
 
+    //通知联盟解散了
+    public class NoticeDisbandLeague : AMHandler<L2C_NoticeDisbandLeague>
+    {
+        protected override async ETTask Run(Session session, L2C_NoticeDisbandLeague message)
+        {
+            if (message.LeagueId == LeagueDataManager.Instance.LeagueData.LeagueId)
+            {
+                if (ViewManager.isViewOpen(typeof(LeagueView).FullName))
+                {
+                    ViewManager.Show<MainUIView>(null, null, true);
+                    PromptController.Instance.ShowFloatTextPrompt("您的雅集已解散");
+                }
+                LeagueDataManager.Instance.Clear();
+                LeagueSproxy.ReqGetLeagueInfo().Coroutine();
+            }
+            await ETTask.CompletedTask;
+        }
+    }
     //通知联盟值变化
     public class NoticeLeagueNumeric : AMHandler<L2C_NoticeLeagueNumeric>
     {
@@ -192,8 +210,8 @@ namespace GFGGame
                         int myPos = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
                         if (myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner)
                         {
-                            // ReqGetApplyJoinLeagueList().Coroutine();
-                            // ReqLeagueJoinQuitLog().Coroutine();
+                            ReqGetApplyJoinLeagueList().Coroutine();
+                            ReqLeagueJoinQuitLog().Coroutine();
                         }
                     }
                     else if (response.Type == 2)//2:未加入军团

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

@@ -80,8 +80,7 @@ namespace GFGGame
             OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.ListApplyDatas[_listKeys[index]];
             UI_ListApplyItem item = UI_ListApplyItem.Proxy(obj);
 
-            RoleInfoManager.Instance.UpdateHead(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId);
-            RoleInfoManager.Instance.UpdateLv(item.m_comLv, roleInfoData.roleLv);
+            RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
             item.m_txtName.text = roleInfoData.roleName;
             if (item.m_btnAgree.data == null)
             {

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

@@ -26,8 +26,11 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeagueChangeNameUI.PACKAGE_NAME;
             _ui = UI_LeagueChangeNameUI.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_c1.onChanged.Add(UpdateView);

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

@@ -33,7 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
-            _ui.m_txtContent.onFocusOut.Add(OnFocuseOut);
+            _ui.m_txtContent.onFocusOut.Add(UpdateView);
         }
         protected override void AddEventListener()
         {
@@ -43,7 +43,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_txtContent.text = LeagueDataManager.Instance.LeagueData.Notice;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -57,18 +58,18 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
-        private void OnFocuseOut()
+        private void UpdateView()
         {
-            _ui.m_txtCount.SetVar("value", _ui.m_txtContent.text.Length.ToString());
-            _ui.m_txtCount.SetVar("maxValue", "50");
+            _ui.m_txtCount.SetVar("value", _ui.m_txtContent.text.Length.ToString()).FlushVars();
+            _ui.m_txtCount.SetVar("maxValue", "50").FlushVars();
         }
         private async void OnBtnSaveClick()
         {
-            if (!Regex.IsMatch(_ui.m_txtContent.text, @"^[\u4e00-\u9fa5_0-9]+$"))
-            {
-                PromptController.Instance.ShowFloatTextPrompt("雅集公告仅允许汉字、数字、下划线");
-                return;
-            }
+            // 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)
             {

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

@@ -25,8 +25,12 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeagueConstructUI.PACKAGE_NAME;
             _ui = UI_LeagueConstructUI.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_btnUpLv0.target.onClick.Add(OnBtnUpLvClick);
@@ -64,6 +68,37 @@ namespace GFGGame
         private void OnBtnUpLvClick(EventContext context)
         {
             int type = (int)(context.sender as GObject).data;
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            if (myPos != LeaguePos.Owner && myPos != LeaguePos.SubOwner)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("权限不足");
+                return;
+            }
+            long needCount = 0;
+            long hasCount = 0;
+            if (type == LeagueBuildingType.Hall)
+            {
+                LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HallLevel);
+                needCount = hallCfg.consumeArr[0][1];
+                hasCount = ItemDataManager.GetItemNum(hallCfg.consumeArr[0][0]);
+            }
+            else if (type == LeagueBuildingType.Hotel)
+            {
+                LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+                needCount = hotelCfg.consumeArr[0][1];
+                hasCount = ItemDataManager.GetItemNum(hotelCfg.consumeArr[0][0]);
+            }
+            else if (type == LeagueBuildingType.Store)
+            {
+                LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.StoreLevel);
+                needCount = storeCfg.consumeArr[0][1];
+                hasCount = ItemDataManager.GetItemNum(storeCfg.consumeArr[0][0]);
+            }
+            if (needCount > hasCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
             LeagueSproxy.ReqUpLeagueBuilding(type).Coroutine();
         }
         private void UpdateView()
@@ -75,9 +110,12 @@ namespace GFGGame
         private void UpdateHall()
         {
             int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+
             LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
             LeagueHallCfg nextHallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv + 1);
 
+            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv, hallLv);
+
             int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
             int hotelAdd = nextHallCfg == null ? 0 : nextHallCfg.levelHotel - hotelLv;
             _ui.m_comHall0.m_txtCurValue.text = hotelLv.ToString();
@@ -107,25 +145,27 @@ namespace GFGGame
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv);
             LeagueHotelCfg nextHotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv + 1);
 
+            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv1, hotelLv);
+
             int memberLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limit - hotelCfg.limit;
             _ui.m_comHotel0.m_txtCurValue.text = hotelCfg.limit.ToString();
             _ui.m_comHotel0.m_txtNextAdd.text = memberLimitAdd.ToString();
             _ui.m_comHotel0.m_c1.selectedIndex = memberLimitAdd > 0 ? 1 : 0;
 
             int memberDayLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAdd - hotelCfg.limitDayAdd;
-            _ui.m_comHotel0.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
-            _ui.m_comHotel0.m_txtNextAdd.text = memberDayLimitAdd.ToString();
-            _ui.m_comHotel0.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
+            _ui.m_comHotel1.m_txtCurValue.text = hotelCfg.limitDayAdd.ToString();
+            _ui.m_comHotel1.m_txtNextAdd.text = memberDayLimitAdd.ToString();
+            _ui.m_comHotel1.m_c1.selectedIndex = memberDayLimitAdd > 0 ? 1 : 0;
 
             int memberDayExtraLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitDayAddExtra - hotelCfg.limitDayAddExtra;
-            _ui.m_comHotel0.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
-            _ui.m_comHotel0.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
-            _ui.m_comHotel0.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
+            _ui.m_comHotel2.m_txtCurValue.text = hotelCfg.limitDayAddExtra.ToString();
+            _ui.m_comHotel2.m_txtNextAdd.text = memberDayExtraLimitAdd.ToString();
+            _ui.m_comHotel2.m_c1.selectedIndex = memberDayExtraLimitAdd > 0 ? 1 : 0;
 
             int flowerLimitAdd = nextHotelCfg == null ? 0 : nextHotelCfg.limitPosition - hotelCfg.limitPosition;
-            _ui.m_comHotel0.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
-            _ui.m_comHotel0.m_txtNextAdd.text = flowerLimitAdd.ToString();
-            _ui.m_comHotel0.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
+            _ui.m_comHotel3.m_txtCurValue.text = hotelCfg.limitPosition.ToString();
+            _ui.m_comHotel3.m_txtNextAdd.text = flowerLimitAdd.ToString();
+            _ui.m_comHotel3.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
 
             ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv1.m_comCost, hotelCfg.consumeArr[0][0], hotelCfg.consumeArr[0][1]);
 
@@ -168,11 +208,13 @@ namespace GFGGame
             LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv);
             LeagueStoreCfg nextStoreCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv + 1);
 
+            RoleInfoManager.Instance.UpdateLv(_ui.m_comLv2, storeLv);
+
             int coinLimitAdd = nextStoreCfg == null ? 0 : nextStoreCfg.limitStore - storeCfg.limitStore;
             _ui.m_txtCurValue.text = storeCfg.limitStore.ToString();
             _ui.m_txtNextAdd.text = coinLimitAdd.ToString();
-            _ui.m_txtNextAdd.visible = coinLimitAdd > 0 ? false : true;
-            _ui.m_imgUp.visible = coinLimitAdd > 0 ? false : true;
+            _ui.m_txtNextAdd.visible = coinLimitAdd > 0 ? true : false;
+            _ui.m_imgUp.visible = coinLimitAdd > 0 ? true : false;
 
             ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv2.m_comCost, storeCfg.consumeArr[0][0], storeCfg.consumeArr[0][1]);
 

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

@@ -116,7 +116,13 @@ namespace GFGGame
         private async void OnBtnJoinClick(EventContext context)
         {
             GButton obj = context.sender as GButton;
-            long leagueId = (int)obj.data;
+            long leagueId = (long)obj.data;
+            LeagueListData listData = LeagueDataManager.Instance.ListDatas[leagueId];
+            if (listData.Num == listData.MaxNum)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集满员啦，换个雅集申请吧");
+                return;
+            }
             if (LeagueDataManager.Instance.ListDatas[leagueId].NeedAudit)
             {
                 AlertUI.Show("该雅集需要审批同意后才可加入，是否仍需要申请？").

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

@@ -59,8 +59,7 @@ namespace GFGGame
             LeagueLogData logData = LeagueDataManager.Instance.ListLogDatas[index];
             UI_ListLogItem item = UI_ListLogItem.Proxy(obj);
 
-            RoleInfoManager.Instance.UpdateHead(item.m_comHead, logData.RoleInfo.headId, logData.RoleInfo.headBorderId);
-            RoleInfoManager.Instance.UpdateLv(item.m_comLv, logData.RoleInfo.roleLv);
+            RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, logData.RoleInfo.headId, logData.RoleInfo.headBorderId, logData.RoleInfo.roleLv);
             item.m_txtName.text = logData.RoleInfo.roleName;
             item.m_txtTime.text = TimeUtil.FormattingTime6(logData.Time);
             string strInfo = "";

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

@@ -38,6 +38,8 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
         }
         protected override void AddEventListener()
         {
@@ -48,7 +50,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner ? 1 : 0;
             UpdateMember();
             UpdateBtnRecruit();
 
@@ -146,6 +149,9 @@ namespace GFGGame
 
             _memberIds = SortMemberIds(_memberIds);
             _ui.m_list.numItems = _memberIds.Count;
+
+            UpdateLeader(_ui.m_comChairman.target, LeagueDataManager.Instance.LeagueData.OwnerId);
+            UpdateLeader(_ui.m_comCoChairman.target, LeagueDataManager.Instance.LeagueData.SubOwnerId);
         }
         private void UpdateBtnRecruit()
         {
@@ -182,13 +188,13 @@ namespace GFGGame
             UI_ComLeader com = UI_ComLeader.Proxy(obj);
             if (memberData == null)
             {
-                RoleInfoManager.Instance.UpdateHead(com.m_comHead, 0, 0);
+                RoleInfoManager.Instance.UpdateHeadWithLv(com.m_comHead, 0, 0, 0);
                 com.m_txtname.text = "虚位以待";
                 com.m_btnAppoint.visible = false;
             }
             else
             {
-                RoleInfoManager.Instance.UpdateHead(com.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId);
+                RoleInfoManager.Instance.UpdateHeadWithLv(com.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId, memberData.RoleInfo.roleLv);
                 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)
@@ -205,10 +211,11 @@ namespace GFGGame
 
             UI_ListMemberItem item = UI_ListMemberItem.Proxy(obj);
 
-            RoleInfoManager.Instance.UpdateHead(item.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId);
+            RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId, memberData.RoleInfo.roleLv);
             item.m_txtName.text = memberData.RoleInfo.roleName;
             item.m_txtWeekContribuation.text = memberData.WeekContribution.ToString();
             item.m_txtAllContribuation.text = memberData.AllContribution.ToString();
+            item.m_loaTitle.visible = memberData.Pos != LeaguePos.Member;
             if (memberData.RoleInfo.offlineTimeSec == 0)
             {
                 item.m_txtState.text = "在线";
@@ -248,18 +255,18 @@ namespace GFGGame
             {
                 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;
+                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 (memberDataA.RoleInfo.offlineTimeSec > memberDataB.RoleInfo.offlineTimeSec) return -1;
+                if (memberDataA.RoleInfo.offlineTimeSec < memberDataB.RoleInfo.offlineTimeSec) return 1;
                 return 0;
             });
 

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

@@ -25,6 +25,7 @@ namespace GFGGame
             base.OnInit();
             packageName = UI_LeaguePrayUI.PACKAGE_NAME;
             _ui = UI_LeaguePrayUI.Create();
+
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;

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

@@ -28,11 +28,13 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_11");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_btnMember.target.onClick.Add(OnBtnMemberClick);
             _ui.m_btnConstruct.target.onClick.Add(OnBtnConstructClick);
             _ui.m_comLeagueHead.target.onClick.Add(OnComLeagueHeadClick);
+            _ui.m_btnChangeNotice.onClick.Add(OnBtnChangeNoticeClick);
+            _ui.m_btnPray.target.onClick.Add(OnBtnPrayClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
         }
         protected override void AddEventListener()
@@ -44,8 +46,9 @@ namespace GFGGame
         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;
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            _ui.m_btnChangeNotice.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            UpdateInfo();
             UpdateValue();
         }
 
@@ -78,6 +81,14 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueChangeNameView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private void OnBtnChangeNoticeClick()
+        {
+            ViewManager.Show<LeagueChangeNoticeView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
+        private void OnBtnPrayClick()
+        {
+            ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void OnBtnRuleClick()
         {
             ViewManager.Show<RuleView>();
@@ -90,7 +101,7 @@ namespace GFGGame
             _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);
+            RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comHead, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.headBorderId, leagueData.LeagueMemberDatas[leagueData.OwnerId].RoleInfo.roleLv);
         }
         private void UpdateValue()
         {