活动:修改成长基金的数据结构
This commit is contained in:
@@ -65,12 +65,10 @@ export class GrowthFundHandler {
|
||||
if (!growthFundItemData.isComplete) {//未完成任务
|
||||
return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
|
||||
}
|
||||
if (growthFundItemData.isReceive) {//已经领取过
|
||||
if (playerData.isReceive(pageIndex, cellIndex)) {//已经领取过
|
||||
return resResult(STATUS.ACTIVITY_REWARDED);
|
||||
}
|
||||
|
||||
growthFundItemData.isReceive = true;
|
||||
|
||||
await ActivityGrowthFundModel.addRecord(activityId, roleId, pageIndex, cellIndex);
|
||||
|
||||
let rewardParamArr: Array<RewardParam> = stringToRewardParam(growthFundItemData.reward);
|
||||
|
||||
@@ -63,11 +63,13 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
|
||||
let role = await RoleModel.findByRoleId(roleId);
|
||||
let { warStar = new Array<{ id: number, warType: number, star: number }>() } = role;
|
||||
let warIDs = warStar.map(cur => cur.id);
|
||||
for (let item of playerData.list) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_MAIN) {
|
||||
let index = warIDs.findIndex(id => { return id === item.taskParamArray[1] })
|
||||
if (index != -1) {
|
||||
item.isComplete = true;
|
||||
for (let page of playerData.list) {
|
||||
for (let item of page.items) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_MAIN) {
|
||||
let index = warIDs.findIndex(id => { return id === item.condition })
|
||||
if (index != -1) {
|
||||
item.isComplete = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -77,10 +79,12 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
|
||||
case ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP:////镇念塔vip
|
||||
{
|
||||
let { towerLv } = await RoleModel.findByRoleId(roleId);
|
||||
for (let item of playerData.list) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_TOWER_LV) {
|
||||
if (towerLv >= item.taskParamArray[0]) {
|
||||
item.isComplete = true;
|
||||
for (let page of playerData.list) {
|
||||
for (let item of page.items) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_TOWER_LV) {
|
||||
if (towerLv >= item.condition) {
|
||||
item.isComplete = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -90,10 +94,12 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
|
||||
case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP: //精英VIP
|
||||
{
|
||||
let { mainEliteWarId } = await RoleModel.findByRoleId(roleId);
|
||||
for (let item of playerData.list) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_MAIN_ELITE) {
|
||||
if (mainEliteWarId >= item.taskParamArray[0]) {
|
||||
item.isComplete = true;
|
||||
for (let page of playerData.list) {
|
||||
for (let item of page.items) {
|
||||
if (item.taskType == TASK_TYPE.BATTLE_MAIN_ELITE) {
|
||||
if (mainEliteWarId >= item.condition) {
|
||||
item.isComplete = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user