雅集

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -15,9 +15,9 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <loader id="n37_r9ri" name="loaBorder" xy="0,0" pivot="0.5,0.5" size="230,230" group="n41_r9ri" touchable="false" url="ui://374k3dwvysx9ge" autoSize="true">
+    <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" url="ui://eg2y0ldpwm60tl7" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <group id="n41_r9ri" name="n41" xy="0,0" size="230,230"/>
+    <group id="n41_r9ri" name="n41" xy="0,13" size="230,203"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -253,6 +253,8 @@
     <image id="a0cftl1" name="back2.png" path="/imagesNew/"/>
     <image id="a0cf2i" name="back.png" path="/imagesNew/"/>
     <component id="a0cftl2" name="BtnCloose.xml" path="/components/" exported="true"/>
+    <image id="wm60tl4" name="grxx_2000012_1.png" path="/images/" exported="true"/>
+    <image id="wm60tl7" name="grxx_xtkk_1.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueApplyUI.xml

@@ -11,7 +11,7 @@
     <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="742,224" size="29,29">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <list id="n4_rv09" name="list" xy="90,266" size="892,1367" overflow="scroll" defaultItem="ui://tw70qm9drv091z">
+    <list id="n4_rv09" name="list" xy="90,266" size="892,1367" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1000">
+<component size="1080,1110">
   <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="改徽章"/>
     <remark page="1" value="改名字"/>
   </controller>
   <displayList>
-    <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"/>
+    <image id="n8_wm60" name="n8" src="a0cf2e" fileName="images/lm_db.png" xy="0,50"/>
+    <component id="n9_wm60" name="btnBack" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="905,70"/>
+    <image id="n10_wm60" name="n10" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,222" group="n11_wm60"/>
+    <component id="n2_rv09" name="n2" src="rv091j" fileName="components/Button8.xml" xy="162,219" group="n11_wm60">
+      <Button title="徽章" controller="c1" page="0"/>
     </component>
-    <component id="n3_rv09" name="n3" src="rv091j" fileName="components/Button8.xml" xy="520,73">
+    <component id="n3_rv09" name="n3" src="rv091j" fileName="components/Button8.xml" xy="314,219" group="n11_wm60">
       <Button checked="true" title="改名字" controller="c1" page="1"/>
     </component>
-    <list id="n1_rv09" name="listIcon" xy="183,254" size="756,487" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://tw70qm9drv091h" align="center">
+    <group id="n11_wm60" name="n11" xy="162,219" size="304,63"/>
+    <list id="n1_rv09" name="listIcon" xy="200,315" size="711,454" layout="flow_hz" overflow="scroll" scroll="horizontal" colGap="30" defaultItem="ui://tw70qm9dwm603y" align="center">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -20,14 +23,17 @@
       <item/>
       <item/>
     </list>
-    <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">
+    <text id="n6_rv09" name="n6" xy="356,344" size="368,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#b4905d" align="center" text="请输入您想要修改的雅集名字"/>
+    <image id="n13_wm60" name="n13" src="a0cf2g" fileName="images/lm_sousuok.png" xy="178,412" group="n7_rv09"/>
+    <text id="n5_rv09" name="txtName" xy="205,417" size="589,42" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#775a33" autoSize="none" text="" input="true" prompt="[color=#A7957E]输入雅集名字，最多七个字[/color]" maxLength="7"/>
+    <group id="n7_rv09" name="n7" xy="178,412" size="705,53" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <component id="n4_rv09" name="btnChange" src="rv091k" fileName="components/Button9.xml" xy="442,769">
+    <component id="n4_rv09" name="btnChange" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="432,850">
       <Button title="修改"/>
     </component>
-    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="421,859" size="237,46"/>
+    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="442,915" size="237,46"/>
+    <image id="n12_wm60" name="n12" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,290"/>
+    <image id="n14_wm60" name="n14" src="wm603l" fileName="images/biaotizi_5.png" xy="202,130"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueChangeNoticeUI.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1000">
   <displayList>
-    <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"/>
+    <image id="n3_wm60" name="n3" src="wm6038" fileName="images/lm_db_duan.png" xy="0,0"/>
+    <image id="n5_wm60" name="n5" src="wm603b" fileName="images/lm_db_3.png" xy="156,225"/>
+    <text id="n0_rv09" name="txtContent" xy="200,253" size="679,313" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A89067]这是一个有爱的大家庭，欢迎小伙伴们的加入~[/color]" maxLength="50"/>
+    <text id="n2_rv09" name="txtCount" xy="742,590" pivot="1,0" size="176,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="right" vars="true" text="已输入{value=00}/{maxValue=00}"/>
+    <component id="n1_rv09" name="btnSave" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,733">
+      <Button title="保存"/>
+    </component>
+    <image id="n4_wm60" name="n4" src="wm603n" fileName="images/biaotizi_3.png" xy="203,75"/>
+    <image id="n7_wm60" name="n7" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="140,691"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1113">
+<component size="1080,1110">
   <displayList>
