将两种任务初步合起来

shared/domain/activityField/sevenDaysField.ts

@@ -5,7 +5,7 @@ import { ActivityGrowthModelType } from '../../db/ActivityGrowth';
 import { ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
 import { HeroType } from '../../db/Hero';
 import { RoleModel } from '../../db/Role';
-import { splitString } from '../../pubUtils/util';
+import { parseNumberList, splitString } from '../../pubUtils/util';
 import { ActivityDailyGiftsModelType } from '../../db/ActivityDailyGifts';
 import { parseResStr } from '../../pubUtils/util';
 import { ConsumeResParam } from '../activityField/consumeField';
@@ -18,6 +18,7 @@ export class SevenDaysDailyItem {
     name: string;           // 任务名称
     taskType: number;       // 任务类型 dic_zyz_taskType.json
     taskParam: string;      //任务数据 dic_zyz_taskType.json
+    taskParamArray: number[];
     condition: number;      //任务数据条件 dic_zyz_taskType.jsonT
     reward: string;         // 任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
     skip: string;           // 跳转
@@ -35,6 +36,7 @@ export class SevenDaysDailyItem {
         this.reward = data.reward;
         this.skip = data.skip;
 
+        this.taskParamArray = parseNumberList(data.taskParam);
         this.totalCount = 0;
         this.receiveRewardCount = 0;
     }
@@ -324,8 +326,8 @@ export class SevenDaysData extends ActivityBase {
         this.dailyChallenge = new SevenDaysDailyChallengesData(objData.dailyChallenge)
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverCreateTime?: number) {
+        super(activityData, createTime, serverCreateTime)
         this.initData(activityData.data)
     }
 }