活动:修复问题
This commit is contained in:
@@ -2,6 +2,7 @@ import { TASK_TYPE } from '../../consts';
|
||||
import { ActivityModelType } from '../../db/Activity';
|
||||
import { ActivityRefreshTaskModelType } from '../../db/ActivityRefreshTask';
|
||||
import { ActivityRefreshTaskPointModelType } from '../../db/ActivityRefreshTaskPoint';
|
||||
import { parseNumberList } from '../../pubUtils/util';
|
||||
import { ActivityBase } from './activityField';
|
||||
|
||||
|
||||
@@ -17,6 +18,7 @@ export class RefreshTaskItem {
|
||||
skip: number; //跳转客户端用
|
||||
point: number; //奖励的点数
|
||||
|
||||
taskParamArray: number[] = [];
|
||||
totalCount: number = 0; //完成任务累计次数
|
||||
receiveRewardCount: number = 0; //领取奖励次数
|
||||
|
||||
@@ -32,6 +34,7 @@ export class RefreshTaskItem {
|
||||
this.point = data.point;
|
||||
this.totalCount = 0;
|
||||
this.receiveRewardCount = 0;
|
||||
this.taskParamArray = parseNumberList(data.taskParam);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,10 +81,10 @@ export class RefreshTaskData extends ActivityBase {
|
||||
}
|
||||
|
||||
public findTaskByType(type: TASK_TYPE) {
|
||||
let arr = [];
|
||||
let arr: RefreshTaskItem[] = [];
|
||||
for (let pageData of this.list) {
|
||||
let items = pageData.items.filter(item => { return item.taskType == type });
|
||||
arr = arr.concat(items)
|
||||
arr.push(...items);
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
@@ -90,7 +93,7 @@ export class RefreshTaskData extends ActivityBase {
|
||||
public setPlayerRecords(data: ActivityRefreshTaskModelType[], pointRecordData: ActivityRefreshTaskPointModelType) {
|
||||
for (let pageData of this.list) {
|
||||
for (let item of pageData.items) {
|
||||
let index = data.findIndex(record => { return item.id == record.id && item.pageIndex == record.pageIndex && item.taskType == record.type })
|
||||
let index = data.findIndex(record => { return item.id == record.id && item.pageIndex == record.pageIndex && item.taskType == record.taskType })
|
||||
if (index != -1) {
|
||||
item.totalCount = data[index].totalCount ? data[index].totalCount : 0;
|
||||
item.receiveRewardCount = data[index].receiveRewardCount ? data[index].receiveRewardCount : 0;
|
||||
|
||||
@@ -18,7 +18,7 @@ export class SevenDaysDailyItem {
|
||||
name: string; // 任务名称
|
||||
taskType: number; // 任务类型 dic_zyz_taskType.json
|
||||
taskParam: string; //任务数据 dic_zyz_taskType.json
|
||||
taskParamArray: number[];
|
||||
taskParamArray: number[] = [];
|
||||
condition: number; //任务数据条件 dic_zyz_taskType.jsonT
|
||||
reward: string; // 任务奖励,格式:1&3&1(类型&id&数量) 类型定义:1.英雄,2.物品
|
||||
skip: string; // 跳转
|
||||
|
||||
@@ -119,7 +119,7 @@ export class ThirtyDaysData extends ActivityBase {
|
||||
totalPoint: number = 0;//总共点数
|
||||
|
||||
public findTaskByType(type: number) {
|
||||
let task = [];
|
||||
let task: ThirtyDaysItem[] = [];
|
||||
for (let i = 0; i < this.list.length; i++) {
|
||||
let items = this.list[i].item;
|
||||
for (let itemData of items) {
|
||||
|
||||
Reference in New Issue
Block a user