xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：添加新的任务统计

Browse Source
This commit is contained in:
qiaoxin
2021-05-28 12:29:06 +08:00
parent 8961cdf248
commit cdb03bcc75
14 changed files with 260 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/domain/activityField/growthFundField.ts
View File

@@ -2,6 +2,7 @@ import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../consts';
import { ActivityModelType } from '../../db/Activity';
import { ActivityBuyRecordsModelType } from '../../db/ActivityBuyRecords';
import { ActivityGrowthFundModelType } from '../../db/ActivityGrowthFund';
import { splitString } from '../../pubUtils/util';
import { ActivityBase } from './activityField';
@@ -15,7 +16,7 @@ export class GrowthFundItem {
condition: number; //0
reward: string; // 任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品
isComplete: boolean //是否完成任务
taskParamArray: number[]//
// isReceive: boolean = false; //是否领取过奖励
constructor(data: any) {
@@ -28,6 +29,8 @@ export class GrowthFundItem {
this.condition = data.conditon;
this.isComplete = false;
// this.isReceive = false;
this.taskParamArray = splitString(data.taskParam, '&')
}
}
@@ -70,14 +73,14 @@ export class GrowthFundData extends ActivityBase {
switch (this.type) {
case ACTIVITY_TYPE.GROWTH_FUND_MAIN:
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP: {
if (!this.isReceive(page.pageIndex, item.cellIndex) && item.condition == condition) {
if (!this.isReceive(page.pageIndex, item.cellIndex) && item.taskParamArray[1] == condition) {
item.isComplete = true;
items.push(Object.assign(item, { pageIndex: page.pageIndex, activityId: this.activityId }))
}
break;
}
case ACTIVITY_TYPE.GROWTH_FUND_MAIN:
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP:
case ACTIVITY_TYPE.GROWTH_FUND_TOWER:
case ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP:
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE:
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP: {
if (!this.isReceive(page.pageIndex, item.cellIndex) && item.condition <= condition) {