-    <image id="n5_a0cf" name="n5" src="a0cf2e" fileName="images/lm_db.png" xy="0,49"/>
+    <image id="n5_a0cf" name="n5" src="a0cf2e" fileName="images/lm_db.png" xy="0,50"/>
     <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="雅集徽章"/>
+    <text id="n9_a0cf" name="n9" xy="479,303" size="122,41" 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"/>
+    <component id="n11_a0cf" name="btnBack" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="905,70"/>
     <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">
+    <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" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/Button6.xml" xy="410,830" pkg="mk0fwx0x">
+    <component id="n3_rv09" name="btnCreat" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,830">
       <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,7 +4,9 @@
     <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,140" group="n16_a0cf"/>
+    <image id="n7_a0cf" name="n7" src="a0cf2q" fileName="images/lm_db_chang.png" xy="0,140" group="n16_a0cf">
+      <relation target="" sidePair="height-height"/>
+    </image>
     <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"/>
     <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n16_a0cf">
@@ -24,8 +26,8 @@
     <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" group="n16_a0cf"/>
-    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="17" defaultItem="ui://tw70qm9drv091f">
-      <relation target="" sidePair=""/>
+    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="17" defaultItem="ui://tw70qm9drv091f" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -34,6 +36,7 @@
       <item/>
     </list>
     <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1510" group="n16_a0cf">
+      <relation target="" sidePair="bottom-bottom"/>
       <Button title="换一批"/>
     </component>
     <group id="n16_a0cf" name="n16" xy="0,80" size="1080,1666" advanced="true">

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -4,24 +4,24 @@
     <remark page="0" value="副会长"/>
     <remark page="1" value="会长"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2," selected="0"/>
+  <controller name="c2" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <image id="n7_wm60" name="n7" src="a0cf2e" fileName="images/lm_db.png" xy="0,0"/>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="712,277" size="29,29">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
     <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 checked="true" controller="c2" page="0"/>
-    </component>
-    <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,535" 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="2"/>
     </component>
+    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="387,369" group="n3_rv09">
+      <gearDisplay controller="c1" pages="0,1"/>
+      <Button checked="true" controller="c2" page="3"/>
+    </component>
     <group id="n3_rv09" name="n3" xy="387,369" size="305,53" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
     <component id="n5_rv09" name="btnKick" src="rv091w" fileName="components/Button16.xml" xy="442,666">
       <Button title="请离联盟"/>

FGUIProject/assets/League/LeagueMemberLogUI.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <list id="n6_rv09" name="list" xy="54,364" size="972,1312" overflow="scroll" defaultItem="ui://tw70qm9drv0923">
+    <list id="n6_rv09" name="list" xy="54,364" size="972,1312" overflow="scroll" defaultItem="ui://tw70qm9drv0923" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -8,41 +8,53 @@
     <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">
+    <component id="n1_rv09" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://tw70qm9du2u3b"/>
     </component>
-    <component id="n4_rv09" name="comChairman" src="rv091m" fileName="components/ComLeader.xml" xy="225,313">
-      <relation target="" sidePair="top-top"/>
-    </component>
-    <component id="n6_rv09" name="comCoChairman" src="rv091m" fileName="components/ComLeader.xml" xy="578,311">
-      <relation target="" sidePair="top-top"/>
-    </component>
-    <list id="n20_rv09" name="list" xy="49,614" size="983,1104" overflow="scroll" defaultItem="ui://tw70qm9drv091n">
-      <relation target="" sidePair="top-top,bottomext-bottom"/>
+    <image id="n26_wm60" name="n26" src="wm6039" fileName="images/lm_db_chang_2.png" xy="0,152">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n27_wm60" name="n27" src="wm603m" fileName="images/biaotizi_4.png" xy="242,263"/>
+    <image id="n28_wm60" name="n28" src="wm603a" fileName="images/lm_db_4.png" xy="67,332"/>
+    <component id="n4_rv09" name="comChairman" src="rv091m" fileName="components/ComLeader.xml" xy="225,335"/>
+    <component id="n6_rv09" name="comCoChairman" src="rv091m" fileName="components/ComLeader.xml" xy="578,333"/>
+    <image id="n29_wm60" name="n29" src="wm6036" fileName="images/lm_kuang_2.png" xy="0,662" group="n34_wm60"/>
+    <text id="n30_wm60" name="n30" xy="208,664" size="116,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" text="成员名称"/>
+    <text id="n31_wm60" name="n31" xy="468,664" pivot="0.5,0" size="116,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="本周贡献"/>
+    <text id="n32_wm60" name="n32" xy="633,664" pivot="0.5,0" size="116,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="累计贡献"/>
+    <text id="n33_wm60" name="n33" xy="853,664" pivot="0.5,0" size="60,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="状态"/>
+    <group id="n34_wm60" name="n34" xy="0,662" size="1080,41"/>
+    <list id="n20_rv09" name="list" xy="68,705" size="941,796" overflow="scroll" defaultItem="ui://tw70qm9drv091n" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="442,1780" group="n25_rv09">
-      <gearDisplay controller="c1" pages="1"/>
+    <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="90,1564" group="n25_rv09">
       <Button title="招募成员"/>
     </component>
