搭配赛补充提交

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -735,7 +735,7 @@ namespace GFGGame
                 {
                     _ui.m_btnGiftBag1.m_txtTime.text =
                         TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                    _ui.m_btnGiftBag1.target.visible = true;
+                    _ui.m_btnGiftBag1.target.visible = false;
                 }
             }
 
@@ -838,7 +838,7 @@ namespace GFGGame
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             _ui.m_btnPearRebate.target.visible = ActivityDataManager.Instance.CheckPearRebateTips(6000);
 
-            _ui.m_btnGiftBag1.target.visible = ActivityDataManager.Instance.CheckPearRebateTips(6002);
+            _ui.m_btnGiftBag1.target.visible = false;//ActivityDataManager.Instance.CheckPearRebateTips(6002);
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(6002);
             long endTime = 0;
             if (activityInfo != null)
@@ -1518,9 +1518,13 @@ namespace GFGGame
             //直购648弹窗
             if (GameGlobal.AutoZGTHTips)
             {
+                if(TimeHelper.ServerNow() > 1724637600000)
+                {
+                    return;
+                }
                 GameGlobal.AutoZGTHTips = false;
                 long tips;
-                if(!ActivityDataManager.Instance.TipsStatusDic.TryGetValue(6002, out tips))
+                if (!ActivityDataManager.Instance.TipsStatusDic.TryGetValue(6002, out tips))
                 {
                     if (ActivityDataManager.Instance.CheckPearRebateTips(6002))
                     {
@@ -1538,6 +1542,10 @@ namespace GFGGame
             //直购特惠弹窗
             if (GameGlobal.AutoZGTHDCTips)
             {
+                if (TimeHelper.ServerNow() > 1724637600000)
+                {
+                    return;
+                }
                 GameGlobal.AutoZGTHDCTips = false;
                 long tips;
                 if (!ActivityDataManager.Instance.TipsStatusDic.TryGetValue(6001, out tips))

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionUpLoadView.cs

@@ -15,7 +15,6 @@ namespace GFGGame
         private GameObject _sceneObject;
         private float countTimeSpeed = 0.001f;
         private bool isCountTime = false;
-        private bool result = false;
         public override void Dispose()
         {
             if (_sceneObject != null)
@@ -50,7 +49,7 @@ namespace GFGGame
             _ui.m_beforeWork.onClick.Add(OnClickBtnBeforeWorks);
             _ui.m_ruleBtn.onClick.Add(MatchingCompetitionDataManager.Instance.OnClickBtnRule);
         }
-        protected async override void OnShown()
+        protected override void OnShown()
         {
             base.OnShown();
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
@@ -63,7 +62,7 @@ namespace GFGGame
             Timers.inst.AddUpdate(UpdateTime);
             Timers.inst.AddUpdate(CheckGuide);
             //临时处理，后续下载做好了替换
-            result = await MatchingCompetitionSproxy.ReqCurrentRank();
+            //result = await MatchingCompetitionSproxy.ReqCurrentRank();
         }
 
         protected override void OnHide()
@@ -265,7 +264,7 @@ namespace GFGGame
         }
         private async void OnClickBtnRank()
         {
-            //bool result = await MatchingCompetitionSproxy.ReqCurrentRank();
+            bool result = await MatchingCompetitionSproxy.ReqCurrentRank();
             if(result)
             {
                 ViewManager.Show<MatchingCompetitionRankView>();

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

@@ -213,6 +213,13 @@ namespace GFGGame
                         item.visible = true;
                     }
                 }
+                else if (_storeTabCfgs[index][2] == "StoreZGDCView")
+                {
+                    if (TimeHelper.ServerNow() > 1724637600000)
+                    {
+                        item.visible = false;
+                    }
+                }
                 else
                 {
                     item.visible = true;