xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：新手活动使用通用时间

Browse Source
This commit is contained in:
luying
2022-01-20 20:35:24 +08:00
parent 3d11de205f
commit e791077a45
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
game-server/app/services/activity/activityService.ts
View File

@@ -83,12 +83,7 @@ export async function getActivity(serverId: number, roleId: string, activityId:
} }
case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE://新手限定RMB购买礼包 15 case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE://新手限定RMB购买礼包 15
{ {
let { createTime } = await RoleModel.findByRoleId(roleId); activityData = await getPlayerLimitPackageData(activityId, serverId, 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);
}
break; break;
} }
case ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY://每日限购礼包，RMB购买礼包 16 case ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY://每日限购礼包，RMB购买礼包 16

2
gm-server/app/controller/activity.ts
View File

@@ -4,7 +4,7 @@ export default class ActivityController extends Controller {
public async getActivityList() { public async getActivityList() {
const { ctx } = this; 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); ctx.body = await ctx.service.activity.getActivityList(page, pageSize, sortField, sortOrder, type, groupId, current, activityId);
return return
} }

2
shared/domain/activityField/treasureHuntField.ts
View File

@@ -140,6 +140,7 @@ export class TreasureHuntTaskItem {
condition: number; //任务条件数据 condition: number; //任务条件数据
reward: string; //奖励 reward: string; //奖励
fragment: number; //碎片 fragment: number; //碎片
skip: string;
totalCount: number = 0; //任务统计 totalCount: number = 0; //任务统计
isReceive: boolean = false; //是否领取奖励 isReceive: boolean = false; //是否领取奖励
@@ -152,6 +153,7 @@ export class TreasureHuntTaskItem {
this.condition = data.condition; this.condition = data.condition;
this.reward = data.reward; this.reward = data.reward;
this.fragment = data.fragment; this.fragment = data.fragment;
this.skip = data.skip;
this.totalCount = 0; this.totalCount = 0;
this.isReceive = false; this.isReceive = false;
} }