联盟

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -5,22 +5,27 @@
     <remark page="1" value="改名字"/>
   </controller>
   <displayList>
-    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="426,1478" size="237,46"/>
+    <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 title="改徽章" controller="c1" page="0"/>
+      <Button checked="true" 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>
-    <list id="n1_rv09" name="listIcon" xy="183,749" size="756,487" layout="flow_hz" overflow="scroll" defaultItem="ui://tw70qm9drv091h">
+    <list id="n1_rv09" name="listIcon" xy="183,749" size="756,487" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://tw70qm9drv091h" align="center">
       <gearDisplay controller="c1" pages="0"/>
+      <item/>
+      <item/>
+      <item/>
+      <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="383,42" group="n7_rv09" fontSize="30" text="请输入您想要修改的联盟名字"/>
+    <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">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <component id="n4_rv09" name="btnChange" src="rv091k" fileName="components/Button9.xml" xy="463,1388">
+    <component id="n4_rv09" name="btnChange" src="rv091k" fileName="components/Button9.xml" xy="442,1388">
       <Button title="修改"/>
     </component>
   </displayList>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -3,42 +3,45 @@
   <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="217,519" pivot="0.5,0" size="91,42" group="n7_rv09" fontSize="30" align="center" text="宴客厅"/>
+    <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="ComConstruct.xml" xy="98,595" group="n10_rv09">
+    <component id="n8_rv09" name="comHall0" src="rv0925" fileName="components/ComConstruct.xml" xy="98,595" group="n10_rv09">
       <property target="txtDesc" propertyId="0" value="小酒馆等级"/>
     </component>
-    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="ComConstruct.xml" xy="98,653" group="n10_rv09">
+    <component id="n9_rv09" name="comHall1" src="rv0925" fileName="components/ComConstruct.xml" xy="98,653" group="n10_rv09">
       <property target="txtDesc" propertyId="0" value="小金库等级"/>
     </component>
-    <group id="n10_rv09" name="n10" xy="98,324" size="295,371"/>
+    <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="527,516" pivot="0.5,0" size="91,42" group="n14_rv09" fontSize="30" align="center" text="小酒馆"/>
+    <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="ComConstruct.xml" xy="408,592" group="n17_rv09">
+    <component id="n15_rv09" name="comHotel0" src="rv0925" fileName="components/ComConstruct.xml" xy="408,592" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="成员上限"/>
     </component>
-    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="ComConstruct.xml" xy="408,650" group="n17_rv09">
+    <component id="n16_rv09" name="comHotel1" src="rv0925" fileName="components/ComConstruct.xml" xy="408,650" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="会花上限"/>
     </component>
-    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="ComConstruct.xml" xy="408,711" group="n17_rv09">
+    <component id="n18_rv09" name="comHotel2" src="rv0925" fileName="components/ComConstruct.xml" xy="408,711" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="每日新加上限"/>
     </component>
-    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="ComConstruct.xml" xy="408,766" group="n17_rv09">
+    <component id="n19_rv09" name="comHotel3" src="rv0925" fileName="components/ComConstruct.xml" xy="408,766" group="n17_rv09">
       <property target="txtDesc" propertyId="0" value="招募额外上限"/>
     </component>
