雅集福利

FGUIProject/assets/League/LeagueAnswerRankUI.xml

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

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

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

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1110">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <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,50"/>
-    <component id="n9_wm60" name="btnBack" src="a0cftl2" fileName="components/BtnCloose.xml" pkg="eg2y0ldp" xy="905,70"/>
+    <component id="n9_wm60" name="btnClose" src="a0cftl2" fileName="components/BtnClose.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"/>
+      <Button checked="true" title="徽章" controller="c1" page="0"/>
     </component>
     <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"/>
+      <Button title="改名字" controller="c1" page="1"/>
     </component>
     <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">

FGUIProject/assets/League/LeagueChangeNoticeUI.xml

@@ -3,6 +3,7 @@
   <displayList>
     <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"/>
+    <component id="n8_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="890,14"/>
     <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">

FGUIProject/assets/League/LeagueCreatUI.xml

@@ -7,7 +7,7 @@
     <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/BtnCloose.xml" pkg="eg2y0ldp" xy="905,70"/>
+    <component id="n11_a0cf" name="btnClose" src="a0cftl2" fileName="components/BtnClose.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" autoClearItems="true">
       <item/>

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1110">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,0" size="1080,1147" group="n11_pvb4"/>
-    <component id="n1_pvb4" name="btnBack" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,20" size="111,96" group="n11_pvb4"/>
+    <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,20" size="111,96" group="n11_pvb4"/>
     <image id="n2_pvb4" name="n2" src="wm603l" fileName="images/biaotizi_5.png" xy="202,80" size="673,62" group="n11_pvb4"/>
     <image id="n3_pvb4" name="n3" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,172" size="293,56" group="n6_pvb4"/>
     <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="162,169" group="n6_pvb4">
-      <Button title="领取福利" controller="c1" page="0"/>
+      <Button checked="true" title="领取福利" controller="c1" page="0"/>
     </component>
     <component id="n5_pvb4" name="n5" src="rv091j" fileName="components/Button8.xml" xy="314,169" group="n6_pvb4">
-      <Button checked="true" title="采购福利" controller="c1" page="1"/>
+      <Button title="采购福利" controller="c1" page="1"/>
     </component>
     <group id="n6_pvb4" name="n6" xy="162,169" size="304,63" group="n11_pvb4"/>
     <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="635,93" size="36,37" group="n11_pvb4">
@@ -19,7 +19,15 @@
     <component id="n8_pvb4" name="btnGet" src="wm603x" fileName="components/Button111.xml" xy="375,819" group="n11_pvb4">
       <Button title="一键领取"/>
     </component>
-    <list id="n9_pvb4" name="list" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+    <list id="n12_pvb4" name="listGet" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n9_pvb4" name="listBuy" xy="167,245" size="779,493" group="n11_pvb4" overflow="scroll" defaultItem="ui://tw70qm9dpvb44z" autoClearItems="true">
+      <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/League/LeagueJoinUI.xml

@@ -9,7 +9,7 @@
     </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">
