Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -230,19 +230,20 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("需通关{0}关卡解锁", cfg.name));
                 return;
             }
-            if (_viewData == StudioDataManager.Instance.GetLuckyBoxActivityID())
-            {
-                int _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-                ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-                long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-                long curTime = TimeHelper.ServerNow();
-                if (endTime < curTime) return;
-                ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
-            }
-            else
-            {
-                ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
-            }
+            ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
+            //if (_viewData == StudioDataManager.Instance.GetLuckyBoxActivityID())
+            //{
+            //    int _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            //    ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            //    long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            //    long curTime = TimeHelper.ServerNow();
+            //    if (endTime < curTime) return;
+            //    ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
+            //}
+            //else
+            //{
+            //    ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
+            //}
         }
         private void UpdateRedDot()
         {