高级合成副本

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -241,5 +241,10 @@ namespace GFGGame
 
         //快速完成关卡
         public const string FIGHT_QUICKLY = "FIGHT_QUICKLY";
+
+        //时光回溯副本更新
+        public const string TIMETRACINGUPDATE = "TIMETRACING_UPDATE";
+        //时光回溯红点更新
+        public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
     }
 }

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

@@ -246,6 +246,10 @@ namespace GFGGame
             ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
+            TimeTracingDataManager.Instance.InitRewardDic();
+            TimeTracingSProxy.ReqGetLevelRewardStatus().Coroutine();
+            TimeTracingSProxy.ReqGetSuitRewardStatus().Coroutine();
+            TimeTracingSProxy.ReqGetDataRecord().Coroutine();
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();

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

@@ -396,6 +396,12 @@ namespace GFGGame
                 var limitData = RoleLimitDataManager.GetLimitData(zcjbFightCfg.limit);
                 times = Math.Min(times, 10);
             }
+            else if (type == ConstInstanceZonesType.PureFight && subType == 2)
+            {
+                var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
+                times = limitData.TotalPlayMax - limitData.PlayTimes;
+            }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }
         public static void GetTotalProgress(out int count, out int totalCount)

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

@@ -88,6 +88,7 @@ namespace GFGGame
         }
 
 
+
         public void IsCanFight(int levelId, out bool canFight, out string content)
         {
 
@@ -144,6 +145,11 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
         }
+        public async void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
+        {
+            await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+            ViewManager.Show<TimeTracingLevelView>(new object[] { TimeTracingDataManager._currentChapterId, TimeTracingDataManager.SuitID});
+        }
 
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemUI.cs

@@ -11,6 +11,7 @@ namespace UI.Poem
         public GButton m_btnback;
         public UI_Button15 m_comphoto;
         public UI_Button15 m_comGallery;
+        public UI_Button15 m_TimeTracing;
         public const string URL = "ui://iyz778gkv4820";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemUI";
@@ -62,6 +63,7 @@ namespace UI.Poem
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comphoto = (UI_Button15)UI_Button15.Create(comp.GetChild("comphoto"));
             m_comGallery = (UI_Button15)UI_Button15.Create(comp.GetChild("comGallery"));
+            m_TimeTracing = (UI_Button15)UI_Button15.Create(comp.GetChild("TimeTracing"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -71,6 +73,8 @@ namespace UI.Poem
             m_comphoto = null;
             m_comGallery.Dispose();
             m_comGallery = null;
+            m_TimeTracing.Dispose();
+            m_TimeTracing = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,6 +10,7 @@ namespace GFGGame
     {
         private UI_ZCJBBuyTips _ui;
         private string Desc;
+        private int limitID;
 
         public override void Dispose()
         {
@@ -32,12 +33,14 @@ namespace GFGGame
 
             _ui.m_btnRight.onClick.Add(OnClickBtnSure);
             _ui.m_btnLeft.onClick.Add(OnClickBtnCancel);
+            _ui.m_graphBg.onClick.Add(OnClickBtnCancel);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             Desc = (string)(this.viewData as object[])[0];
+            limitID = (int)(this.viewData as object[])[1];
             UpdateView();
         }
         protected override void AddEventListener()
@@ -60,11 +63,11 @@ namespace GFGGame
 
         private void OnClickBtnSure()
         {
-            RoleLimitSProxy.ReqBuyLimitPlayTimes(500, 1, 1).Coroutine();
+            RoleLimitSProxy.ReqBuyLimitPlayTimes(limitID, 1, 1).Coroutine();
         }
         private void LimitChanged(EventContext context = null)
         {
-            if ((int)context.data != 500)
+            if ((int)context.data != limitID)
             {
                 return;
             }

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -111,6 +111,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -126, 22);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -152, 85);
             RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -103, 43);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnPoem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward());
         }
 
         private void CheckFunOpen()

GameClient/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs

@@ -29,7 +29,15 @@ namespace GFGGame
                     Debug.LogError(string.Format("战斗id：{0}  无配置", levelCfg.fightID));
                     return;
                 }
-                ViewManager.Show<StoryLevelInfoView>(new object[] { levelCfgId, needitemId, needItemCount });
+                if(levelCfg.type == 6 && levelCfg.subType == 2)
+                {
+                    ViewManager.Show<TimeTracingLevelInfoView>(new object[] { levelCfgId, needitemId, needItemCount });
+                }
+                else
+                {
+                    ViewManager.Show<StoryLevelInfoView>(new object[] { levelCfgId, needitemId, needItemCount });
+                }
+                
             }
             else if (!string.IsNullOrEmpty(levelCfg.storyStartID))
             {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -367,7 +367,7 @@ namespace GFGGame
         {
             string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(500).moneyId).name;
             string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", LimitCfgArray.Instance.GetCfg(500).moneyNumArr[0],name, 1);
-            ViewManager.Show<ZCJBBuyTipsView>(new object[] { desc });
+            ViewManager.Show<ZCJBBuyTipsView>(new object[] { desc,500 });
         }
         //******************//
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

@@ -31,11 +31,11 @@ namespace GFGGame
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             _ui.m_comphoto.target.onClick.Add(OnComPhotoClick);
             _ui.m_comGallery.target.onClick.Add(OnComGalleryClick);
+            _ui.m_TimeTracing.target.onClick.Add(OnTimeTracingClick);
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
         protected override void OnShown()
         {
@@ -43,6 +43,11 @@ namespace GFGGame
 
             bool isPhotoOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemPhotoView).Name, false);
             bool isgalleryOpen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemGalleryView).Name, false);
+            _ui.m_TimeTracing.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(21) == 0 ? false : true;
+            if (_ui.m_TimeTracing.target.visible == true)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_TimeTracing.target, TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward());
+            }
             _ui.m_comphoto.m_c1.selectedIndex = isPhotoOpen ? 1 : 0;
             _ui.m_comGallery.m_c1.selectedIndex = isgalleryOpen ? 1 : 0;
             if (isPhotoOpen && isgalleryOpen)
@@ -75,6 +80,10 @@ namespace GFGGame
         {
             ViewManager.Show<PoemGalleryView>();
         }
+        private void OnTimeTracingClick()
+        {
+            ViewManager.Show<TimeTracingShowView>();
+        }
 
         private void CheckGuide(object param)
         {