+    <component id="n1_u2u3" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n16_a0cf">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <text id="n2_u2u3" name="txtSearch" xy="133,201" size="509,42" group="n16_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fffcf7" autoSize="none" text="" input="true" prompt="[color=#E1D7CA]输入雅集名字，支持模糊搜索[/color]" maxLength="7"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="普通成员"/>
     <remark page="1" value="会长、副会长"/>
   </controller>
@@ -8,7 +8,7 @@
     <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="9xlo8" fileName="components/BtnBack.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"/>
     </component>
     <image id="n26_wm60" name="n26" src="wm6039" fileName="images/lm_db_chang_2.png" xy="0,152">

FGUIProject/assets/League/LeagueUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="204,315"/>
-    <component id="n1_u2u3" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_u2u3" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37">

FGUIProject/assets/League/components/ListGiftItem.xml → FGUIProject/assets/League/components/ListGiftBuyItem.xml

@@ -13,5 +13,6 @@
     <text id="n15_pvb4" name="txtCount" xy="554,5" pivot="0.5,0" size="193,41" group="n17_pvb4" fontSize="30" text="今日剩余：1/1"/>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="588,104" group="n17_pvb4" controller="c1,1"/>
     <group id="n17_pvb4" name="grpLeader" xy="554,5" size="193,145" advanced="true"/>
+    <text id="n18_pvb4" name="txtTime" xy="143,121" size="40,42" fontSize="30" text=""/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="747,156" overflow="hidden">
+  <displayList>
+    <loader id="n15_pvb4" name="loaIcon" xy="17,51" size="50,50"/>
+    <list id="n13_pvb4" name="listGift" xy="116,1" size="656,251" layout="row" defaultItem="ui://eg2y0ldpj48o98" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/League/package.xml

@@ -123,7 +123,7 @@
     <image id="o9gh4u" name="lm_kuang_qifu.png" path="/images/"/>
     <image id="o9gh4v" name="tb_up.png" path="/images/"/>
     <component id="o9gh4x" name="ComConstruct1.xml" path="/components/"/>
-    <component id="pvb44z" name="ListGiftItem.xml" path="/components/"/>
+    <component id="pvb44z" name="ListGiftBuyItem.xml" path="/components/"/>
     <component id="pvb450" name="LeagueAnswerRankUI.xml" path="/" exported="true"/>
     <component id="pvb451" name="ListRankItem.xml" path="/components/"/>
     <component id="pvb452" name="LeagueAnswerUI.xml" path="/" exported="true"/>
@@ -140,6 +140,7 @@
     <component id="pvb45d" name="ListSkillItem.xml" path="/components/"/>
     <component id="pvb45f" name="ListSkillLayerItem.xml" path="/components/"/>
     <component id="pvb45h" name="LeagueGiftUI.xml" path="/" exported="true"/>
+    <component id="pvb45i" name="ListGiftGetItem.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

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

@@ -0,0 +1,15 @@
+
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class RuleController
+    {
+        public static void ShowRuleView(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int ruleId = (int)obj.data;
+            ViewManager.Show<RuleView>(ruleId);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftItem.cs.meta → GameClient/Assets/Game/HotUpdate/Controller/RuleController.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 65db3b910fe8be34798254c83f0d7ea5
+guid: ee8f282763b5bb24fa835e29f9d2ca55
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -137,15 +137,15 @@ namespace GFGGame
             }
             if (com.m_btnTagRule.data == null)
             {
-                com.m_btnTagRule.onClick.Add(OnBtnRuleClick);
+                com.m_btnTagRule.onClick.Add(RuleController.ShowRuleView);
+                com.m_btnTagRule.data = 300002;
             }
-            com.m_btnTagRule.data = 300002;
             UI_ComValueInfo.ProxyEnd();
         }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>(300002);
-        }
+        // private void OnBtnRuleClick()
+        // {
+        //     ViewManager.Show<RuleView>(300002);
+        // }
         /// <summary>
         /// 更新战力值
         /// </summary>

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

@@ -96,7 +96,7 @@ namespace GFGGame
             }
             return curCount;
         }
-
+        //输入属性类型，获取联盟技能该属性加成总值
         public int GetAllSkillScore(int scoreType)
         {
             int score = 0;
@@ -106,6 +106,7 @@ namespace GFGGame
             }
             return score;
         }
+        //输入联盟技能类型和属性类型，获取指定技能类型该属性加成值
         public int GetSkillScoreByType(int skillType, int scoreType)
         {
             int score = 0;
@@ -147,5 +148,82 @@ namespace GFGGame
 
             return Math.Round(count / maxCount * 100, 1); ;
         }
