Browse Source

开服活动跨天临界值修改

huangxiaoyue 1 year ago
parent
commit
81c8434ab0

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -107,14 +107,17 @@ namespace GFGGame
             if(activityOpenCfg.params2Arr.Length > 0)
             if(activityOpenCfg.params2Arr.Length > 0)
                 GetWishingPoolInfo(activityId);
                 GetWishingPoolInfo(activityId);
         }
         }
+
         private void UpdateTime(object param = null)
         private void UpdateTime(object param = null)
         {
         {
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime)
+            if (endTime < curTime + 1)
             {
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 Timers.inst.Remove(UpdateTime);
                 Timers.inst.Remove(UpdateTime);
+                ViewManager.DeleteViewStackCountDown(null, 2);
+                ViewManager.Hide<LuckyBoxWishView>();
                 OnClickBtnBack();
                 OnClickBtnBack();
                 return;
                 return;
             }
             }

+ 7 - 1
GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -87,7 +87,6 @@ namespace GFGGame
             Timers.inst.Remove(ShowEffTime);
             Timers.inst.Remove(ShowEffTime);
         }
         }
 
 
-
         protected override void AddEventListener()
         protected override void AddEventListener()
         {
         {
             base.AddEventListener();
             base.AddEventListener();
@@ -117,6 +116,13 @@ namespace GFGGame
         {
         {
             int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
             int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
+            if (actLimitId <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                Timers.inst.Remove(UpdateTime);
+                OnClickBtnBack();
+                return;
+            }
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
             string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
             string[] str = strTime.Split(':');
             string[] str = strTime.Split(':');