雅集福利加锁

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -43,9 +43,7 @@
     <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
       <Button title="雅集信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">
-      <Button title="退出雅集"/>
-    </component>
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="771,1562" group="n25_rv09"/>
     <group id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,8 +4,8 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-     <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
-      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/> 
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="126,588" group="n22_9jv6">
+      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
     <list id="n13_pvb4" name="listGift" xy="-113,485" pivot="0.5,0" size="601,132" group="n22_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
@@ -17,5 +17,9 @@
     <text id="n18_pvb4" name="txtTime" xy="258,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
     <loader id="n21_9jv6" name="loaType" xy="19,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
     <group id="n22_9jv6" name="n22" xy="-113,0" size="601,801"/>
+    <image id="n24_l500" name="n24" src="l5007z" fileName="images/yj_zz.png" xy="2,362" group="n26_l500"/>
+    <text id="n25_l500" name="txtLock" xy="35,367" pivot="0.5,0" size="305,39" group="n26_l500" fontSize="28" color="#fffdf9" text="宴客厅等级达到X级解锁"/>
+    <image id="n23_l500" name="n23" src="l5007y" fileName="images/yj_db_zz.png" xy="-1,35" group="n26_l500"/>
+    <group id="n26_l500" name="grpLock" xy="-1,35" size="377,770" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -195,9 +195,11 @@
     <image id="miy37q" name="ch_jn_db.png" path="/images/"/>
     <image id="miy37r" name="card_sz_db.png" path="/images/" scale="9grid" scale9grid="12,7,24,14"/>
     <image id="miy37s" name="lm_ch_jdk.png" path="/images/"/>
-    <image id="miy37u" name="dikuang_sx.png" path="/imagesNew/"/>
     <component id="miy37v" name="ListSkillScore.xml" path="/"/>
     <component id="miy37w" name="Button124.xml" path="/"/>
+    <image id="l5007x" name="tb_suo_gold.png" path="/images/"/>
+    <image id="l5007y" name="yj_db_zz.png" path="/images/"/>
+    <image id="l5007z" name="yj_zz.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -17,6 +17,9 @@
     <group id="n51_l500" name="n51" xy="8,32" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
+    <image id="n59_l500" name="n59" src="l500tbu" fileName="imagesNew/sc_yk_zz2.png" xy="0,-1" group="n26_10not">
+      <gearDisplay controller="c2" pages=""/>
+    </image>
     <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
     <text id="n27_10not" name="txtName" xy="248,14" pivot="0.5,0" anchor="true" size="261,44" fontSize="32" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="稀有升星材料(自选)"/>
@@ -28,12 +31,12 @@
     <text id="n58_l500" name="n58" xy="268,176" pivot="0.5,0" size="124,54" fontSize="40" color="#5a3e16" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <image id="n54_l500" name="n54" src="l500tbt" fileName="imagesNew/sc_yk_zz.png" xy="5,-2" group="n57_l500"/>
+    <image id="n54_l500" name="n54" src="l500tbt" fileName="imagesNew/sc_yk_zz.png" xy="13,0" group="n57_l500"/>
     <image id="n55_l500" name="n55" src="l500tbs" fileName="imagesNew/sc_yk_jsdb.png" xy="32,62" group="n57_l500"/>
     <text id="n56_l500" name="txtLock" xy="238,101" pivot="0.5,0" anchor="true" size="210,67" group="n57_l500" fontSize="28" color="#fffdf9" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <group id="n57_l500" name="n57" xy="5,-2" size="449,272" advanced="true">
+    <group id="n57_l500" name="n57" xy="13,0" size="439,270" advanced="true">
       <gearDisplay controller="c2" pages="0"/>
     </group>
   </displayList>

FGUIProject/assets/Store/package.xml

@@ -139,6 +139,7 @@
     <image id="l500tbr" name="sc_lb_zz.png" path="/imagesNew/"/>
     <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
+    <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -16,7 +16,7 @@ namespace UI.League
         public UI_Button14 m_btnRecruit;
         public GButton m_btnApplyList;
         public GButton m_btnMemberLog;
-        public GComponent m_btnExit;
+        public GButton m_btnExit;
         public GButton m_btnExit1;
         public const string URL = "ui://tw70qm9du2u35";
         public const string PACKAGE_NAME = "League";
@@ -74,7 +74,7 @@ namespace UI.League
             m_btnRecruit = (UI_Button14)UI_Button14.Create(comp.GetChild("btnRecruit"));
             m_btnApplyList = (GButton)comp.GetChild("btnApplyList");
             m_btnMemberLog = (GButton)comp.GetChild("btnMemberLog");
-            m_btnExit = (GComponent)comp.GetChild("btnExit");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnExit1 = (GButton)comp.GetChild("btnExit1");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -14,6 +14,8 @@ namespace UI.League
         public GList m_listGift;
         public GTextField m_txtTime;
         public GLoader m_loaType;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://tw70qm9d9jv678";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListGiftButItem";
@@ -68,6 +70,8 @@ namespace UI.League
             m_listGift = (GList)comp.GetChild("listGift");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_loaType = (GLoader)comp.GetChild("loaType");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.League
             m_listGift = null;
             m_txtTime = null;
             m_loaType = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
 using UI.League;
-using UnityEngine;
+
 
 namespace GFGGame
 {
@@ -119,11 +118,11 @@ namespace GFGGame
             string strCount = buyData.GiftCfg.limitType == 1 ? "今日剩余：{0}/{1}" : "本周剩余：{0}/{1}";
             item.m_comItem.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
             long day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
-            // long day = buyData.EndTime / TimeUtil.SECOND_PER_DAY / 1000;// TimeUtil.FormattingTime11(TimeHelper.ServerNow(), TimeHelper.ServerNow() + buyData.EndTime);
-            // item.m_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("（剩余{0}天）", day);
             item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _buyDatas[index].GiftCfg.type);
             item.m_comItem.m_txtTime.visible = buyData.EndTime != 0;
             item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(day.ToString(), "#E45E29"));
+            item.m_comItem.m_grpLock.visible = LeagueDataManager.Instance.HallLevel < buyData.GiftCfg.level;
+            item.m_comItem.m_txtLock.text = string.Format("宴客厅等级达到{0}级解锁", buyData.GiftCfg.level);
             ItemUtil.UpdateItemNeedNum(item.m_comItem.m_comCost, buyData.GiftCfg.consumeArr[0]);
 
             if (item.m_comItem.m_listGift.data == null)