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

GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs

@@ -180,5 +180,10 @@ namespace GFGGame
         }
 
 
+        public bool IsluckyBoxFilingChapter()
+        {
+            return filingChapterId == luckyBoxFilingChapterId;
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -314,7 +314,14 @@ namespace GFGGame
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
             {
-                ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                {
+                    ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.luckyBoxFilingChapterId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                }
+                else
+                {
+                    ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                }
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Field)
             {