-    <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 id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/Button12.xml" xy="317,1564" group="n25_rv09">
+      <Button title="申请列表" icon="ui://tw70qm9dwm603f"/>
     </component>
-    <component id="n24_rv09" name="btnMemberLog" src="rv091q" fileName="components/Button13.xml" xy="934,1780" group="n25_rv09">
-      <gearDisplay controller="c1" pages="1"/>
+    <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/Button12.xml" xy="544,1564" group="n25_rv09">
       <Button title="联盟信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="442,1780" group="n25_rv09">
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">
       <Button title="退出联盟"/>
     </component>
-    <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 id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
     </group>
+    <component id="n35_wm60" name="btnExit1" src="wm603x" fileName="components/Button111.xml" xy="375,1562">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="退出联盟"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/League/components/Button10.xml

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

FGUIProject/assets/League/components/Button11.xml

@@ -1,9 +1,9 @@
 <?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="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

FGUIProject/assets/League/components/Button111.xml

@@ -0,0 +1,12 @@
+<?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="136,10" pivot="0.5,0" size="58,52" font="ui://eg2y0ldpa0cftky" fontSize="38" color="#925a31" align="center" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/League/components/Button12.xml

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

FGUIProject/assets/League/components/Button14.xml

@@ -1,13 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="187,56" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="touchable" pages="0,,1," selected="0">
+    <remark page="0" value="不可点击"/>
+    <remark page="1" value="可点击"/>
+  </controller>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale"/>
-    <text id="n3_u2u3" name="title" xy="75,7" pivot="0.5,0" size="45,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <image id="n7_wm60" name="n7" src="wm603g" fileName="images/lm_an__3weixuan.png" xy="0,0">
+      <gearDisplay controller="touchable" pages="0"/>
+    </image>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true">
+      <gearDisplay controller="touchable" pages="1"/>
+    </loader>
+    <text id="n3_u2u3" name="title" xy="71,6" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <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">
+    <text id="n5_rv09" name="txtTime" xy="5,61" pivot="0.5,0" size="176,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="剩余时间23：59">
+      <gearDisplay controller="touchable" pages="0"/>
+    </text>
+    <component id="n6_a0cf" name="comcost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,54">
+      <gearDisplay controller="touchable" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </component>
   </displayList>

FGUIProject/assets/League/components/Button15.xml

@@ -14,5 +14,5 @@
       <gearDisplay controller="button" pages="0"/>
     </image>
   </displayList>
-  <Button mode="Radio"/>
+  <Button mode="Check"/>
 </component>

FGUIProject/assets/League/components/Button42.xml

@@ -3,7 +3,7 @@
   <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="搜索雅集">
+    <text id="n3_u2u3" name="title" xy="107,12" pivot="0.5,0" size="154,51" 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"/>

FGUIProject/assets/League/components/Button8.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,60" extention="Button">
+<component size="152,63" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="152,63" aspect="true" url="ui://tw70qm9dwm603q" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="1"/>
     </loader>
-    <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="71,12" pivot="0.5,0" size="10,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#ae9370" align="center" text="">
+      <gearColor controller="button" pages="0" values="#ae9370,#000000" default="#915e15,#000000"/>
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

FGUIProject/assets/League/components/ComHeadIcon.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="220,220" overflow="hidden" mask="n39_r9ri">
+  <displayList>
+    <graph id="n39_r9ri" name="n39" xy="0,0" pivot="0.5,0.5" size="220,220" type="eclipse" lineSize="0" fillColor="#ffeed5be">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <loader id="n40_r9ri" name="loaIcon" xy="0,0" pivot="0.5,0.5" size="220,220" url="ui://eg2y0ldpwm60tl4" align="center" fill="scaleMatchWidth" autoSize="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+</component>

FGUIProject/assets/League/components/ComLeader.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="231,288">
+<component size="316,355">
   <displayList>
-    <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="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"/>
+    <component id="n7_wm60" name="comHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="157,184" pivot="0.5,0.5" anchor="true" size="167,166" aspect="true" scale="1.125,1.125">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
+    <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="69,100" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
+    <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
+    <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>
+    <text id="n3_rv09" name="txtName" xy="77,268" pivot="0.5,0" size="172,34" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" align="center" text="玩家名字七个字"/>
+    <component id="n5_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="221,88"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ComPary.xml

@@ -7,14 +7,15 @@
   <displayList>
     <loader id="n2_rv09" name="LoaIcon" xy="27,0" pivot="0.5,0" size="142,142" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
     <text id="n3_rv09" name="txtName" xy="51,162" pivot="0.5,0" size="93,41" fontSize="30" text="白檀香"/>
