移除限时活动

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

@@ -15,7 +15,14 @@ namespace ET
                 EndTime = message.EndTime
             };
             info.EndTime = info.ActivityId == 501 ? 1689703200000 : info.EndTime;//临时屏蔽一个限时活动，测试结束后要删掉
-            ActivityGlobalDataManager.Instance.AddActivityInfo(info);
+            if (info.ActivityId == 501 && (TimeHelper.ServerNow() < info.StartTime || TimeHelper.ServerNow() > info.EndTime))
+            {
+                ActivityGlobalDataManager.Instance.RemoveActivityInfo(info.ActivityId);
+            }
+            else
+            {
+                ActivityGlobalDataManager.Instance.AddActivityInfo(info);
+            }
             await ETTask.CompletedTask;
         }
     }
@@ -66,7 +73,14 @@ namespace GFGGame
                     GetRewards = activityInfo.GetRewards,
                     CountValue = activityInfo.CountValue
                 };
+
                 info.EndTime = info.ActivityId == 501 ? 1689703200000 : info.EndTime;//临时屏蔽一个限时活动，测试结束后要删掉
+
+                if (info.ActivityId == 501 && (TimeHelper.ServerNow() < info.StartTime || TimeHelper.ServerNow() > info.EndTime))
+                {
+                    ActivityGlobalDataManager.Instance.RemoveActivityInfo(info.ActivityId);
+                    return;
+                }
                 ActivityGlobalDataManager.Instance.AddActivityInfo(info);
             });
         }

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

@@ -268,21 +268,6 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            // string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
-            // string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
-            // for (int i = 0; i < _btns.Length; i++)
-            // {
-            //     GameObject gameObject0;
-            //     GoWrapper wrapper0;
-            //     GameObject gameObject1;
-            //     GoWrapper wrapper1;
-            //     SceneController.AddObjectToView(null, null, _btns[i].m_holder, resPath0, out gameObject0, out wrapper0);
-            //     SceneController.AddObjectToView(null, null, _btns[i].m_holder1, resPath3, out gameObject1, out wrapper1);
-            //     _effects.Add(gameObject0);
-            //     _wrappers.Add(wrapper0);
-            //     _effects1.Add(gameObject1);
-            //     _wrappers1.Add(wrapper1);
-            // }
 
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl_d");
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl");
@@ -290,12 +275,7 @@ namespace GFGGame
             SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_jt");
-            // SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,out _wrapper6);
             SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7, out _wrapper7);
-
-
-            // string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
-            // SceneController.AddObjectToView(_effectObj5, _wrapper5, _ui.m_headBar.m_holder, resPath2, out _effectObj5, out _wrapper5);
         }
 
         private void SetPos()
@@ -819,7 +799,7 @@ namespace GFGGame
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
                 _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_tb_" + activityOpenCfg.res;
                 long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
-                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                _ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
 
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
@@ -840,7 +820,7 @@ namespace GFGGame
             if (_ui.m_btnActivityDay7.target.visible)
             {
                 long time = ActivityDay7DataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
-                _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                _ui.m_btnActivityDay7.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
 
             }
 
@@ -915,7 +895,13 @@ namespace GFGGame
             for (int i = 0; i < AdCfgArray.Instance.dataArray.Length; i++)
             {
                 AdCfg adCfg = AdCfgArray.Instance.dataArray[i];
-                if (adCfg.activityId > 0 && ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                if (adCfg.activityId > 0)
+                {
+                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                }
+
                 if (!string.IsNullOrEmpty(adCfg.startTime) && !string.IsNullOrEmpty(adCfg.endTime))
                 {
                     long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);