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

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

@@ -12,7 +12,7 @@ namespace GFGGame
         //时光回溯,关卡编号
         public static int _currentChapterId = 62001;
         //时光回溯，合成套装副本当前展示套装
-        public static int SuitID = 201027;
+        public static int SuitID = 201030;
         //时光回溯刷新时间
         public static long RefreshTime = 0;
         //章节积分奖励列表

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -11,6 +11,7 @@ namespace UI.ActivityMain
         public GLoader m_icon;
         public GButton m_rewardBTn;
         public GTextField m_activityTime;
+        public GGroup m_time;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
         public GLoader m_shopBtn;
@@ -67,6 +68,7 @@ namespace UI.ActivityMain
             m_icon = (GLoader)comp.GetChild("icon");
             m_rewardBTn = (GButton)comp.GetChild("rewardBTn");
             m_activityTime = (GTextField)comp.GetChild("activityTime");
+            m_time = (GGroup)comp.GetChild("time");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
             m_shopBtn = (GLoader)comp.GetChild("shopBtn");
@@ -79,6 +81,7 @@ namespace UI.ActivityMain
             m_icon = null;
             m_rewardBTn = null;
             m_activityTime = null;
+            m_time = null;
             m_backBtn = null;
             m_viewBtn = null;
             m_shopBtn = null;

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

@@ -45,6 +45,7 @@ namespace GFGGame
         {
             base.OnShown();
             ReqInfo();
+            _ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
         }

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

@@ -145,6 +145,7 @@ namespace GFGGame
                 if (startTime <= TimeHelper.ServerNow() && endTime > TimeHelper.ServerNow())
                 {
                     indexSuit = count;
+                    return indexSuit;
                 }
                 count++;
             }

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

@@ -11,8 +11,8 @@ namespace GFGGame
     public class TimeTracingShowView : BaseWindow
     {
         private UI_TimeTracingShowUI _ui;
-        private List<int> suitIdList = new List<int>() { 201027, 201003, 202006 };
-        private int SuitID;
+        private List<int> suitIdList = new List<int>() { 201030, 201010, 202006 };
+        private int SuitID = 201030;
         private int ChapterID;
         public override void Dispose()
         {

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

@@ -11,7 +11,7 @@ namespace GFGGame
     public class TimeTracingSwitchView : BaseWindow
     {
         private UI_TimeTracingSwitchUI _ui;
-        private List<int> suitIdList = new List<int>() { 202021, 202022, 202023,0};
+        private List<int> suitIdList = new List<int>() { 201030, 201010, 202006, 0};
         private List<int> chapterIdList = new List<int>() { 61001,62002,62003 ,0};
         private List<string> NumStringList = new List<string>() {"", "一", "二", "三", "四", "五" };
         public override void Dispose()
@@ -114,7 +114,7 @@ namespace GFGGame
             }
             else
             {
-                if (chapterID[3] == 1)
+                //if (chapterID[3] == 1)
                 {
                     if(chapterID[0] == _ui.m_List.numItems - 2 || chapterID[1] == 0)
                     {
@@ -125,11 +125,11 @@ namespace GFGGame
                     EventAgent.DispatchEvent(ConstMessage.TIMETRACINGUPDATE);
                     this.Hide();
                 }
-                else
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("需集齐前置套装");
-                    return;
-                }
+                //else
+                //{
+                //    PromptController.Instance.ShowFloatTextPrompt("需集齐前置套装");
+                //    return;
+                //}
             }
 
         }