diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index 7b34b481b..e34701932 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -16,6 +16,7 @@ import { RoleModel } from '../../../db/Role'; import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../services/thirtyDaysService'; import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService'; import { popUpShopActivity } from '../../../services/popUpShopService'; +import { vipRechargeMoneyActivity } from '../../../services/vipRechargeMoneyService'; // import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges'; // import { isComplete } from '../../../pubUtils/taskUtil'; @@ -371,6 +372,17 @@ export class ActivityHandler { } } + //vip累计充值活动 26 + { + let data = await vipRechargeMoneyActivity(serverId, roleId); + if (data) { + playerActivityArray.push({ + type: ACTIVITY_TYPE.VIP_RECHARGE_MONEY, + activityId: data.activityId, + data, + }); + } + } return resResult(STATUS.SUCCESS, { playerActivityArray }); } diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 97209713c..76ff30952 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -570,7 +570,6 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: pushMessage = pushMessage.concat(Object.assign(task, { activityId: thirtyDaysActivity.activityId })); } else {//没有完成 task.totalCount = playerRecord.totalCount; - task.isComplete = true; pushMessage = pushMessage.concat(Object.assign(task, { activityId: thirtyDaysActivity.activityId })); } }