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

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

@@ -401,6 +401,7 @@ namespace GFGGame
                 var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
                 times = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, 10);
             }
             else if(type == 1 && subType == 1)
             {

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

@@ -145,11 +145,8 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
         }
-        public async void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
+        public void OnFinishTimeTracingLevel(int levelCfgId, bool firstPass, bool success)
         {
-            await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-            await TimeTracingSProxy.ReqGetLevelRewardStatus();
-            await TimeTracingSProxy.ReqGetSuitRewardStatus();
             ViewManager.Show<TimeTracingLevelView>(new object[] { TimeTracingDataManager._currentChapterId, TimeTracingDataManager.SuitID});
         }
 

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

@@ -381,7 +381,7 @@ namespace GFGGame
                 limitID = ActivityFightCfgArray.Instance.GetCfg(61001).limit;
             }
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
-            com.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.MaxStorageCount;
+            com.m_limitNum.text = string.Format("今日免费次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
             if(com.m_addBtn.data == null)
             {
                 com.m_addBtn.onClick.Add(OnClickAddBtn);

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

@@ -142,7 +142,7 @@ namespace GFGGame
             _ui.m_comResult.m_t0.Play(AddExp);
         }
 
-        protected override void OnHide()
+        protected async override void OnHide()
         {
             base.OnHide();
 
@@ -166,6 +166,13 @@ namespace GFGGame
             }
             else
             {
+                StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
+                if (storylevel.type == 6 && storylevel.subType == 2)
+                {
+                    await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+                    await TimeTracingSProxy.ReqGetLevelRewardStatus();
+                    await TimeTracingSProxy.ReqGetSuitRewardStatus();
+                }
                 InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, _resultData.FirstPass, true);
                 //尝试显示奖励
                 BonusController.TryShowBonusList(_resultData.BonusList);

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelInfoView.cs

@@ -328,7 +328,7 @@ namespace GFGGame
         {
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(TimeTracingDataManager._currentChapterId).limit);
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
-            _ui.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.MaxStorageCount;
+            _ui.m_limitNum.text = string.Format("今日免费次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
         }
         private void OnClickAddBtn()
         {