-    <group id="n17_rv09" name="n17" xy="408,321" size="295,487"/>
+    <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="845,515" pivot="0.5,0" size="91,42" group="n23_rv09" fontSize="30" align="center" text="小金库"/>
+    <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="735,592" size="179,42" group="n34_rv09" fontSize="30" align="center" text="资金存储上限"/>
-    <text id="n30_rv09" name="txtCurValue" xy="735,650" size="38,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <image id="n31_rv09" name="n31" src="rv0924" fileName="images/bpjly_jtjt_3.png" xy="775,650" group="n33_rv09"/>
-    <text id="n32_rv09" name="txtNeatAdd" xy="819,650" size="38,41" group="n33_rv09" fontSize="30" align="center" text="70"/>
-    <group id="n33_rv09" name="n33" xy="735,650" size="122,42" group="n34_rv09" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <group id="n34_rv09" name="n34" xy="735,592" size="179,100" group="n28_rv09"/>
-    <group id="n28_rv09" name="n28" xy="735,320" size="239,372"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/Button20.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="196,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <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}">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+    <text id="n5_a0cf" name="txtTip" xy="78,55" pivot="0.5,0" size="40,42" fontSize="30" text=""/>
+    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,61"/>
+  </displayList>
+  <Button/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/League/components/ComConstruct.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="295,42">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n3_rv09" name="txtDesc" xy="0,0" size="150,41" fontSize="30" align="center" text="小酒馆等级"/>
-    <text id="n4_rv09" name="txtCurValue" xy="180,0" size="38,41" fontSize="30" align="center" text="70"/>
-    <image id="n5_rv09" name="n5" src="rv0924" fileName="images/bpjly_jtjt_3.png" xy="220,0"/>
-    <text id="n6_rv09" name="txtNeatAdd" xy="257,0" size="38,41" fontSize="30" align="center" text="70"/>
+    <text id="n3_rv09" name="txtDesc" xy="0,0" size="152,41" fontSize="30" align="center" text="小酒馆等级"/>
+    <text id="n4_rv09" name="txtCurValue" xy="180,0" size="37,41" fontSize="30" align="center" text="70"/>
+    <image id="n5_rv09" name="n5" src="rv0924" fileName="imageTest/bpjly_jtjt_3.png" xy="220,0" group="n7_a0cf"/>
+    <text id="n6_rv09" name="txtNextAdd" xy="257,0" size="37,41" group="n7_a0cf" fontSize="30" align="center" text="70"/>
+    <group id="n7_a0cf" name="n7" xy="220,0" size="74,42" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
   <customProperty target="txtDesc" propertyId="0"/>
 </component>

FGUIProject/assets/League/components/ComPary.xml

@@ -3,12 +3,14 @@
   <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="白檀香"/>
-    <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="38,221"/>
-    <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="38,335"/>
+    <text id="n9_a0cf" name="n9" xy="37,227" pivot="0.5,0" size="122,42" fontSize="30" align="center" text="每次祈福"/>
+    <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="33,273"/>
+    <component id="n6_rv09" name="comFirstGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="37,376"/>
     <component id="n7_rv09" name="btnPray" src="rv0928" fileName="components/Button19.xml" xy="0,460">
       <Button title="祈福"/>
     </component>
     <component id="n8_rv09" name="comCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="31,534"/>
+    <text id="n10_a0cf" name="n10" xy="7,322" pivot="0.5,0" size="182,42" fontSize="30" align="center" text="每日首次祈福"/>
   </displayList>
   <customProperty target="LoaIcon" propertyId="1"/>
   <customProperty target="txtName" propertyId="0"/>

FGUIProject/assets/League/components/ListApplyItem.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="885,230">
   <displayList>
-    <component id="n1_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="0,0"/>
+    <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"/>
+    <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="同意"/>
     </component>

FGUIProject/assets/League/components/ListLogItem.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="972,230">
   <displayList>
-    <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="196,42" fontSize="30" autoClearText="true" text="玩家名字7个字"/>
-    <text id="n3_rv09" name="txtInfo" xy="527,110" pivot="0.5,0" size="120,42" fontSize="30" align="center" autoClearText="true" text="退出联盟"/>
-    <text id="n4_rv09" name="txtTime" xy="699,108" pivot="0.5,0" size="273,42" fontSize="30" align="center" autoClearText="true" text="2023.3.30 23:59:59"/>
+    <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"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -87,6 +87,7 @@
     <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

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

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

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

@@ -42,9 +42,30 @@ namespace GFGGame
                     LeagueData.DayAdd = value;
                     break;
                 case LeagueNumericType.NeedAudit:
-                    LeagueData.NeedAudit = value;
+                    LeagueData.NeedAudit = value == 0 ? false : true; //0不用 1需要
                     break;
             }
         }