+
+        //获取联盟礼包领取数据
+        public List<LeagueGiftGetData> GetGiftGetDatas()
+        {
+            List<LeagueGiftGetData> getDatas = new List<LeagueGiftGetData>();
+            for (int i = 0; i < LeagueWelfareCfgArray.Instance.dataArray.Length; i++)
+            {
+                LeagueWelfareCfg welfareCfg = LeagueWelfareCfgArray.Instance.dataArray[i];
+                bool isBuy = false;
+                bool isGet = false;
+                switch (welfareCfg.type)
+                {
+                    case LeagueWelfareType.Day:
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareDay) == 1;
+                        isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareDay) == 1;
+                        break;
+                    case LeagueWelfareType.Week:
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareWeek) == 1;
+                        isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareWeek) == 1;
+                        break;
+                    case LeagueWelfareType.SuperWeek:
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek) == 1;
+                        isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperWeek) == 1;
+                        break;
+                    case LeagueWelfareType.SuperDay:
+                        isBuy = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperDay) == 1;
+                        isGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.LeagueWelfareSuperDay) == 1;
+                        break;
+                }
+                if (isBuy)
+                {
+                    LeagueGiftGetData giftGetData = new LeagueGiftGetData();
+                    giftGetData.Type = welfareCfg.type;
+                    giftGetData.IsGet = isGet;
+                    giftGetData.GiftCfg = welfareCfg;
+                    getDatas.Add(giftGetData);
+                }
+            }
+            return getDatas;
+        }
+
+        public List<LeagueGiftBuyData> GetGiftBuyDatas()
+        {
+            List<LeagueGiftBuyData> giftBuyDatas = new List<LeagueGiftBuyData>();
+
+            for (int i = 0; i < LeagueWelfareCfgArray.Instance.dataArray.Length; i++)
+            {
+                LeagueWelfareCfg welfareCfg = LeagueWelfareCfgArray.Instance.dataArray[i];
+                int buyCount = 0;
+                long endTime = 0;
+                switch (welfareCfg.type)
+                {
+                    case LeagueWelfareType.Day:
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareDay);
+                        break;
+                    case LeagueWelfareType.Week:
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareWeek);
+                        endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareWeekEndTime);
+                        break;
+                    case LeagueWelfareType.SuperWeek:
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeek);
+                        endTime = GetNumeriValue(LeagueNumericType.LeagueWelfareSuperWeekEndTime);
+                        break;
+                    case LeagueWelfareType.SuperDay:
+                        buyCount = (int)GetNumeriValue(LeagueNumericType.LeagueWelfareSuperDay);
+                        break;
+                }
+                LeagueGiftBuyData giftBuyData = new LeagueGiftBuyData();
+                giftBuyData.Type = welfareCfg.type;
+                giftBuyData.BuyCount = buyCount;
+                giftBuyData.EndTime = endTime;
+                giftBuyData.GiftCfg = welfareCfg;
+                giftBuyDatas.Add(giftBuyData);
+            }
+            return giftBuyDatas;
+
+        }
     }
 }

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

@@ -46,4 +46,18 @@ namespace GFGGame
         public int OldPos;//旧职位 职位变更时需要
         public int NewPos;//新职位 职位变更时需要
     }
+
+    public class LeagueGiftGetData
+    {
+        public int Type;
+        public bool IsGet;
+        public LeagueWelfareCfg GiftCfg;
+    }
+    public class LeagueGiftBuyData
+    {
+        public int Type;
+        public int BuyCount;//已购次数
+        public long EndTime;//结束时间
+        public LeagueWelfareCfg GiftCfg;
+    }
 }

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

