商店

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

@@ -111,7 +111,7 @@ namespace GFGGame
             UI_ListShopItem.ProxyEnd();
         }
 
-        private async void OnBtnBugItem(EventContext context)
+        private void OnBtnBugItem(EventContext context)
         {
             ShopCfg cfg = (context.sender as GObject).data as ShopCfg;
             bool isSellOut = cfg.maxBuyNum > 0 && cfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id) <= 0;
@@ -120,6 +120,12 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
                 return;
             }
+            if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
+                return;
+            }
+
             if (cfg.costType == CostType.RMB)
             {
                 if (!AntiAddictionController.CheckAntiAddictionRecharge(cfg.price))

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -39,7 +39,7 @@ namespace GFGGame
                     }
 
                     List<ItemData> itemDatas;
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG)
+                    if (itemCfg.itemType == ConstItemType.GIFT_BAG && itemCfg.subType == ConstItemSubType.GIFT_BAG_AUTO)
                     {
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
                     }