+
+        public string GetMemberTitle(int pos)
+        {
+            string title = "";
+            switch (pos)
+            {
+                case LeaguePos.Owner:
+                    title = "会长";
+                    break;
+                case LeaguePos.SubOwner:
+                    title = "副会长";
+                    break;
+                case LeaguePos.Flower:
+                    title = "会花";
+                    break;
+                case LeaguePos.Member:
+                    title = "成员";
+                    break;
+            }
+            return title;
+        }
     }
 }

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

@@ -17,7 +17,7 @@ namespace GFGGame
         public long LowKeepDay { get; set; } //低维护天数
         public long LeagueCoin { get; set; } //联盟资金
         public long DayAdd { get; set; } //新加入联盟成员人数
-        public long NeedAudit { get; set; } //是否需要审核 0不用 1需要
+        public bool NeedAudit { get; set; } //是否需要审核
         public long OwnerId = 0;
         public long SubOwnerId = 0;
         public Dictionary<long, LeagueMemberData> LeagueMemberDatas = new Dictionary<long, LeagueMemberData>();//联盟成员

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_Button20
+    {
+        public GButton target;
+        public GTextField m_txtTip;
+        public GComponent m_comCost;
+        public const string URL = "ui://tw70qm9da0cf31";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "Button20";
+        private static UI_Button20 _proxy;
+
+        public static UI_Button20 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button20();
+            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_Button20 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button20();
+            }
+            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_txtTip = (GTextField)comp.GetChild("txtTip");
+            m_comCost = (GComponent)comp.GetChild("comCost");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTip = null;
+            m_comCost = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,9 +7,10 @@ namespace UI.League
     public partial class UI_ComConstruct
     {
         public GComponent target;
+        public Controller m_c1;
         public GTextField m_txtDesc;
         public GTextField m_txtCurValue;
-        public GTextField m_txtNeatAdd;
+        public GTextField m_txtNextAdd;
         public const string URL = "ui://tw70qm9drv0925";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ComConstruct";
@@ -57,15 +58,17 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtCurValue = (GTextField)comp.GetChild("txtCurValue");
-            m_txtNeatAdd = (GTextField)comp.GetChild("txtNeatAdd");
+            m_txtNextAdd = (GTextField)comp.GetChild("txtNextAdd");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_txtDesc = null;
             m_txtCurValue = null;
-            m_txtNeatAdd = null;
+            m_txtNextAdd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,6 +12,7 @@ namespace UI.League
         public GTextField m_txtName;
         public UI_ComConstruct m_comHall0;
         public UI_ComConstruct m_comHall1;
+        public UI_Button20 m_btnUpLv0;
         public GLoader m_loaIcon1;
         public GComponent m_comLv1;
         public GTextField m_txtName1;
@@ -19,12 +20,15 @@ namespace UI.League
         public UI_ComConstruct m_comHotel1;
         public UI_ComConstruct m_comHotel2;
         public UI_ComConstruct m_comHotel3;
+        public UI_Button20 m_btnUpLv1;
         public GLoader m_loaIcon2;
         public GComponent m_comLv2;
         public GTextField m_txtName2;
         public GTextField m_txtDesc;
         public GTextField m_txtCurValue;
-        public GTextField m_txtNeatAdd;
+        public GImage m_imgUp;
+        public GTextField m_txtNextAdd;
+        public UI_Button20 m_btnUpLv2;
         public const string URL = "ui://tw70qm9du2u39";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueConstructUI";
@@ -77,6 +81,7 @@ namespace UI.League
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_comHall0 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHall0"));
             m_comHall1 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHall1"));
+            m_btnUpLv0 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv0"));
             m_loaIcon1 = (GLoader)comp.GetChild("loaIcon1");
             m_comLv1 = (GComponent)comp.GetChild("comLv1");
             m_txtName1 = (GTextField)comp.GetChild("txtName1");
@@ -84,12 +89,15 @@ namespace UI.League
             m_comHotel1 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel1"));
             m_comHotel2 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel2"));
             m_comHotel3 = (UI_ComConstruct)UI_ComConstruct.Create(comp.GetChild("comHotel3"));
+            m_btnUpLv1 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv1"));
             m_loaIcon2 = (GLoader)comp.GetChild("loaIcon2");
             m_comLv2 = (GComponent)comp.GetChild("comLv2");
             m_txtName2 = (GTextField)comp.GetChild("txtName2");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtCurValue = (GTextField)comp.GetChild("txtCurValue");
-            m_txtNeatAdd = (GTextField)comp.GetChild("txtNeatAdd");
+            m_imgUp = (GImage)comp.GetChild("imgUp");
+            m_txtNextAdd = (GTextField)comp.GetChild("txtNextAdd");
+            m_btnUpLv2 = (UI_Button20)UI_Button20.Create(comp.GetChild("btnUpLv2"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -100,6 +108,8 @@ namespace UI.League
             m_comHall0 = null;
             m_comHall1.Dispose();
             m_comHall1 = null;
+            m_btnUpLv0.Dispose();
+            m_btnUpLv0 = null;
             m_loaIcon1 = null;
             m_comLv1 = null;
             m_txtName1 = null;
@@ -111,12 +121,17 @@ namespace UI.League
             m_comHotel2 = null;
             m_comHotel3.Dispose();
             m_comHotel3 = null;
+            m_btnUpLv1.Dispose();
+            m_btnUpLv1 = null;
             m_loaIcon2 = null;
             m_comLv2 = null;
             m_txtName2 = null;
             m_txtDesc = null;
             m_txtCurValue = null;
-            m_txtNeatAdd = null;
+            m_imgUp = null;
+            m_txtNextAdd = null;
+            m_btnUpLv2.Dispose();
+            m_btnUpLv2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,8 @@ 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;
         public const string URL = "ui://tw70qm9drv091z";
@@ -58,12 +60,16 @@ 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");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead = null;
+            m_comLv = null;
+            m_txtName = null;
             m_btnAgree = null;
             m_btnRefuse = null;
             if(disposeTarget && target != null)

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

@@ -8,6 +8,7 @@ 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;
@@ -59,6 +60,7 @@ 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");
@@ -66,6 +68,7 @@ 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

@@ -49,7 +49,16 @@ namespace GFGGame
                 }
                 else
                 {
-                    leagueData.LeagueMemberDatas.Remove(message.LeaveRoleId);
+
+
+                    if (leagueData.LeagueMemberDatas.ContainsKey(message.LeaveRoleId))
+                    {
+                        if (leagueData.LeagueMemberDatas[message.LeaveRoleId].Pos == LeaguePos.Flower)
+                        {
+                            leagueData.FlowerNum--;
+                        }
+                        leagueData.LeagueMemberDatas.Remove(message.LeaveRoleId);
+                    }
                     if (message.LeaveRoleId == leagueData.OwnerId)
                     {
                         leagueData.OwnerId = 0;
@@ -92,7 +101,19 @@ namespace GFGGame
                 {
                     leagueData.SubOwnerId = message.RoleId;
                 }
-                LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[message.RoleId].Pos = message.Position;
+                if (leagueData.LeagueMemberDatas.ContainsKey(message.RoleId))
+                {
+
+                    if (leagueData.LeagueMemberDatas[message.RoleId].Pos == LeaguePos.Flower)
+                    {
+                        leagueData.FlowerNum--;
+                    }
+                    else if (message.Position == LeaguePos.Flower)
+                    {
+                        leagueData.FlowerNum++;
+                    }
+                    LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[message.RoleId].Pos = message.Position;
+                }
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             }
             await ETTask.CompletedTask;
@@ -262,6 +283,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    LeagueDataManager.Instance.LeagueData.NeedAudit = response.IsNeed;
                     return true;
                 }
             }
@@ -336,14 +358,15 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    if (type == 1)
-                    {
-                        LeagueDataManager.Instance.LeagueData.Name = changed;
-                    }
-                    else
-                    {
-                        LeagueDataManager.Instance.LeagueData.Icon = changed;
-                    }
+                    // if (type == 1)
+                    // {
+                    //     LeagueDataManager.Instance.LeagueData.Name = changed;
+                    // }
+                    // else
+                    // {
+                    //     LeagueDataManager.Instance.LeagueData.Icon = changed;
+                    // }
+                    PromptController.Instance.ShowFloatTextPrompt("修改成功");
                     return true;
                 }
             }

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

@@ -90,6 +90,7 @@ namespace GFGGame
 
             return str;
         }
+
         /// <summary>
         /// 将时间戳转换成yyyy.MM.dd格式
         /// </summary>
@@ -135,7 +136,18 @@ namespace GFGGame
 
             return string.Format("{0}:{1}:{2}", ts.Hours, ts.Minutes, ts.Seconds);
         }
+        /// <summary>
+        /// <summary>
+        /// 将时间戳转换成yyyy.mm.dd hh-mm-ss格式
+        /// </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");
 
+            return str;
+        }
 
     }
 }

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

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.League;
@@ -9,6 +11,7 @@ namespace GFGGame
     public class LeagueApplyView : BaseWindow
     {
         private UI_LeagueApplyUI _ui;
+        private List<long> _listKeys;
 
         public override void Dispose()
         {
@@ -29,6 +32,12 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+
+            _ui.m_btnNoCheck.onClick.Add(OnBtnNoCheckClick);
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+
+            _ui.m_list.itemRenderer = RenderListItem;
+
         }
         protected override void AddEventListener()
         {
@@ -38,7 +47,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_btnNoCheck.selected = !LeagueDataManager.Instance.LeagueData.NeedAudit;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -52,5 +62,63 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>();
+        }
+        private void OnBtnNoCheckClick()
+        {
+            LeagueSproxy.ReqSetLeagueApply(!_ui.m_btnNoCheck.selected).Coroutine();
+        }
+        private void UpdateView()
+        {
+            _listKeys = new List<long>(LeagueDataManager.Instance.ListApplyDatas.Keys);
+            _ui.m_list.numItems = LeagueDataManager.Instance.ListApplyDatas.Count;
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            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);
+            item.m_txtName.text = roleInfoData.roleName;
+            if (item.m_btnAgree.data == null)
+            {
+                item.m_btnAgree.onClick.Add(OnBtnAgreeClick);
+            }
+            item.m_btnAgree.data = roleInfoData.roleId;
+            if (item.m_btnRefuse.data == null)
+            {
+                item.m_btnAgree.onClick.Add(OnBtnRefuseClick);
+            }
+            item.m_btnRefuse.data = roleInfoData.roleId;
+            UI_ListApplyItem.ProxyEnd();
+        }
+
+        private async void OnBtnAgreeClick(EventContext context)
+        {
+            long roleId = (long)(context.sender as GObject).data;
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+            if (LeagueDataManager.Instance.LeagueData.Num >= hotelCfg.limit)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("雅集满员啦");
+                return;
+            }
+            bool result = await LeagueSproxy.ReqAuditJoinLeague(roleId, true);
+            if (result)
+            {
+                UpdateView();
+            }
+        }
+        private async void OnBtnRefuseClick(EventContext context)
+        {
+            long roleId = (long)(context.sender as GObject).data;
+            bool result = await LeagueSproxy.ReqAuditJoinLeague(roleId, false);
+            if (result)
+            {
+                UpdateView();
+            }
+        }
     }
 }

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