@@ -7,7 +7,7 @@ namespace UI.League
     public partial class UI_LeagueAnswerRankUI
     {
         public GComponent target;
-        public GButton m_btnBack;
+        public GButton m_btnClose;
         public GList m_list;
         public UI_ListRankItem m_comMine;
         public const string URL = "ui://tw70qm9dpvb450";
@@ -57,13 +57,13 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
             m_comMine = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("comMine"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnBack = null;
+            m_btnClose = null;
             m_list = null;
             m_comMine.Dispose();
             m_comMine = null;

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

@@ -8,7 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnBack;
+        public GButton m_btnClose;
         public GButton m_btnRule;
         public GTextField m_txtRule;
         public GList m_list;
@@ -60,7 +60,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_txtRule = (GTextField)comp.GetChild("txtRule");
             m_list = (GList)comp.GetChild("list");
@@ -68,7 +68,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnBack = null;
+            m_btnClose = null;
             m_btnRule = null;
             m_txtRule = null;
             m_list = null;

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

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

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_LeagueChangeNoticeUI
     {
         public GComponent target;
+        public GButton m_btnClose;
         public GTextInput m_txtContent;
         public GTextField m_txtCount;
         public GButton m_btnSave;
@@ -57,12 +58,14 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_txtContent = (GTextInput)comp.GetChild("txtContent");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_btnSave = (GButton)comp.GetChild("btnSave");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnClose = null;
             m_txtContent = null;
             m_txtCount = null;
             m_btnSave = null;

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

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

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

@@ -8,10 +8,11 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
-        public GButton m_btnBack;
+        public GButton m_btnClose;
         public GButton m_btnRule;
         public GButton m_btnGet;
-        public GList m_list;
+        public GList m_listGet;
+        public GList m_listBuy;
         public GTextField m_txtTips;
         public const string URL = "ui://tw70qm9dpvb45h";
         public const string PACKAGE_NAME = "League";
@@ -61,19 +62,21 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_list = (GList)comp.GetChild("list");
+            m_listGet = (GList)comp.GetChild("listGet");
+            m_listBuy = (GList)comp.GetChild("listBuy");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_btnBack = null;
+            m_btnClose = null;
             m_btnRule = null;
             m_btnGet = null;
-            m_list = null;
+            m_listGet = null;
+            m_listBuy = null;
             m_txtTips = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,7 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GButton m_btnBack;
         public GTextInput m_txtSearch;
         public GButton m_btnSearch;
         public GButton m_btnCreat;
@@ -62,7 +62,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtSearch = (GTextInput)comp.GetChild("txtSearch");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnCreat = (GButton)comp.GetChild("btnCreat");
@@ -72,7 +72,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnback = null;
+            m_btnBack = null;
             m_txtSearch = null;
             m_btnSearch = null;
             m_btnCreat = null;

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

@@ -9,7 +9,7 @@ namespace UI.League
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GButton m_btnBack;
         public UI_ComLeader m_comChairman;
         public UI_ComLeader m_comCoChairman;
         public GList m_list;
@@ -67,7 +67,7 @@ namespace UI.League
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comChairman = (UI_ComLeader)UI_ComLeader.Create(comp.GetChild("comChairman"));
             m_comCoChairman = (UI_ComLeader)UI_ComLeader.Create(comp.GetChild("comCoChairman"));
             m_list = (GList)comp.GetChild("list");
@@ -81,7 +81,7 @@ namespace UI.League
         {
             m_c1 = null;
             m_loaBg = null;
-            m_btnback = null;
+            m_btnBack = null;
             m_comChairman.Dispose();
             m_comChairman = null;
             m_comCoChairman.Dispose();

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

@@ -8,7 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnback;
+        public GButton m_btnBack;
         public GButton m_btnRule;
         public UI_Button3 m_btnMember;
         public UI_Button3 m_btnConstruct;
@@ -68,7 +68,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnMember = (UI_Button3)UI_Button3.Create(comp.GetChild("btnMember"));
             m_btnConstruct = (UI_Button3)UI_Button3.Create(comp.GetChild("btnConstruct"));
@@ -84,7 +84,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnback = null;
+            m_btnBack = null;
             m_btnRule = null;
             m_btnMember.Dispose();
             m_btnMember = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListGiftBuyItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.League
 {
-    public partial class UI_ListGiftItem
+    public partial class UI_ListGiftBuyItem
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -13,14 +13,15 @@ namespace UI.League
         public GTextField m_txtCount;
         public GComponent m_comCost;
         public GGroup m_grpLeader;
+        public GTextField m_txtTime;
         public const string URL = "ui://tw70qm9dpvb44z";
         public const string PACKAGE_NAME = "League";
-        public const string RES_NAME = "ListGiftItem";
-        private static UI_ListGiftItem _proxy;
+        public const string RES_NAME = "ListGiftBuyItem";
+        private static UI_ListGiftBuyItem _proxy;
 
-        public static UI_ListGiftItem Create(GObject gObject = null)
+        public static UI_ListGiftBuyItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListGiftItem();
+            var ui = new UI_ListGiftBuyItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +30,11 @@ namespace UI.League
             return ui;
         }
 
-        public static UI_ListGiftItem Proxy(GObject gObject = null)
+        public static UI_ListGiftBuyItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListGiftItem();
+                _proxy = new UI_ListGiftBuyItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -66,6 +67,7 @@ namespace UI.League
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_comCost = (GComponent)comp.GetChild("comCost");
             m_grpLeader = (GGroup)comp.GetChild("grpLeader");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.League
             m_txtCount = null;
             m_comCost = null;
             m_grpLeader = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

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

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

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

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

@@ -32,6 +32,12 @@ namespace GFGGame
             return string.Format("{0}秒", time);
         }
 
+        public static int FormattingTime11(long curTime, long endTime)
+        {
+            long time = (endTime / 1000) - (curTime / 1000);
+            int days = (int)Math.Ceiling((decimal)time / TimeUtil.SECOND_PER_DAY);
+            return days;
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -150,6 +156,5 @@ namespace GFGGame
 
             return str;
         }
-
     }
 }

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

@@ -65,7 +65,8 @@ namespace GFGGame
             _ui.m_btnQuickFight.onClick.Add(OnBtnQuickFightClick);
             _ui.m_btnReSelect.onClick.Add(OnBtnReSelectClick);
             _ui.m_btnFight.onClick.Add(OnBtnFightClick);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300001;
             _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
 
             _ui.m_listTarget.itemRenderer = RenderListTargetItem;
@@ -143,10 +144,10 @@ namespace GFGGame
         {
             _ui.m_c2.selectedIndex = 0;
         }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>(300001);
-        }
+        // private void OnBtnRuleClick()
+        // {
+        //     ViewManager.Show<RuleView>(300001);
+        // }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(ArenaView).FullName);

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

