将两种任务初步合起来

shared/domain/activityField/activityField.ts

@@ -135,7 +135,7 @@ export class ActivityInRemote {
     }
 }
 
-export function transActivityInRemoteToModelType(activity: ActivityInRemote) {
+export function transActivityInRemoteToModelType(activity: ActivityInRemote): ActivityModelType {
     if(!activity) return null;
     return {
         ...activity,

shared/domain/activityField/growthFundField.ts

@@ -164,8 +164,8 @@ export class GrowthFundData extends ActivityBase {
         }
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+        super(activityData, createTime, serverTime)
         this.initData(activityData.data)
     }
 }

shared/domain/activityField/refreshTaskField.ts

@@ -128,8 +128,8 @@ export class RefreshTaskData extends ActivityBase {
         }
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+        super(activityData, createTime, serverTime)
         this.initData(activityData.data)
     }
 }

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)
     }
 }

shared/domain/activityField/thirtyDaysField.ts

@@ -118,20 +118,6 @@ export class ThirtyDaysData extends ActivityBase {
     pointRewardList: Array<ThirtyDaysPointItem> = [];//点数兑换奖励
     totalPoint: number = 0;//总共点数
 
-    //未完成的任务
-    public findUncompleteTaskByType(type: number): ThirtyDaysItem[] {
-        let task = [];
-        for (let i = 0; i < this.list.length; i++) {
-            let items = this.list[i].item;
-            for (let itemData of items) {
-                if (itemData.taskType == type && !itemData.isComplete) {
-                    task.push(itemData);
-                }
-            }
-        }
-        return task;
-    }
-
     public findTaskByType(type: number) {
         let task = [];
         for (let i = 0; i < this.list.length; i++) {
@@ -256,8 +242,8 @@ export class ThirtyDaysData extends ActivityBase {
         }
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+        super(activityData, createTime, serverTime)
         this.initData(activityData.data)
     }
 }

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)
     }
 }