@@ -29,6 +29,9 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_c1.onChanged.Add(UpdateView);
+            _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
+            _ui.m_listIcon.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
         {
@@ -38,7 +41,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_c1.selectedIndex = 0;
+            _ui.m_listIcon.numItems = GlobalCfgArray.globalCfg.badgeResArr.Length;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -52,5 +57,63 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void UpdateView()
+        {
+            _ui.m_txtName.text = "";
+            if (_ui.m_listIcon.numItems > 0)
+            {
+                _ui.m_listIcon.selectedIndex = 0;
+                _ui.m_listIcon.ScrollToView(0);
+            }
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCost, GlobalCfgArray.globalCfg.consumeChangeBadgeArr[0][0], GlobalCfgArray.globalCfg.consumeChangeBadgeArr[0][1]);
+            }
+            else
+            {
+                ItemUtil.UpdateItemNeedNum(_ui.m_comCost, GlobalCfgArray.globalCfg.consumeChangeNameArr[0][0], GlobalCfgArray.globalCfg.consumeChangeNameArr[0][1]);
+            }
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListIconItem item = UI_ListIconItem.Proxy(obj);
+
+            item.m_loaIcon.url = ResPathUtil.GetLeagueIconPath(GlobalCfgArray.globalCfg.badgeResArr[index]);
+
+            UI_ListIconItem.ProxyEnd();
+        }
+
+        private void OnBtnChangeClick()
+        {
+            if (LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos != LeaguePos.Owner)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("权限不足");
+                return;
+            }
+            if (_ui.m_c1.selectedIndex == 0)
+            {
+                int needCount = GlobalCfgArray.globalCfg.consumeChangeBadgeArr[0][1];
+                long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeChangeBadgeArr[0][0]);
+                if (needCount > hasCount)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                    return;
+                }
+                LeagueSproxy.ReqChangeLeagueNameOrIcon(2, GlobalCfgArray.globalCfg.badgeResArr[_ui.m_listIcon.selectedIndex]).Coroutine();
+            }
+            else
+            {
+                int needCount = GlobalCfgArray.globalCfg.consumeChangeNameArr[0][1];
+                long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeChangeNameArr[0][0]);
+                if (needCount > hasCount)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                    return;
+                }
+                LeagueSproxy.ReqChangeLeagueNameOrIcon(1, _ui.m_txtName.text).Coroutine();
+            }
+        }
     }
 }

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

