|
@@ -172,7 +172,42 @@ namespace GFGGame
|
|
|
{
|
|
|
ClearTaskItemEff();
|
|
|
var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
|
|
|
- var taskIdArr = activity7DaysTaskCfg.taskIdArr;
|
|
|
+ var taskIdArr = new int[activity7DaysTaskCfg.taskIdArr.Length];
|
|
|
+ Array.Copy(activity7DaysTaskCfg.taskIdArr, taskIdArr, activity7DaysTaskCfg.taskIdArr.Length);
|
|
|
+ //田野调查和新增任务特殊处理
|
|
|
+ long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
|
|
|
+ long setTime = 1721768400000;
|
|
|
+ for (int i= 0;i<taskIdArr.Length; i++)
|
|
|
+ {
|
|
|
+ if(taskIdArr[i] == 2039)
|
|
|
+ {
|
|
|
+ TaskCfg taskCfg = TaskCfgArray.Instance.GetCfg(taskIdArr[i]);
|
|
|
+ if (taskCfg.jumpId == "FieldView")
|
|
|
+ {
|
|
|
+ if (time > setTime)
|
|
|
+ {
|
|
|
+ for (int j = i; i < taskIdArr.Length - 1; i++)
|
|
|
+ {
|
|
|
+ taskIdArr[j] = taskIdArr[j + 1];
|
|
|
+ }
|
|
|
+ Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if(taskIdArr[i] == 2057)
|
|
|
+ {
|
|
|
+ if (time < setTime)
|
|
|
+ {
|
|
|
+ for (int j = i; i < taskIdArr.Length - 1; i++)
|
|
|
+ {
|
|
|
+ taskIdArr[j] = taskIdArr[j + 1];
|
|
|
+ }
|
|
|
+ Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
//排序根据领取状态
|
|
|
var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(taskIdArr);
|
|
|
_ui.m_comTaskList.m_TaskList.data = taskCfgs;
|