-    <text id="n9_a0cf" name="n9" xy="37,227" pivot="0.5,0" size="122,42" fontSize="30" align="center" text="每次祈福"/>
+    <text id="n9_a0cf" name="n9" xy="37,227" pivot="0.5,0" size="122,41" fontSize="30" align="center" text="每次祈福"/>
     <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="33,273"/>
-    <text id="n10_a0cf" name="n10" xy="7,336" pivot="0.5,0" size="182,42" group="n11_a0cf" fontSize="30" align="center" text="每日首次祈福"/>
+    <text id="n10_a0cf" name="n10" xy="7,336" pivot="0.5,0" size="182,41" group="n11_a0cf" fontSize="30" align="center" text="每日首次祈福"/>
     <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="37,376" group="n11_a0cf"/>
     <group id="n11_a0cf" name="n11" xy="7,336" size="182,86" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <component id="n7_rv09" name="btnPray" src="rv0928" fileName="components/Button19.xml" xy="0,460">
+    <text id="n12_wm60" name="txtCount" xy="12,432" pivot="0.5,0" size="172,42" fontSize="30" align="center" vars="true" text="今日祈福:{value=0}/{maxValue=5}"/>
+    <component id="n7_rv09" name="btnPray" src="rv0928" fileName="components/Button19.xml" xy="0,472">
       <Button title="祈福"/>
     </component>
     <component id="n8_rv09" name="comCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,534"/>

FGUIProject/assets/League/components/ListIconSmallItem.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="149,218" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n6_a0cf" name="n6" src="wm603j" fileName="images/db_1xuanzhong.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n7_a0cf" name="n7" src="wm603k" fileName="images/db_1weixuan.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <loader id="n5_rv09" name="loaIcon" xy="24,53" size="100,100" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/League/components/ListMemberItem.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="923,230">
+<component size="950,131">
   <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" 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,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"/>
+    <component id="n15_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="16,-21" group="n27_wm60" scale="0.65,0.65"/>
+    <loader id="n17_rv09" name="loaTitle" xy="28,10" size="33,77" group="n27_wm60" url="ui://tw70qm9dwm603w" autoSize="true"/>
+    <text id="n16_rv09" name="txtName" xy="169,41" size="200,39" group="n27_wm60" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" align="center" text="玩家名字七个字"/>
+    <text id="n11_rv09" name="txtWeekContribuation" xy="454,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n12_rv09" name="txtAllContribuation" xy="610,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n18_rv09" name="txtState" xy="755,41" pivot="0.5,0" size="112,38" group="n27_wm60" fontSize="27" color="#865118" align="center" text="12小时前"/>
+    <component id="n19_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="871,28" group="n27_wm60"/>
+    <image id="n20_wm60" name="n20" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="9,117" group="n27_wm60"/>
+    <group id="n27_wm60" name="n27" xy="9,-21" size="931,230"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -73,17 +73,47 @@
     <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="a0cf2q" name="lm_db_chang.png" path="/images/" scale="9grid" scale9grid="0,486,1080,275"/>
     <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="a0cf2u" name="lm_zhuangshixian.png" path="/images/" scale="9grid" scale9grid="232,3,464,6"/>
     <image id="a0cf2v" name="lm_an_pink.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/"/>
     <component id="a0cf31" name="Button20.xml" path="/components/"/>
+    <image id="wm6032" name="back.png" path="/images/"/>
+    <image id="wm6033" name="lm_wz_tuichulm.png" path="/images/"/>
+    <image id="wm6034" name="lm_tb_bianji.png" path="/images/"/>
+    <image id="wm6035" name="lm_mz_db.png" path="/images/"/>
+    <image id="wm6036" name="lm_kuang_2.png" path="/images/"/>
+    <image id="wm6037" name="lm_db_touxiang.png" path="/images/"/>
+    <image id="wm6038" name="lm_db_duan.png" path="/images/"/>
+    <image id="wm6039" name="lm_db_chang_2.png" path="/images/" scale="9grid" scale9grid="0,566,1080,198"/>
+    <image id="wm603a" name="lm_db_4.png" path="/images/"/>
+    <image id="wm603b" name="lm_db_3.png" path="/images/" scale="9grid" scale9grid="191,91,382,182"/>
+    <image id="wm603d" name="lm_yeqian_db.png" path="/images/"/>
+    <image id="wm603f" name="lm_an__3xuanzhong.png" path="/images/"/>
+    <image id="wm603g" name="lm_an__3weixuan.png" path="/images/"/>
+    <image id="wm603h" name="lm_an_2.png" path="/images/"/>
+    <image id="wm603i" name="lm_an.png" path="/images/"/>
+    <image id="wm603j" name="db_1xuanzhong.png" path="/images/"/>
+    <image id="wm603k" name="db_1weixuan.png" path="/images/"/>
+    <image id="wm603l" name="biaotizi_5.png" path="/images/"/>
+    <image id="wm603m" name="biaotizi_4.png" path="/images/"/>
+    <image id="wm603n" name="biaotizi_3.png" path="/images/"/>
+    <image id="wm603o" name="back2.png" path="/images/"/>
+    <image id="wm603q" name="lm_yeqian_xuanzhong.png" path="/images/"/>
+    <component id="wm603r" name="ComHeadIcon.xml" path="/components/"/>
+    <image id="wm603s" name="beizif.png" path="/images/"/>
+    <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/images/"/>
+    <image id="wm603u" name="lm_chenghao_1.png" path="/images/" exported="true"/>
+    <image id="wm603v" name="lm_chenghao_2.png" path="/images/" exported="true"/>
+    <image id="wm603w" name="lm_chenghao_3.png" path="/images/" exported="true"/>
+    <component id="wm603x" name="Button111.xml" path="/components/"/>
+    <component id="wm603y" name="ListIconSmallItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

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

