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-31 14:40:09 +08:00
parent cb7c930d46
commit 45126d296f
3 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
shared/domain/activityField/thirtyDaysField.ts
View File

@@ -25,34 +25,34 @@ export class ThirtyDaysPointItem {
this.expiredReward = data.expiredReward;
}
public heroReward(): CreateHeroParam[] {
let data = this.reward;
if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
data = this.expiredReward;
}
// public heroReward(): CreateHeroParam[] {
// let data = this.reward;
// if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
// data = this.expiredReward;
// }
let rewardArray = [];
let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
for (let objStr of rewardData) {
let reward = parseHeroStrWithType(objStr);
rewardArray.push(reward);
}
return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.HERO })
}
// let rewardArray = [];
// let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
// for (let objStr of rewardData) {
// let reward = parseHeroStrWithType(objStr);
// rewardArray.push(reward);
// }
// return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.HERO })
// }
public goodReward(): RewardInter[] {
let data = this.reward;
if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
data = this.expiredReward;
}
let rewardArray = [];
let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
for (let objStr of rewardData) {
let reward = parseGoodStrWithType(objStr);
rewardArray.push(reward);
}
return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.GOODS })
}
// public goodReward(): RewardInter[] {
// let data = this.reward;
// if (this.isExpired && this.expiredReward && this.expiredReward != '') {//过期奖励
// data = this.expiredReward;
// }
// let rewardArray = [];
// let rewardData = data.split('|').filter(obj => { return obj && obj != '' });
// for (let objStr of rewardData) {
// let reward = parseGoodStrWithType(objStr);
// rewardArray.push(reward);
// }
// return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.GOODS })
// }
}
@@ -83,26 +83,6 @@ export class ThirtyDaysItem {
this.taskParamArray = splitString(data.taskParam, '&')
}
public heroReward(): CreateHeroParam[] {
let rewardArray = [];
let rewardData = this.reward.split('|').filter(obj => { return obj && obj != '' });
for (let objStr of rewardData) {
let reward = parseHeroStrWithType(objStr);
rewardArray.push(reward);
}
return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.HERO })
}
public goodReward(): RewardInter[] {
let rewardArray = [];
let rewardData = this.reward.split('|').filter(obj => { return obj && obj != '' });
for (let objStr of rewardData) {
let reward = parseGoodStrWithType(objStr);
rewardArray.push(reward);
}
return rewardArray.filter(obj => { return obj && obj.type == ACTIVITY_RESOURCES_TYPE.GOODS })
}
public canReceive(): boolean {
return !this.isReceive;
}