@@ -29,16 +29,23 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnUpLv0.target.onClick.Add(OnBtnUpLvClick);
+            _ui.m_btnUpLv0.target.data = LeagueBuildingType.Hall;
+            _ui.m_btnUpLv1.target.onClick.Add(OnBtnUpLvClick);
+            _ui.m_btnUpLv1.target.data = LeagueBuildingType.Hotel;
+            _ui.m_btnUpLv2.target.onClick.Add(OnBtnUpLvClick);
+            _ui.m_btnUpLv2.target.data = LeagueBuildingType.Store;
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
 
         }
         protected override void OnShown()
         {
             base.OnShown();
-
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -50,7 +57,153 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
+
+        }
+
+        private void OnBtnUpLvClick(EventContext context)
+        {
+            int type = (int)(context.sender as GObject).data;
+            LeagueSproxy.ReqUpLeagueBuilding(type).Coroutine();
+        }
+        private void UpdateView()
+        {
+            UpdateHall();
+            UpdateHotel();
+            UpdateStore();
+        }
+        private void UpdateHall()
+        {
+            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
+            LeagueHallCfg nextHallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv + 1);
+
+            int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
+            int hotelAdd = nextHallCfg == null ? 0 : nextHallCfg.levelHotel - hotelLv;
+            _ui.m_comHall0.m_txtCurValue.text = hotelLv.ToString();
+            _ui.m_comHall0.m_txtNextAdd.text = hotelAdd.ToString();
+            _ui.m_comHall0.m_c1.selectedIndex = hotelAdd > 0 ? 1 : 0;
+
+            int storeLv = LeagueDataManager.Instance.LeagueData.StoreLevel;
+            int storeAdd = nextHallCfg == null ? 0 : nextHallCfg.levelStore - storeLv;
+            _ui.m_comHall1.m_txtCurValue.text = storeLv.ToString();
+            _ui.m_comHall1.m_txtNextAdd.text = storeAdd.ToString();
+            _ui.m_comHall1.m_c1.selectedIndex = storeAdd > 0 ? 1 : 0;
+
+            _ui.m_btnUpLv0.target.touchable = nextHallCfg == null ? false : true;
+            _ui.m_btnUpLv0.m_txtTip.text = nextHallCfg == null ? "已满级" : "";
+            _ui.m_btnUpLv0.m_comCost.visible = nextHallCfg == null ? false : true;
+            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeArr[0][0], hallCfg.consumeArr[0][1]);
+
+
+        }
+
+        private void UpdateHotel()
+        {
+            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
+
+            int hotelLv = LeagueDataManager.Instance.LeagueData.HotelLevel;
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv);
+            LeagueHotelCfg nextHotelCfg = LeagueHotelCfgArray.Instance.GetCfg(hotelLv + 1);
+
+            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;
+
+            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;
 
