未解锁礼包可展示

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1250" opaque="false">
   <displayList>
-    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1250">
+    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,145" size="1080,960">
       <relation target="n33_l500" sidePair="height-height"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,192" size="575,230" group="n12_si5z"/>
-    <text id="n6_si5z" name="txtOwned" xy="840,146" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <text id="n11_si5z" name="txtDesc" xy="439,214" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="64,124" size="346,336" group="n55_ofwu" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="117,193" size="44,94" group="n55_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="238,291" pivot="0.5,0.5" anchor="true" size="200,200" group="n55_ofwu" aspect="true" align="center" vAlign="middle" fill="scaleMatchHeight"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="315,349" pivot="1,0" size="56,49" group="n55_ofwu" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
-    <group id="n55_ofwu" name="n55" xy="64,124" size="346,336" group="n12_si5z"/>
-    <group id="n12_si5z" name="n12" xy="64,124" size="914,336" group="n33_l500" advanced="true"/>
-    <image id="n45_ofwu" name="n45" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="142,480" size="50,50" group="n53_ofwu"/>
-    <image id="n46_ofwu" name="n46" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="367,480" size="50,50" group="n53_ofwu"/>
-    <image id="n47_ofwu" name="n47" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="592,480" size="50,50" group="n53_ofwu"/>
-    <image id="n48_ofwu" name="n48" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="817,480" size="50,50" group="n53_ofwu"/>
-    <text id="n49_ofwu" name="txtGong" xy="202,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n50_ofwu" name="txtShang" xy="427,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n51_ofwu" name="txtJue" xy="652,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <text id="n52_ofwu" name="txtZhi" xy="877,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
-    <group id="n53_ofwu" name="grpScore" xy="142,480" size="796,50" group="n33_l500" advanced="true"/>
-    <list id="n54_ofwu" name="listTag" xy="138,550" size="377,41" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,337" size="575,230" group="n12_si5z"/>
+    <text id="n6_si5z" name="txtOwned" xy="840,291" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n11_si5z" name="txtDesc" xy="439,359" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="64,269" size="346,336" group="n55_ofwu" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="117,338" size="44,94" group="n55_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="238,436" pivot="0.5,0.5" anchor="true" size="200,200" group="n55_ofwu" aspect="true" align="center" vAlign="middle" fill="scaleMatchHeight"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="315,494" pivot="1,0" size="56,49" group="n55_ofwu" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <group id="n55_ofwu" name="n55" xy="64,269" size="346,336" group="n12_si5z"/>
+    <group id="n12_si5z" name="n12" xy="64,269" size="914,336" group="n33_l500" advanced="true"/>
+    <image id="n45_ofwu" name="n45" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="142,625" size="50,50" group="n53_ofwu"/>
+    <image id="n46_ofwu" name="n46" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="367,625" size="50,50" group="n53_ofwu"/>
+    <image id="n47_ofwu" name="n47" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="592,625" size="50,50" group="n53_ofwu"/>
+    <image id="n48_ofwu" name="n48" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="817,625" size="50,50" group="n53_ofwu"/>
+    <text id="n49_ofwu" name="txtGong" xy="202,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n50_ofwu" name="txtShang" xy="427,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n51_ofwu" name="txtJue" xy="652,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n52_ofwu" name="txtZhi" xy="877,629" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n53_ofwu" name="grpScore" xy="142,625" size="796,50" group="n33_l500" advanced="true"/>
+    <list id="n54_ofwu" name="listTag" xy="138,695" size="377,41" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n32_l500" name="listItem" xy="127,611" pivot="0.5,0" size="841,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <list id="n32_l500" name="listItem" xy="127,756" pivot="0.5,0" size="841,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -36,33 +36,36 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,788" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="435,780" pivot="0.5,0" size="210,47" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
-    <graph id="n44_ofwu" name="n44" xy="530,762" size="20,20" group="n4_si5z"/>
-    <group id="n4_si5z" name="n4" xy="176,762" size="727,67" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,857" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,855" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,933" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="435,925" pivot="0.5,0" size="210,47" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
+    <graph id="n44_ofwu" name="n44" xy="530,907" size="20,20" group="n4_si5z"/>
+    <group id="n4_si5z" name="n4" xy="176,907" size="727,67" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,1002" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,1000" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,856" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,854" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,1001" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,999" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="402,862" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="234,854" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="377,944" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,1024" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="509,1026" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="376,944" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,1093" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="402,1007" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="234,999" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="377,1089" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,1169" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="509,1171" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="376,1089" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,1238" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,1093" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,1238" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="183,1093" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="176,762" size="727,420" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="64,124" size="914,1058" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
+    <group id="n20_si5z" name="bgpBtn" xy="183,1238" size="714,89" group="n34_l500" advanced="true"/>
+    <group id="n34_l500" name="grpBtn" xy="176,907" size="727,420" group="n33_l500" visible="false" advanced="true"/>
+    <image id="n60_ozul" name="n60" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" xy="217,936" size="645,71" group="n63_ozul"/>
+    <text id="n59_ozul" name="txtLock" xy="548,907" pivot="0.5,0" anchor="true" size="594,130" group="n63_ozul" fontSize="36" color="#b08d5c" align="center" vAlign="middle" leading="-5" letterSpacing="-2" autoSize="none" text="飞花令段位达到巴拉巴拉解锁"/>
+    <group id="n63_ozul" name="grpLock" xy="217,907" size="645,130" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="64,269" size="914,768" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="n37_qdaz" sidePair="top-top"/>
     </group>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -375,6 +375,8 @@
     <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
     <image id="o4m7tog" name="home.png" path="/imagesNew/"/>
     <image id="volstbs" name="zx_jindu_bg.png" path="/imagesNew/" exported="true"/>
