diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts index 7dfd4393c..18f5feb2e 100644 --- a/game-server/app/services/activity/activityService.ts +++ b/game-server/app/services/activity/activityService.ts @@ -83,12 +83,7 @@ export async function getActivity(serverId: number, roleId: string, activityId: } case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE://新手限定RMB购买礼包 15 { - let { createTime } = await RoleModel.findByRoleId(roleId); - let createDate = moment(createTime * 1000).toDate(); - let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate(); - if (new Date() <= endTime) { - activityData = await getPlayerLimitPackageData(activityId, serverId, roleId); - } + activityData = await getPlayerLimitPackageData(activityId, serverId, roleId); break; } case ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY://每日限购礼包,RMB购买礼包 16 diff --git a/gm-server/app/controller/activity.ts b/gm-server/app/controller/activity.ts index 9f93d8353..b82ff46e9 100644 --- a/gm-server/app/controller/activity.ts +++ b/gm-server/app/controller/activity.ts @@ -4,7 +4,7 @@ export default class ActivityController extends Controller { public async getActivityList() { const { ctx } = this; - const { page, pageSize, type, form: {groupId, current, activityId}, sortField, sortOrder } = ctx.request.body; + const { page, pageSize, form: {groupId, current, activityId, type}, sortField, sortOrder } = ctx.request.body; ctx.body = await ctx.service.activity.getActivityList(page, pageSize, sortField, sortOrder, type, groupId, current, activityId); return } diff --git a/shared/domain/activityField/treasureHuntField.ts b/shared/domain/activityField/treasureHuntField.ts index 84717c23d..a84f7db90 100644 --- a/shared/domain/activityField/treasureHuntField.ts +++ b/shared/domain/activityField/treasureHuntField.ts @@ -140,6 +140,7 @@ export class TreasureHuntTaskItem { condition: number; //任务条件数据 reward: string; //奖励 fragment: number; //碎片 + skip: string; totalCount: number = 0; //任务统计 isReceive: boolean = false; //是否领取奖励 @@ -152,6 +153,7 @@ export class TreasureHuntTaskItem { this.condition = data.condition; this.reward = data.reward; this.fragment = data.fragment; + this.skip = data.skip; this.totalCount = 0; this.isReceive = false; }