+            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;
+
+            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv1.m_comCost, hotelCfg.consumeArr[0][0], hotelCfg.consumeArr[0][1]);
+
+            if (nextHotelCfg == null)
+            {
+                _ui.m_btnUpLv1.m_txtTip.text = "已满级";
+                _ui.m_btnUpLv1.m_comCost.visible = false;
+                _ui.m_btnUpLv1.target.touchable = false;
+            }
+            else if (hallCfg.levelHotel == hotelLv)
+            {
+                int needHallLv = hallLv;
+                for (int i = hallLv - 1; i < LeagueHallCfgArray.Instance.dataArray.Length; i++)
+                {
+                    LeagueHallCfg _hallCfg = LeagueHallCfgArray.Instance.dataArray[i];
+                    if (_hallCfg.levelHotel > hotelLv)
+                    {
+                        needHallLv = _hallCfg.level;
+                        break;
+                    }
+                }
+                _ui.m_btnUpLv1.m_txtTip.text = string.Format("宴客厅{0}级解锁", needHallLv);
+                _ui.m_btnUpLv1.m_comCost.visible = false;
+                _ui.m_btnUpLv1.target.touchable = false;
+            }
+            else
+            {
+                _ui.m_btnUpLv1.m_txtTip.text = "";
+                _ui.m_btnUpLv1.m_comCost.visible = true;
+                _ui.m_btnUpLv1.target.touchable = true;
+            }
+        }
+
+        private void UpdateStore()
+        {
+            int hallLv = LeagueDataManager.Instance.LeagueData.HallLevel;
+            LeagueHallCfg hallCfg = LeagueHallCfgArray.Instance.GetCfg(hallLv);
+
+            int storeLv = LeagueDataManager.Instance.LeagueData.StoreLevel;
+            LeagueStoreCfg storeCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv);
+            LeagueStoreCfg nextStoreCfg = LeagueStoreCfgArray.Instance.GetCfg(storeLv + 1);
+
+            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;
+
+            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv2.m_comCost, storeCfg.consumeArr[0][0], storeCfg.consumeArr[0][1]);
+
+            if (nextStoreCfg == null)
+            {
+                _ui.m_btnUpLv2.m_txtTip.text = "已满级";
+                _ui.m_btnUpLv2.m_comCost.visible = false;
+                _ui.m_btnUpLv2.target.touchable = false;
+            }
+            else if (hallCfg.levelStore == storeLv)
+            {
+                int needHallLv = hallLv;
+                for (int i = hallLv - 1; i < LeagueHallCfgArray.Instance.dataArray.Length; i++)
+                {
+                    LeagueHallCfg _hallCfg = LeagueHallCfgArray.Instance.dataArray[i];
+                    if (_hallCfg.levelStore > storeLv)
+                    {
+                        needHallLv = _hallCfg.level;
+                        break;
+                    }
+                }
+                _ui.m_btnUpLv2.m_txtTip.text = string.Format("宴客厅{0}级解锁", needHallLv);
+                _ui.m_btnUpLv2.m_comCost.visible = false;
+                _ui.m_btnUpLv2.target.touchable = false;
+            }
+            else
+            {
+                _ui.m_btnUpLv2.m_txtTip.text = "";
+                _ui.m_btnUpLv2.m_comCost.visible = true;
+                _ui.m_btnUpLv2.target.touchable = true;
+            }
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using ET;
 using FairyGUI;
 using UI.League;
@@ -45,12 +46,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateView);
 
         }
         protected override void OnShown()
         {
             base.OnShown();
             _memberData = this.viewData as LeagueMemberData;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -62,6 +65,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateView);
 
         }
         private void OnBtnRuleClick()
@@ -81,19 +85,49 @@ namespace GFGGame
                 }
             });
         }
