新春活动类型修改

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -81,7 +81,7 @@ namespace GFGGame
 
         private void OnClickBtnMergeView()
         {
-            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.NewYearMerge))
+            if (!ActivityTeaDataManager.Instance.CheckOpenOne(ActivityType.ItemSynthetic))
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;