商城 天市恒商城关闭问题

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

@@ -351,9 +351,9 @@ namespace GFGGame
         /// <summary>
         /// 返回活动商城是否显示
         /// /// </summary>
-        public bool GetShopActivityIsShow()
+        public bool GetShopActivityIsShow(int menuType)
         {
-            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menuType);
             if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
                 return false;
             else

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

@@ -75,7 +75,7 @@ namespace GFGGame
             _ui.m_comTab.target.scrollPane.SetPercX((float)(_curTabIndex - 1) / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
 
             _curSubTabIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
-            if (_curTabIndex == ConstStoreTabId.STORE_GIFT_BAG && _curSubTabIndex > 0 && !ShopDataManager.Instance.GetShopActivityIsShow()) {
+            if (_curTabIndex == ConstStoreTabId.STORE_GIFT_BAG && _curSubTabIndex > 0 && !ShopDataManager.Instance.GetShopActivityIsShow(_curSubTabIndex)) {
                 _curSubTabIndex -= 1;
             }
             if (_ui.m_listSubTab.numItems > _curSubTabIndex)
@@ -135,9 +135,9 @@ namespace GFGGame
                     for (int i = 0; i < tabCfg.subTabArr.Length; i++)
                     {
                         int menu2 = int.Parse(tabCfg.subTabArr[i][1]);
-                        if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
+                        if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY || menu2 == ConstStoreSubId.STORE_GIFT_BAG_TSY)
                         {
-                            if (!ShopDataManager.Instance.GetShopActivityIsShow()) continue;
+                            if (!ShopDataManager.Instance.GetShopActivityIsShow(menu2)) continue;
                         }
                         _storeTabCfgs.Add(tabCfg.subTabArr[i]);
                     }