diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index 79804ab59..484d2b121 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -94,7 +94,7 @@ export class ActivityHandler { let data = await signInVIPActivity(serverId, roleId); if (data) { playerActivityArray.push({ - type: ACTIVITY_TYPE.SIGN_IN, + type: ACTIVITY_TYPE.SIGN_IN_VIP, activityId: data.activityId, data, }); diff --git a/game-server/app/services/growthFundService.ts b/game-server/app/services/growthFundService.ts index b78fbfa61..c2c883180 100644 --- a/game-server/app/services/growthFundService.ts +++ b/game-server/app/services/growthFundService.ts @@ -79,7 +79,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb 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]) { + if (towerLv >= item.taskParamArray[0]) { item.isComplete = true; } } @@ -92,7 +92,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb 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]) { + if (mainEliteWarId >= item.taskParamArray[0]) { item.isComplete = true; } } diff --git a/shared/domain/activityField/growthFundField.ts b/shared/domain/activityField/growthFundField.ts index db4df0ada..37729b125 100644 --- a/shared/domain/activityField/growthFundField.ts +++ b/shared/domain/activityField/growthFundField.ts @@ -16,6 +16,7 @@ export class GrowthFundItem { taskType: number; // 任务类型 dic_zyz_taskType.json taskParam: string; //任务数据 dic_zyz_taskType.json taskParamArray: Array; //任务数据 dic_zyz_taskType.json + condition: number; //0 reward: string; // 任务奖励,格式:1&3&1(类型&id&数量) 类型定义:1.英雄,2.物品 @@ -30,6 +31,7 @@ export class GrowthFundItem { this.taskType = data.taskType; this.taskParam = data.taskParam; this.reward = data.reward; + this.condition = data.condition; this.isComplete = false; this.isReceive = false;