zhaoyang 2 年之前
父節點
當前提交
f306be82e3

+ 2 - 2
FGUIProject/assets/Store/components/ListShopItem.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="可购买"/>
     <remark page="1" value="已售罄"/>
   </controller>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="1">
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
     <remark page="0" value="未解锁"/>
     <remark page="1" value="已解锁"/>
   </controller>
@@ -14,7 +14,7 @@
     <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
     <text id="n49_l500" name="txtDesc" xy="205,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
     <text id="n50_l500" name="n50" xy="254,314" size="19,31" group="n51_l500" fontSize="22" color="#ffffff" letterSpacing="-2" text="%"/>
-    <group id="n51_l500" name="n51" xy="205,301" size="68,52" group="n26_10not" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
+    <group id="n51_l500" name="n51" xy="205,301" size="68,51" group="n26_10not" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <group id="n26_10not" name="grpDiscount" xy="191,263" size="100,96" advanced="true"/>

+ 9 - 9
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -134,16 +134,16 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetRechargeGiftFreeRed()
         {
-            List<GiftBagCfg> _giftCfgs = ShopDataManager.Instance.GetGiftBagCfgs();
-            for (int i = 0; i < _giftCfgs.Count; i++)
-            {
-                GiftBagCfg cfg = _giftCfgs[i];
-                bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(cfg.id);
-                int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
-                bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
-                if (isUnLock && canBuy && cfg.price == 0) return true;
+            // List<GiftBagCfg> _giftCfgs = ShopDataManager.Instance.GetGiftBagCfgs();
+            // for (int i = 0; i < _giftCfgs.Count; i++)
+            // {
+            //     GiftBagCfg cfg = _giftCfgs[i];
+            //     bool isUnLock = ShopDataManager.Instance.GetShopGoodsStateById(cfg.id);
+            //     int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id);
+            //     bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
+            //     if (isUnLock && canBuy && cfg.price == 0) return true;
 
-            }
+            // }
             return false;
         }
         /// <summary>

二進制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


二進制
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes