将两种任务初步合起来

shared/domain/activityField/treasureHuntField.ts

@@ -4,7 +4,7 @@ import { ActivityTreasureHuntShopModelType } from '../../db/ActivityTreasureHunt
 import { ActivityTreasureHuntTaskModelType } from '../../db/ActivityTreasureHuntTask';
 import { ActivityTreasureHuntTreasureShopModelType } from '../../db/ActivityTreasureHuntTreasureShop';
 import { ActivityTreasureHuntFirstPageModelType } from '../../db/ActivityTreasureHuntFirstPage';
-import { splitString } from '../../pubUtils/util';
+import { parseNumberList, splitString } from '../../pubUtils/util';
 import { ActivityBase } from './activityField';
 
 
@@ -142,6 +142,7 @@ export class TreasureHuntTaskItem {
     fragment: number;      //碎片
     skip: string;
 
+    taskParamArray: number[];      // 任务参数
     totalCount: number = 0;          //任务统计
     isReceive: boolean = false;       //是否领取奖励
 
@@ -150,6 +151,7 @@ export class TreasureHuntTaskItem {
         this.name = data.name;
         this.taskType = data.taskType;
         this.taskParam = data.taskParam;
+        this.taskParamArray = parseNumberList(data.taskParamArray);
         this.condition = data.condition;
         this.reward = data.reward;
         this.fragment = data.fragment;
@@ -339,8 +341,8 @@ export class TreasureHuntData extends ActivityBase {
         }
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, sererTime?: number) {
+        super(activityData, createTime, sererTime);
         this.initData(activityData.data)
     }
 }