-        private void OnBtnAppointClick()
+        private void OnBtnAppointClick(EventContext context)
         {
-
+            GButton button = context.sender as GButton;
+            int pos = button.selected ? (int)button.data : LeaguePos.Member;
+            if (pos == LeaguePos.Owner)
+            {
+                AlertUI.Show("是否把会长职位转让给该成员?")
+                .SetLeftButton(true, "取消", (object param) =>
+                {
+                    _ui.m_c1.selectedIndex = _ui.m_c1.previsousIndex;
+                })
+                .SetRightButton(true, "确认", async (object param) =>
+                {
+                    bool result = await LeagueSproxy.ReqChangeLeaguePos(_memberData.RoleInfo.roleId, pos);
+                    if (result)
+                    {
+                        Hide();
+                    }
+                });
+            }
+            else
+            {
+                LeagueSproxy.ReqChangeLeaguePos(_memberData.RoleInfo.roleId, pos).Coroutine();
+            }
         }
 
         private void UpdateView()
         {
-            _ui.m_c1.selectedIndex = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos == LeaguePos.Owner ? 1 : 0;
+            int myPos = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
+            if (myPos != LeaguePos.Owner && myPos != LeaguePos.SubOwner)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("您的职位发生变化");
+                Hide();
+                return;
+            }
+            _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner ? 1 : 0;
             _ui.m_btnAppoint0.title = "1/1";
             _ui.m_btnAppoint1.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? true : false;
             _ui.m_btnAppoint1.title = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? "0/1" : "1/1";
 
-            _ui.m_btnAppoint2.touchable = LeagueDataManager.Instance.LeagueData.SubOwnerId == 0 ? true : false;
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.LeagueData.HotelLevel);
+            _ui.m_btnAppoint2.touchable = LeagueDataManager.Instance.LeagueData.FlowerNum < hotelCfg.limitPosition ? true : false;
+            _ui.m_btnAppoint2.title = LeagueDataManager.Instance.LeagueData.FlowerNum + "/" + hotelCfg.limitPosition;
 
         }
     }

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

@@ -29,6 +29,7 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
         {
@@ -52,5 +53,34 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            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);
+            item.m_txtName.text = logData.RoleInfo.roleName;
+            item.m_txtTime.text = TimeUtil.FormattingTime6(logData.Time);
+            string strInfo = "";
+            switch (logData.Type)
+            {
+                case LeagueJoinQuitLogType.Join:
+                    strInfo = "加入了雅集";
+                    break;
+                case LeagueJoinQuitLogType.Quit:
+                    strInfo = "退出了雅集";
+                    break;
+                case LeagueJoinQuitLogType.Change:
+                    strInfo = string.Format("从{0}变更为{1}", LeagueDataManager.Instance.GetMemberTitle(logData.OldPos), LeagueDataManager.Instance.GetMemberTitle(logData.NewPos));
+                    break;
+                case LeagueJoinQuitLogType.Kick:
+                    strInfo = "被请离了雅集";
+                    break;
+            }
+            item.m_txtInfo.text = strInfo;
+            UI_ListLogItem.ProxyEnd();
+        }
     }
 }

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

@@ -114,8 +114,8 @@ namespace GFGGame
             {
                 long joinLeagueTime = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].JoinLeagueTime;
                 long curTime = TimeHelper.ServerNow();
-                long seconds = (curTime - joinLeagueTime) / 1000;
-                if (seconds < TimeUtil.SECOND_PER_DAY)
+                long ms = (curTime - joinLeagueTime);
+                if (ms < TimeUtil.SECOND_PER_DAY * 1000)
                 {
                     AlertUI.Show("您加入的时间不足一天").SetRightButton(true, "确认");
                 }

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

@@ -32,6 +32,7 @@ namespace GFGGame
             _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_btnRule.onClick.Add(OnBtnRuleClick);
         }
         protected override void AddEventListener()
@@ -73,6 +74,10 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueConstructView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private void OnComLeagueHeadClick()
+        {
+            ViewManager.Show<LeagueChangeNameView>(null, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void OnBtnRuleClick()
         {
             ViewManager.Show<RuleView>();