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

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

@@ -51,6 +51,10 @@ namespace GFGGame
                 return false;
             }
             var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(day);
+            if(activity7DaysTaskCfg == null)
+            {
+                return false;
+            }
             var taskIdArr = activity7DaysTaskCfg.taskIdArr;
             foreach(int taskId in taskIdArr)
             {