Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -189,9 +189,9 @@ namespace GFGGame
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
             if (logout)
             {
-                Logout();
+                QDManager.Logout();
+                PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
             }
-            LoginController.OnLogout();
             ViewManager.Hide<GuideView>();
             ViewManager.Show<LoginView>(null, null, true);
         }
@@ -206,13 +206,6 @@ namespace GFGGame
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
         }
 
-        //注销
-        private static void Logout()
-        {
-            QDManager.Logout();
-            PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
-        }
-
         public static void GoBackToMainView()
         {
             MainDataManager.Instance.ViewType = 0;

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

@@ -135,12 +135,6 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL);
         }
 
-        public static void OnLogout()
-        {
-            GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Dispose();
-            GameGlobal.zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
-        }
-
         public static async ETTask Register(string account, string password, string name, string identityNum, string code)
         {
             ViewManager.Show<ModalStatusView>("注册中...");

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

@@ -8,7 +8,7 @@ namespace GFGGame
         {
             //获取7日任务活动
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.Day7);
-            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, activityInfo.EndTime);
+            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, TimeHelper.ServerNow());
         }
 
         public long GetScore()

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

@@ -101,7 +101,7 @@ namespace GFGGame
         {
             var activityInfoIds = GetActivityInfoIdsByType(activityType);
             return activityInfoIds.Select(GetActivityInfo).FirstOrDefault(activityInfo =>
-                activityInfo != null && activityInfo.EndTime <= TimeHelper.ServerNow());
+                activityInfo != null && activityInfo.EndTime >TimeHelper.ServerNow());
         }
 
         //添加活动奖励获取数据

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -54,7 +55,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            onClickDayIndex = ActivityDay7DataManager.Instance.GetActivityDay7Day() - 1;
+            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+            onClickDayIndex = Math.Max(0, min - 1);
             SetScoreList();
             SetScore();
             SetDayList();