@@ -101,7 +101,7 @@ namespace GFGGame
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("CommonGame"));
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("Main"));
 
-            // LeagueSproxy.ReqGetLeagueInfo().Coroutine();
+            LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             await ItemProxy.GetItemInfos();
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();

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

@@ -118,6 +118,11 @@ namespace GFGGame
             {
                 return GameGlobal.myNumericComponent.GetAsInt(numericType);
             }
+            int leagueType = NumericUtil.GetLeagueNumericTypeByItemId(itemId);
+            if (leagueType != 0)
+            {
+                return LeagueDataManager.Instance.GetNumericValue(LeagueDataManager.Instance.LeagueData, leagueType);
+            }
             if (_dataDic.TryGetValue(itemId, out var itemData))
             {
                 return itemData.num;

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

@@ -46,6 +46,26 @@ namespace GFGGame
                     break;
             }
         }
+        public long GetNumericValue(LeagueData LeagueData, int type)
+        {
+            switch (type)
+            {
+                case LeagueNumericType.HallLevel:
+                    return LeagueData.HallLevel;
+                case LeagueNumericType.HotelLevel:
+                    return LeagueData.HotelLevel;
+                case LeagueNumericType.StoreLevel:
+                    return LeagueData.StoreLevel;
+                case LeagueNumericType.LowKeepDay:
+                    return LeagueData.LowKeepDay;
+                case LeagueNumericType.LeagueCoin:
+                    return LeagueData.LeagueCoin;
+                case LeagueNumericType.DayAdd:
+                    return LeagueData.DayAdd;
+                default:
+                    return 0;
+            }
+        }
 
         public string GetMemberTitle(int pos)
         {
@@ -80,5 +100,26 @@ namespace GFGGame
         // {
 
         // }
+        /// <summary>
+        /// 根据祈福类型获取祈福次数
+        /// </summary>
+        /// <returns></returns>
+        public int GetPrayTimesByType(int prayType)
+        {
+            int curCount = 0;
+            switch (prayType)
+            {
+                case LeaguePrayType.First:
+                    curCount = RoleDataManager.LeagueType1PrayTimes;
+                    break;
+                case LeaguePrayType.Second:
+                    curCount = RoleDataManager.LeagueType2PrayTimes;
+                    break;
+                case LeaguePrayType.Third:
+                    curCount = RoleDataManager.LeagueType3PrayTimes;
+                    break;
+            }
+            return curCount;
+        }
     }
 }

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_Button14
     {
         public GButton target;
+        public Controller m_touchable;
         public GTextField m_txtTime;
         public GComponent m_comcost;
         public const string URL = "ui://tw70qm9drv091r";
@@ -56,11 +57,13 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_touchable = comp.GetController("touchable");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_comcost = (GComponent)comp.GetChild("comcost");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_touchable = null;
             m_txtTime = null;
             m_comcost = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComHeadIcon.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_ComHeadIcon
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://tw70qm9dwm603r";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ComHeadIcon";
+        private static UI_ComHeadIcon _proxy;
+
+        public static UI_ComHeadIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHeadIcon();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComHeadIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHeadIcon();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        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_ComHeadIcon.cs.meta

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

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

@@ -7,9 +7,11 @@ namespace UI.League
     public partial class UI_ComLeader
     {
         public GComponent target;
+        public UI_ComHeadIcon m_comHead;
+        public GLoader m_loaHeadBorder;
         public GLoader m_loaTitle;
-        public GComponent m_comHead;
-        public GTextField m_txtname;
+        public GTextField m_txtLvl;
+        public GTextField m_txtName;
         public GButton m_btnAppoint;
         public const string URL = "ui://tw70qm9drv091m";
         public const string PACKAGE_NAME = "League";
@@ -58,16 +60,21 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
+            m_loaHeadBorder = (GLoader)comp.GetChild("loaHeadBorder");
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
-            m_comHead = (GComponent)comp.GetChild("comHead");
-            m_txtname = (GTextField)comp.GetChild("txtname");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAppoint = (GButton)comp.GetChild("btnAppoint");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaTitle = null;
+            m_comHead.Dispose();
             m_comHead = null;
-            m_txtname = null;
+            m_loaHeadBorder = null;
+            m_loaTitle = null;
+            m_txtLvl = null;
+            m_txtName = null;
             m_btnAppoint = null;
             if(disposeTarget && target != null)
             {

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

@@ -12,6 +12,7 @@ namespace UI.League
         public GTextField m_txtName;
         public GComponent m_comGain;
         public GComponent m_comFirstGain;
+        public GTextField m_txtCount;
         public GButton m_btnPray;
         public GComponent m_comCurrency;
         public const string URL = "ui://tw70qm9drv0929";
@@ -66,6 +67,7 @@ namespace UI.League
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_comGain = (GComponent)comp.GetChild("comGain");
             m_comFirstGain = (GComponent)comp.GetChild("comFirstGain");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_btnPray = (GButton)comp.GetChild("btnPray");
             m_comCurrency = (GComponent)comp.GetChild("comCurrency");
         }
@@ -76,6 +78,7 @@ namespace UI.League
             m_txtName = null;
             m_comGain = null;
             m_comFirstGain = null;
+            m_txtCount = null;
             m_btnPray = null;
             m_comCurrency = null;
             if(disposeTarget && target != null)

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

@@ -8,6 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
+        public GButton m_btnBack;
         public GList m_listIcon;
         public GTextInput m_txtName;
         public GButton m_btnChange;
@@ -60,6 +61,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_listIcon = (GList)comp.GetChild("listIcon");
             m_txtName = (GTextInput)comp.GetChild("txtName");
             m_btnChange = (GButton)comp.GetChild("btnChange");
@@ -68,6 +70,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnBack = null;
             m_listIcon = null;
             m_txtName = null;
             m_btnChange = null;

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

@@ -17,6 +17,7 @@ namespace UI.League
         public GButton m_btnApplyList;
         public GButton m_btnMemberLog;
         public GButton m_btnExit;
+        public GButton m_btnExit1;
         public const string URL = "ui://tw70qm9du2u35";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueMemberUI";
@@ -74,6 +75,7 @@ namespace UI.League
             m_btnApplyList = (GButton)comp.GetChild("btnApplyList");
             m_btnMemberLog = (GButton)comp.GetChild("btnMemberLog");
             m_btnExit = (GButton)comp.GetChild("btnExit");
+            m_btnExit1 = (GButton)comp.GetChild("btnExit1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +92,7 @@ namespace UI.League
             m_btnApplyList = null;
             m_btnMemberLog = null;
             m_btnExit = null;
+            m_btnExit1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListIconSmallItem.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_ListIconSmallItem
+    {
+        public GButton target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://tw70qm9dwm603y";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListIconSmallItem";
+        private static UI_ListIconSmallItem _proxy;
+
+        public static UI_ListIconSmallItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListIconSmallItem();
+            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_ListIconSmallItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListIconSmallItem();
+            }
+            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_ListIconSmallItem.cs.meta

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

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

@@ -122,11 +122,13 @@ namespace GFGGame
 
             if (message.LeagueId == leagueData.LeagueId)
             {
-                if (message.Position == LeaguePosPower.Owner)
+                if (message.RoleId == leagueData.OwnerId) leagueData.OwnerId = 0;
+                if (message.RoleId == leagueData.SubOwnerId) leagueData.SubOwnerId = 0;
+                if (message.Position == LeaguePos.Owner)
                 {
                     leagueData.OwnerId = message.RoleId;
                 }
-                else if (message.Position == LeaguePosPower.SubOwner)
+                else if (message.Position == LeaguePos.SubOwner)
                 {
                     leagueData.SubOwnerId = message.RoleId;
                 }
@@ -359,6 +361,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    // if(targetRoleId==LeagueDataManager.in)
                     return true;
                 }
             }
@@ -557,6 +560,7 @@ namespace GFGGame
         {
             LeagueLogData logData = new LeagueLogData();
             logData.RoleInfo = GetOtherRoleInfoData(logProto.RoleInfo);
+            logData.Type = logProto.Type;
             logData.Time = logProto.Time;
             logData.OldPos = logProto.OldPos;
             logData.NewPos = logProto.NewPos;

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

@@ -133,18 +133,20 @@ namespace GFGGame
         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);
+            string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
+            string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();
+            string strS = ts.Seconds.ToString().Length == 1 ? "0" + ts.Seconds : ts.Seconds.ToString();
+            return string.Format("{0}:{1}:{2}", strH, strM, strS);
         }
         /// <summary>
         /// <summary>
-        /// 将时间戳转换成yyyy.mm.dd hh-mm-ss格式
+        /// 将时间戳转换成HH:mm格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
         public static string FormattingTime6(long timeMsec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
-            string str = date.ToString("yyyy.MM.dd HH:mm:ss");
+            string str = date.ToString("HH:mm");
 
             return str;
         }

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

@@ -53,6 +53,8 @@ namespace GFGGame
         {
             base.OnShown();
             _memberData = this.viewData as LeagueMemberData;
+            _ui.m_c1.selectedIndex = 0;
+            _ui.m_c2.selectedIndex = 0;
             UpdateView();
         }
 
@@ -74,7 +76,7 @@ namespace GFGGame
         }
         private void OnBtnKickClick()
         {
-            AlertUI.Show("是否确认请离这个小伙伴")
+            AlertUI.Show("是否确认请离这个小伙伴?")
             .SetLeftButton(true, "取消")
             .SetRightButton(true, "确认", async (object param) =>
             {
@@ -94,7 +96,7 @@ namespace GFGGame
                 AlertUI.Show("是否把会长职位转让给该成员?")
                 .SetLeftButton(true, "取消", (object param) =>
                 {
-                    _ui.m_c1.selectedIndex = _ui.m_c1.previsousIndex;
+                    _ui.m_c2.selectedIndex = _ui.m_c2.previsousIndex;
                 })
                 .SetRightButton(true, "确认", async (object param) =>
                 {
@@ -122,11 +124,14 @@ namespace GFGGame
             }
             _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner ? 1 : 0;
             _ui.m_btnAppoint0.title = "1/1";
-            _ui.m_btnAppoint1.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? true : false;
+            _ui.m_btnAppoint1.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 || _memberData.Pos == LeaguePos.SubOwner ? true : false;
+            _ui.m_btnAppoint1.selected = _memberData.Pos == LeaguePos.SubOwner ? true : false;
             _ui.m_btnAppoint1.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
 
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
-            _ui.m_btnAppoint2.touchable = LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
+            _ui.m_btnAppoint2.touchable = _memberData.Pos == LeaguePos.Flower || LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
+            _ui.m_btnAppoint2.selected = _memberData.Pos == LeaguePos.Flower ? true : false;
+            Debug.Log("FlowerNum" + LeagueDataManager.Instance.LeagueData.FlowerNum);
             _ui.m_btnAppoint2.title = LeagueDataManager.Instance.LeagueData.FlowerNum + "/" + hotelCfg.limitPosition;
 
         }

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

@@ -40,7 +40,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_list.numItems = LeagueDataManager.Instance.ListLogDatas.Count;
         }
 
         protected override void OnHide()
@@ -65,7 +65,7 @@ namespace GFGGame
 
             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);
+            item.m_txtTime.text = TimeUtil.CheckIsSameTime(logData.Time, TimeHelper.ClientNow()) ? TimeUtil.FormattingTime6(logData.Time) : TimeUtil.FormattingTime2(logData.Time);
             string strInfo = "";
             switch (logData.Type)
             {

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

@@ -35,6 +35,7 @@ namespace GFGGame
             _ui.m_btnApplyList.onClick.Add(OnBtnApplyListClick);
             _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);
             _ui.m_btnExit.onClick.Add(OnBtnExitClick);
+            _ui.m_btnExit1.onClick.Add(OnBtnExitClick);
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
@@ -161,8 +162,9 @@ namespace GFGGame
             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 = "";
+            _ui.m_btnRecruit.m_touchable.selectedIndex = timeCount <= 0 ? 1 : 0;
+            // _ui.m_btnRecruit.m_comcost.visible = timeCount > 0 ? false : true;
+            // _ui.m_btnRecruit.m_txtTime.text = "";
 
             if (isLeader && timeCount > 0)
             {
@@ -176,7 +178,8 @@ namespace GFGGame
             if (timeCount <= 0)
             {
                 _ui.m_btnRecruit.target.touchable = true;
-                _ui.m_btnRecruit.m_txtTime.text = "";
+                _ui.m_btnRecruit.m_touchable.selectedIndex = 1;
+                // _ui.m_btnRecruit.m_txtTime.text = "";
                 Timers.inst.Remove(OnUpdateTimer);
             }
             string time = TimeUtil.FormattingTime5(timeCount);
@@ -188,14 +191,22 @@ namespace GFGGame
             UI_ComLeader com = UI_ComLeader.Proxy(obj);
             if (memberData == null)
             {
-                RoleInfoManager.Instance.UpdateHeadWithLv(com.m_comHead, 0, 0, 0);
-                com.m_txtname.text = "虚位以待";
+                com.m_txtName.text = "虚位以待";
+                com.m_txtLvl.text = "--";
+                com.m_comHead.m_loaIcon.url = "";
+                com.m_loaHeadBorder.url = "";
                 com.m_btnAppoint.visible = false;
+                com.m_loaTitle.url = "";
             }
             else
             {
-                RoleInfoManager.Instance.UpdateHeadWithLv(com.m_comHead, memberData.RoleInfo.headId, memberData.RoleInfo.headBorderId, memberData.RoleInfo.roleLv);
-                com.m_txtname.text = memberData.RoleInfo.roleName;
+                ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(memberData.RoleInfo.headId == 0 ? ConstItemID.HEADID : memberData.RoleInfo.headId);
+                ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(memberData.RoleInfo.headBorderId == 0 ? ConstItemID.HEADBORDERID : memberData.RoleInfo.headBorderId);
+                com.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+                com.m_loaHeadBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+                com.m_txtLvl.text = memberData.RoleInfo.roleLv.ToString();
+                com.m_txtName.text = memberData.RoleInfo.roleName;
+                com.m_loaTitle.url = string.Format("ui://League/lm_chenghao_{0}", memberData.Pos);
                 com.m_btnAppoint.visible = memberData.Pos == LeaguePos.SubOwner && _leagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos == LeaguePos.Owner;
                 if (com.m_btnAppoint.data == null)
                 {
@@ -215,7 +226,8 @@ namespace GFGGame
             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;
+            // item.m_loaTitle.visible = memberData.Pos != LeaguePos.Member;
+            item.m_loaTitle.url = memberData.Pos == LeaguePos.Member ? "" : string.Format("ui://League/lm_chenghao_{0}", memberData.Pos);
             if (memberData.RoleInfo.offlineTimeSec == 0)
             {
                 item.m_txtState.text = "在线";

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

@@ -57,9 +57,9 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            UpdateComPary(_ui.m_comPary0.target, 1);
-            UpdateComPary(_ui.m_comPary1.target, 2);
-            UpdateComPary(_ui.m_comPary2.target, 3);
+            UpdateComPary(_ui.m_comPary0.target, LeaguePrayType.First);
+            UpdateComPary(_ui.m_comPary1.target, LeaguePrayType.Second);
+            UpdateComPary(_ui.m_comPary2.target, LeaguePrayType.Third);
         }
         private void UpdateComPary(GObject obj, int type)
         {
@@ -69,7 +69,8 @@ namespace GFGGame
             ItemUtil.UpdateItemNeedNum(item.m_comGain, prayCfg.bonusArr[0][0], prayCfg.bonusArr[0][1]);
             ItemUtil.UpdateItemNeedNum(item.m_comFirstGain, prayCfg.bonusOnceArr[0][0], prayCfg.bonusOnceArr[0][1]);
 
-            if (type == 1 && RoleDataManager.LeagueType1PrayTimes == 0)
+            int curTimes = LeagueDataManager.Instance.GetPrayTimesByType(type);
+            if (type == LeaguePrayType.First && curTimes == 0)
             {
                 ItemUtil.UpdateItemNeedNum(item.m_comCurrency, prayCfg.consumeArr[0][0], 0);
             }
@@ -77,7 +78,10 @@ namespace GFGGame
             {
                 ItemUtil.UpdateItemNeedNum(item.m_comCurrency, prayCfg.consumeArr[0][0], prayCfg.consumeArr[0][1]);
             }
-            item.m_btnPray.touchable = type == 1 && RoleDataManager.LeagueType1PrayTimes < prayCfg.limit || type == 2 && RoleDataManager.LeagueType2PrayTimes < prayCfg.limit || type == 1 && RoleDataManager.LeagueType3PrayTimes < prayCfg.limit;
+            item.m_c1.selectedIndex = curTimes == 0 ? 0 : 1;
+            item.m_btnPray.touchable = curTimes < prayCfg.limit;
+            item.m_txtCount.SetVar("value", curTimes.ToString()).FlushVars();
+            item.m_txtCount.SetVar("maxValue", prayCfg.limit.ToString()).FlushVars();
             if (item.m_btnPray.data == null)
             {
                 item.m_btnPray.onClick.Add(OnBtnPrayClick);
@@ -90,6 +94,15 @@ namespace GFGGame
         private void OnBtnPrayClick(EventContext context)
         {
             int type = (int)(context.sender as GObject).data;
+            LeaguePrayCfg prayCfg = LeaguePrayCfgArray.Instance.GetCfg(type);
+            int curTimes = LeagueDataManager.Instance.GetPrayTimesByType(type);
+            long hasCount = ItemDataManager.GetItemNum(prayCfg.consumeArr[0][0]);
+            long needCount = prayCfg.consumeArr[0][1];
+            if (type != LeaguePrayType.First && curTimes != 0 && hasCount < needCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
             LeagueSproxy.ReqPrayLeague(type).Coroutine();
         }
     }

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

@@ -40,16 +40,15 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateInfo);
-            EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateValue);
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int myPos = LeagueDataManager.Instance.GetMyPos();
             _ui.m_btnChangeNotice.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
-            UpdateInfo();
-            UpdateValue();
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -61,8 +60,8 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateInfo);
-            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateValue);
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
         }
 
         private void OnBtnBackClick()
@@ -93,6 +92,11 @@ namespace GFGGame
         {
             ViewManager.Show<RuleView>();
         }
+        private void UpdateView()
+        {
+            UpdateInfo();
+            UpdateValue();
+        }
         private void UpdateInfo()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;

GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png.meta

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

GameClient/Assets/ResIn/UI/League/League_atlas0_2.png.meta

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

GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png.meta

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

GameClient/Assets/ResIn/UI/League/League_atlas0_3.png.meta

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