Merge remote-tracking branch 'remotes/origin/master' into douYouTap

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -266,12 +266,18 @@ namespace GFGGame
             }
 
             long curTime = TimeHelper.ServerNow();
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.BlindBoxType);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10301);
             if (activityInfo != null)
             {
                 long endTime = activityInfo.EndTime;
                 _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
             }
+            else
+            {
+                long endTime = 1733605200000;
+                _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+            
         }
     }
 }