@@ -33,7 +33,8 @@ namespace GFGGame
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_btnNoCheck.onClick.Add(OnBtnNoCheckClick);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300006;
             _ui.m_btnClose.onClick.Add(Hide);
 
             _ui.m_list.itemRenderer = RenderListItem;
@@ -62,10 +63,10 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>();
-        }
+        // private void OnBtnRuleClick()
+        // {
+        //     ViewManager.Show<RuleView>();
+        // }
         private void OnBtnNoCheckClick()
         {
             LeagueSproxy.ReqSetLeagueApply(!_ui.m_btnNoCheck.selected).Coroutine();

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

@@ -33,6 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_c1.onChanged.Add(UpdateView);
             _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
             _ui.m_listIcon.itemRenderer = RenderListItem;

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

@@ -32,6 +32,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnSave.onClick.Add(OnBtnSaveClick);
             _ui.m_txtContent.onFocusOut.Add(UpdateView);
         }

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

@@ -34,6 +34,7 @@ namespace GFGGame
 
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnUpLv0.target.onClick.Add(OnBtnUpLvClick);
             _ui.m_btnUpLv0.target.data = LeagueBuildingType.Hall;
             _ui.m_btnUpLv1.target.onClick.Add(OnBtnUpLvClick);
@@ -41,9 +42,10 @@ namespace GFGGame
             _ui.m_btnUpLv2.target.onClick.Add(OnBtnUpLvClick);
             _ui.m_btnUpLv2.target.data = LeagueBuildingType.Store;
             _ui.m_btnClose.onClick.Add(Hide);
-            _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
-
+            _ui.m_btnTips.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnTips.data = 300005;
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300004;
             _leagueDataManager = LeagueDataManager.Instance;
         }
         protected override void AddEventListener()
@@ -70,14 +72,14 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
 
         }
