diff --git a/game-server/app/services/signInService.ts b/game-server/app/services/signInService.ts index 6ddf820e5..95a2a409d 100644 --- a/game-server/app/services/signInService.ts +++ b/game-server/app/services/signInService.ts @@ -1,5 +1,5 @@ import moment = require('moment'); -import { ACTIVITY_TYPE, NEW_PLAYER_SIGIN_DAYS, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts'; +import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts'; import { ActivityModel, ActivityModelType } from '../db/Activity'; import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn'; import { RoleModel } from '../db/Role'; @@ -70,21 +70,6 @@ export async function signInVIPActivity(serverId: number, roleId: string) { * */ export async function newPlayerSignInActivity(serverId: number, roleId: string) { - let { createTime } = await RoleModel.findByRoleId(roleId); - let betinTime = null; - let endTime = null - let curDate = moment(createTime * 1000); - if (curDate.hour() < REFRESH_TIME) { - betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate(); - endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate() - } else { - betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate(); - endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate() - } - if (curDate > endTime) { - return null; - } - let { activityGroupId } = await ServerlistModel.findByServerId(serverId); let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN, new Date()); @@ -93,6 +78,23 @@ export async function newPlayerSignInActivity(serverId: number, roleId: string) } let activityData = activityArray[0]; let playerData = new SignInData(activityData); + + let { createTime } = await RoleModel.findByRoleId(roleId); + let betinTime = null; + let endTime = null + let curDate = moment(createTime * 1000); + if (curDate.hour() < REFRESH_TIME) { + betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate(); + endTime = moment(betinTime).add(playerData.days, 'd').toDate() + } else { + betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate(); + endTime = moment(betinTime).add(playerData.days, 'd').toDate() + } + if (curDate > endTime) { + return null; + } + + playerData.setNewPlayerDate(betinTime, endTime); let curDateStamp = moment(new Date()).valueOf(); if (curDateStamp < playerData.beginTime || curDateStamp > playerData.endTime) {//未开启 @@ -127,10 +129,10 @@ export async function getPlayerSignInData(activityId: number, serverId: number, let curDate = moment(createTime * 1000); if (curDate.hour() < REFRESH_TIME) { betinTime = moment(createTime * 1000).startOf('d').add(-1, 'd').add(REFRESH_TIME, 'h').toDate(); - endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate() + endTime = moment(betinTime).add(playerData.days, 'd').toDate() } else { betinTime = moment(createTime * 1000).startOf('d').add(REFRESH_TIME, 'h').toDate(); - endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS, 'd').toDate() + endTime = moment(betinTime).add(playerData.days, 'd').toDate() } playerData.setNewPlayerDate(betinTime, endTime) } diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index bcd09acec..663d6280e 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -113,5 +113,3 @@ export const DAILYRMBGIFTS_DAYS = 7;//一次性购买*天 export const SIGNIN_OPEN = 1;//*号0点开启 export const SIGNIN_CLOSE = 31;//*号晚上24点结束 -//新手签到活动持续天数 -export const NEW_PLAYER_SIGIN_DAYS = 8;//持续8天 \ No newline at end of file diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index 9270c17c3..3b6952207 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -34,6 +34,7 @@ export class SignInData extends ActivityBase { isVip: boolean = false;//是否购买了当前的vip活动 startDate: number = 1;//月卡开启 endDate: number = 30;//月卡关闭 + days: number = 8;//新手签到使用,持续的天数 //第几天的签到奖励 public findDayItem(dayIndex: number) { @@ -75,6 +76,8 @@ export class SignInData extends ActivityBase { this.startDate = dataObj.startDate ? dataObj.startDate : SIGNIN_OPEN; this.endDate = dataObj.endDate ? dataObj.endDate : SIGNIN_CLOSE; + this.days = dataObj.days ? dataObj.days : 0; + let date = new Date(); this.beginTime = moment(date.setDate(this.startDate)).startOf('day').add(REFRESH_TIME, 'h').valueOf(); this.endTime = moment(date.setDate(this.endDate)).endOf('day').add(REFRESH_TIME, 'h').valueOf();