+    <image id="ozultoh" name="sc_yk_zz.png" path="/imagesNew/"/>
+    <image id="ozultoi" name="sc_yk_jsdb.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -131,11 +131,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
                 return;
             }
-            if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
-            {
-                PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
-                return;
-            }
+            // if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
+            // {
+            //     PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
+            //     return;
+            // }
 
             if (cfg.costType == CostType.FREE)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs

@@ -30,6 +30,10 @@ namespace UI.CommonGame
         public GTextField m_txtRmbCost;
         public GButton m_btnCancle;
         public GButton m_btnConfirm;
+        public GGroup m_bgpBtn;
+        public GGroup m_grpBtn;
+        public GTextField m_txtLock;
+        public GGroup m_grpLock;
         public const string URL = "ui://eg2y0ldps5s9tik";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ItemExchangeUI";
@@ -100,6 +104,10 @@ namespace UI.CommonGame
             m_txtRmbCost = (GTextField)comp.GetChild("txtRmbCost");
             m_btnCancle = (GButton)comp.GetChild("btnCancle");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_bgpBtn = (GGroup)comp.GetChild("bgpBtn");
+            m_grpBtn = (GGroup)comp.GetChild("grpBtn");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -131,6 +139,10 @@ namespace UI.CommonGame
             m_txtRmbCost = null;
             m_btnCancle = null;
             m_btnConfirm = null;
+            m_bgpBtn = null;
+            m_grpBtn = null;
+            m_txtLock = null;
+            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -106,6 +106,13 @@ namespace GFGGame
             }
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemsArr.Length > 0;
+            bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(_shopCfg.id);
+            _ui.m_grpBtn.visible = isUnLock;
+            _ui.m_grpLock.visible = !isUnLock;
+            if (!isUnLock)
+            {
+                _ui.m_txtLock.text = ShopDataManager.Instance.GetShopGoodsStateTips(_shopCfg.id);
+            }
         }
         private void RenderListTagItem(int index, GObject obj)
         {