-        private void OnBtnTipsClick()
-        {
-            ViewManager.Show<RuleView>();
-        }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>();
-        }
+        // private void OnBtnTipsClick()
+        // {
+        //     ViewManager.Show<RuleView>();
+        // }
+        // private void OnBtnRuleClick()
+        // {
+        //     ViewManager.Show<RuleView>();
+        // }
         private void OnBtnUpLvClick(EventContext context)
         {
             int type = (int)(context.sender as GObject).data;

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

@@ -32,7 +32,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnBack.onClick.Add(Hide);
+            _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_btnCreat.onClick.Add(OnBtnCreatClick);
             _ui.m_listIcon.itemRenderer = RenderListItem;
 

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

@@ -0,0 +1,171 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using ET;
+using FairyGUI;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //联盟礼包
+    public class LeagueGiftView : BaseWindow
+    {
+        private UI_LeagueGiftUI _ui;
+        private List<LeagueGiftGetData> _getDatas;
+        private List<LeagueGiftBuyData> _buyDatas;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueGiftUI.PACKAGE_NAME;
+            _ui = UI_LeagueGiftUI.Create();
+
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnClose.onClick.Add(Hide);
+            _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300003;
+            _ui.m_listBuy.itemRenderer = RenderListBuyItem;
+            _ui.m_listGet.itemRenderer = RenderListGetItem;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBuyList);
+            EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBuyList);
+            EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
+        }
+
+        private void OnBtnCreatClick()
+        {
+
+        }
+        private void UpdateView()
+        {
+            UpdateGetList();
+            UpdateBuyList();
+        }
+        private void UpdateGetList()
+        {
+            _getDatas = LeagueDataManager.Instance.GetGiftGetDatas();
+            _ui.m_listGet.numItems = _getDatas.Count;
+            _ui.m_txtTips.visible = _getDatas.Count == 0;
+        }
+        private void UpdateBuyList()
+        {
+            _buyDatas = LeagueDataManager.Instance.GetGiftBuyDatas();
+            _ui.m_listBuy.numItems = _buyDatas.Count;
+        }
+        private void RenderListGetItem(int index, GObject obj)
+        {
+            UI_ListGiftGetItem item = UI_ListGiftGetItem.Proxy(obj);
+            if (item.m_listGift.data == null)
+            {
+                item.m_listGift.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
+            item.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
+            UI_ListGiftGetItem.ProxyEnd();
+        }
+        private void RenderListBuyItem(int index, GObject obj)
+        {
+            UI_ListGiftBuyItem item = UI_ListGiftBuyItem.Proxy(obj);
+            LeagueGiftBuyData buyData = _buyDatas[index];
+            string strCount = buyData.GiftCfg.limitType == 1 ? "今日剩余：{0}/{1}" : "本周剩余：{0}/{1}";
+            item.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
+            int day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
+            item.m_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("（剩余{0}天）", day);
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, buyData.GiftCfg.consumeArr[0]);
+
+            if (item.m_listGift.data == null)
+            {
+                item.m_listGift.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
+            item.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
+
+            if (item.m_btnBuy.data == null)
+            {
+                item.m_btnBuy.onClick.Add(OnBtnBuyClick);
+            }
+            item.m_btnBuy.data = buyData;
+
+            UI_ListGiftBuyItem.ProxyEnd();
+        }
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            int[][] reward = (int[][])obj.parent.data;
+            ItemData itemData = ItemUtil.createItemData(reward[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetTxtCountPos(185, 155);
+        }
+
+        private void OnBtnBuyClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            LeagueGiftBuyData buyData = obj.data as LeagueGiftBuyData;
+
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            bool isLeader = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
+            if (isLeader!)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("权限不足");
+                return;
+            }
+            int needNum = buyData.GiftCfg.consumeArr[0][1];
+            int hasNum = (int)ItemDataManager.GetItemNum(buyData.GiftCfg.consumeArr[0][0]);
+            if (hasNum < needNum)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                return;
+            }
+            if (buyData.BuyCount == buyData.GiftCfg.limit)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("购买次数不足");
+                return;
+            }
+            LeagueSproxy.ReqBuyLeagueWelfare(buyData.GiftCfg.type).Coroutine();
+
+        }
+        private void OnBtnGetClick()
+        {
+            // LeagueSproxy.ReqGetLeagueWelfare().Coroutine();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs.meta

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

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

@@ -32,7 +32,7 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
 
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnSearch.onClick.Add(OnBtnSearchClick);
             _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
             _ui.m_btnCreat.onClick.Add(OnBtnCreatClick);

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

@@ -34,7 +34,8 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnClose.onClick.Add(Hide);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300007;
             _ui.m_btnKick.onClick.Add(OnBtnKickClick);
             _ui.m_btnAppoint0.target.onClick.Add(OnBtnAppointClick);
             _ui.m_btnAppoint0.target.data = LeaguePos.Owner;
@@ -71,10 +72,6 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateView);
 
         }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>();
-        }
         private void OnBtnKickClick()
         {
             AlertUI.Show("是否确认请离这个小伙伴?")

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

@@ -30,7 +30,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnRecruit.target.onClick.Add(OnBtnRecruitClick);
             _ui.m_btnApplyList.onClick.Add(OnBtnApplyListClick);
             _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);

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

@@ -29,13 +29,13 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnMember.target.onClick.Add(OnBtnMemberClick);
             _ui.m_btnConstruct.target.onClick.Add(OnBtnConstructClick);
             _ui.m_comLeagueHead.target.onClick.Add(OnComLeagueHeadClick);
             _ui.m_btnChangeNotice.onClick.Add(OnBtnChangeNoticeClick);
             _ui.m_btnPray.target.onClick.Add(OnBtnPrayClick);
-            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            // _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
         }
         protected override void AddEventListener()
         {
@@ -88,10 +88,10 @@ namespace GFGGame
         {
             ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
-        private void OnBtnRuleClick()
-        {
-            ViewManager.Show<RuleView>();
-        }
+        // private void OnBtnRuleClick()
+        // {
+        //     ViewManager.Show<RuleView>();
+        // }
         private void UpdateView()
         {
             UpdateInfo();

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

@@ -44,7 +44,6 @@ namespace GFGGame
             base.OnShown();
             com.height = _ui.target.height;
 
-
         }
 
         protected override void OnHide()