From a4cfcf180c6306ba8012f90a4dc19fe03c819424 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 25 Aug 2022 20:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A2=A6=E9=AD=87=E5=9F=BA=E9=87=91=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/activity/growthFundService.ts | 7 +++++-- shared/domain/activityField/growthFundField.ts | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/game-server/app/services/activity/growthFundService.ts b/game-server/app/services/activity/growthFundService.ts index 65f33b96e..54b4ce650 100644 --- a/game-server/app/services/activity/growthFundService.ts +++ b/game-server/app/services/activity/growthFundService.ts @@ -96,11 +96,14 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE: //精英 case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP: //精英VIP { - let { mainEliteWarId } = await RoleModel.findByRoleId(roleId); + 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 page of playerData.list) { for (let item of page.items) { if (item.taskType == TASK_TYPE.BATTLE_MAIN_ELITE) { - if (mainEliteWarId >= item.taskParamArray[1]) { + let index = warIDs.findIndex(id => { return id === item.taskParamArray[1] }) + if (index != -1) { item.isComplete = true; } } diff --git a/shared/domain/activityField/growthFundField.ts b/shared/domain/activityField/growthFundField.ts index c9aa0ec32..5075de1e3 100644 --- a/shared/domain/activityField/growthFundField.ts +++ b/shared/domain/activityField/growthFundField.ts @@ -89,7 +89,7 @@ export class GrowthFundData extends ActivityBase { } case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE: case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP: { - if (!this.isReceive(page.pageIndex, item.cellIndex) && item.taskParamArray[1] <= 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 })) }