新年活动合成跳转和适配修改

GameClient/Assets/Game/HotUpdate/Controller/MainController.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class MainControllerr : SingletonBase<MainControllerr>
+    {
+        public static bool GotoStoryChapter(bool isOpen = false)
+        {
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
+            if (isOpen) return isOpen;
+            isOpen = true;
+            List<StoryChapterCfg> _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(0);
+            for (int i = 0; i < _chapterCfgs.Count; i++)
+            {
+                StoryChapterCfg chapterCfg = _chapterCfgs[i];
+                if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                {
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
+                    isOpen = false;
+                    return isOpen;
+                }
+                else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                {
+                    StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
+                    var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterTowCfg.type, chapterTowCfg.subType, chapterTowCfg.id);
+                    StoryLevelCfg lastLevelCfg = list[list.Count - 1];
+                    //这里是当下一章没解锁，但是上一章的最后一关已经通过了
+                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))//MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
+                    isOpen = false;
+                    return isOpen;
+                }
+            }
+            return isOpen;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Controller/MainController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f5834fd733263734e89eb062521fb0d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -155,7 +155,7 @@ namespace GFGGame
 
         private void OnClickBtnGet()
         {
-            ViewManager.Show<StoryChapterView>();
+            MainControllerr.GotoStoryChapter();
         }
 
         private void OnSelectorItemClick(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -301,36 +301,7 @@ namespace GFGGame
 
         private void OnClickBtnMain()
         {
-            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
-            if (isOpen) return;
-            isOpen = true;
-            List<StoryChapterCfg> _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(0);
-            for (int i = 0; i < _chapterCfgs.Count; i++)
-            {
-                StoryChapterCfg chapterCfg = _chapterCfgs[i];
-                if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
-                {
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
-                    isOpen = false;
-                    return;
-                }
-                else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
-                {
-                    StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
-                    var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterTowCfg.type, chapterTowCfg.subType, chapterTowCfg.id);
-                    StoryLevelCfg lastLevelCfg = list[list.Count - 1];
-                    //这里是当下一章没解锁，但是上一章的最后一关已经通过了
-                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))//MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
-                    {
-                        ViewManager.Show<StoryChapterListView>(new object[] { 0 ,Mathf.Max(0, chapterCfg.order - 1 )});
-                        isOpen = false;
-                        return;
-                    }
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
-                    isOpen = false;
-                    return;
-                }
-            }
+            isOpen = MainControllerr.GotoStoryChapter(isOpen);
         }
 
         private void OnClickBtnHuanZhuang()