返利商城增加红点

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

@@ -596,7 +596,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()
@@ -627,6 +627,19 @@ namespace GFGGame
             }
             return false;
         }
+
+        //商店-礼包-返利商城
+        public bool GetGiftBagRebateRed()
+        {
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_REBATE);
+            foreach (var info in shopCfgs) {
+                var weekGiftBoxState = EnduringGiftBoxDataManager.Instance.DayIsRebateGiftBox(info.itemId);
+                if (weekGiftBoxState)
+                    return true;
+            }
+            return false;
+        }
+
         /// <summary>
         /// 商城-月卡-灵犀卡
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -449,6 +449,7 @@ namespace GFGGame
                 _equipDistance.Add(memoryHitGameObj, distance);
             }
         }
+
         private void OnTouchBtnSizeMove(EventContext context)
         {
             if (memoryHitGameObj == null) return;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -345,7 +345,7 @@ namespace GFGGame
 
         private void OnClikcBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_TSY });
+            //ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_TSY });
         }
 
         //刷新摘星活动期间的数据

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

@@ -135,7 +135,7 @@ 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 || menu2 == ConstStoreSubId.STORE_GIFT_BAG_TSY)
+                        if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
                         {
                             if (!ShopDataManager.Instance.GetShopActivityIsShow(menu2)) continue;
                         }
@@ -226,7 +226,7 @@ namespace GFGGame
 
             UpdateStoreMonthRedDot();
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagRewardRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagRewardRed());