diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index 767be4ad7..7b34b481b 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession } from 'pinus'; import { resResult } from '../../../pubUtils/util'; import { ACTIVITY_TYPE, FIRST_GIFT_STATE, SERVER_OPEN_TIME, STATUS, TASK_TYPE } from '../../../consts'; import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService'; -import { signInActivity, signInVIPActivity } from '../../../services/signInService'; +import { newPlayerSignInActivity, signInActivity, signInVIPActivity } from '../../../services/signInService'; import { growthFundActivity } from '../../../services/growthFundService'; import { limitPackageActivity, newPlayerLimitPackageActivity } from '../../../services/limitPackageService'; import { growthActivity } from '../../../services/growthService'; @@ -333,6 +333,18 @@ export class ActivityHandler { } } + //寻宝骑兵活动 23 + { + // let data = await dailyRMBGiftsActivity(serverId, roleId); + // if (data) { + // playerActivityArray.push({ + // type: ACTIVITY_TYPE.TREASURE_HUNT, + // activityId: data.activityId, + // data, + // }); + // } + } + //弹出商店 24 { let data = await popUpShopActivity(serverId, roleId); @@ -347,6 +359,18 @@ export class ActivityHandler { } } + //新手签到 25 + { + let data = await newPlayerSignInActivity(serverId, roleId); + if (data) { + playerActivityArray.push({ + type: ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN, + activityId: data.activityId, + data, + }); + } + } + return resResult(STATUS.SUCCESS, { playerActivityArray }); } diff --git a/game-server/app/servers/activity/handler/signInHandler.ts b/game-server/app/servers/activity/handler/signInHandler.ts index 0b2888220..4defb316f 100644 --- a/game-server/app/servers/activity/handler/signInHandler.ts +++ b/game-server/app/servers/activity/handler/signInHandler.ts @@ -32,13 +32,13 @@ export class SignInHandler { const roleId = session.get('roleId'); const serverId = session.get('serverId'); - let todayIndex = moment(new Date()).date(); + let curDate = moment(new Date()).valueOf(); let playerData = await getPlayerSignInData(activityId, serverId, roleId) - if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启 + if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); + if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启 return resResult(STATUS.ACTIVITY_CLOSED); } - if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); return resResult(STATUS.SUCCESS, playerData); } @@ -60,8 +60,8 @@ export class SignInHandler { let playerData = await getPlayerSignInData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); - let todayIndex = moment(new Date()).date(); - if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启 + let curDate = moment(new Date()).valueOf(); + if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启 return resResult(STATUS.ACTIVITY_CLOSED); } diff --git a/game-server/app/services/signInService.ts b/game-server/app/services/signInService.ts index fe585d148..a46c3f54d 100644 --- a/game-server/app/services/signInService.ts +++ b/game-server/app/services/signInService.ts @@ -1,7 +1,8 @@ import moment = require('moment'); -import { ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../consts'; +import { ACTIVITY_TYPE, NEW_PLAYER_SIGIN_DAYS, 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'; import { ServerlistModel } from '../db/Serverlist'; import { SignInData, SignInItem } from '../domain/activityField/signInField'; @@ -22,8 +23,8 @@ export async function signInActivity(serverId: number, roleId: string) { } let activityData = activityArray[0]; let playerData = new SignInData(activityData); - let todayIndex = moment(new Date()).date(); - if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启 + let curDate = moment(new Date()).valueOf(); + if (curDate < playerData.beginTime || curDate > playerData.beginTime) {//未开启 return null; } let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex); @@ -49,8 +50,8 @@ export async function signInVIPActivity(serverId: number, roleId: string) { let activityData = activityArray[0]; let playerData = new SignInData(activityData); - let todayIndex = moment(new Date()).date(); - if (todayIndex < playerData.startDate || todayIndex > playerData.endDate) {//未开启 + let curDate = moment(new Date()).valueOf(); + if (curDate < playerData.beginTime || curDate > playerData.beginTime) {//未开启 return null; } @@ -59,6 +60,41 @@ export async function signInVIPActivity(serverId: number, roleId: string) { return playerData; } +/** + * 获取活动数据 + * + * @param {number} type 新手签到 + * @param {number} serverId 区Id + * @param {number} activityId 活动Id + * @param {string} roleId 角色Id + * + */ +export async function newPlayerSignInActivity(serverId: number, roleId: string) { + let { createTime } = await RoleModel.findByRoleId(roleId); + let betinTime = moment(createTime).startOf('d').toDate(); + let endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate() + let curDate = new Date() + 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()); + if (activityArray.length == 0) { + return null; + } + let activityData = activityArray[0]; + let playerData = new SignInData(activityData); + playerData.setNewPlayerDate(betinTime, endTime); + let curDateStamp = moment(new Date()).valueOf(); + if (curDateStamp < playerData.beginTime || curDateStamp > playerData.beginTime) {//未开启 + return null; + } + let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex); + playerData.setPlayerRecords(playerRecords); + return playerData; +} + /** * 玩家活动数据 * @@ -69,14 +105,19 @@ export async function signInVIPActivity(serverId: number, roleId: string) { */ export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) { let activityData: ActivityModelType = await ActivityModel.findActivity(activityId); - if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP && activityData.type !== ACTIVITY_TYPE.SIGN_IN) { + if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP && activityData.type !== ACTIVITY_TYPE.SIGN_IN && activityData.type !== ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) { return null; } let playerData = new SignInData(activityData); let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex); playerData.setPlayerRecords(playerRecords); - + if (playerData.type === ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) { + let { createTime } = await RoleModel.findByRoleId(roleId); + let betinTime = moment(createTime * 1000).startOf('d').toDate(); + let endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate() + playerData.setNewPlayerDate(betinTime, endTime) + } return playerData; } diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index 6f663b106..1a3eae63b 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -30,6 +30,7 @@ export enum ACTIVITY_TYPE { DAILY_RMB_GIFTS = 22, // 每日特惠RMB购买，一次性购买7天礼包 TREASURE_HUNT = 23, // 寻宝骑兵活动 POP_UP_SHOP = 24, // 弹出商店 + NEW_PLAYER_SIGN_IN = 25, // 新手签到活动 // FOURTEEN_DAY = 25, // 14天乐活动(虚) // FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包 // FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动 @@ -111,4 +112,7 @@ export const DAILYRMBGIFTS_DAYS = 7;//一次性购买*天 //签到活动开启时间 export const SIGNIN_OPEN = 1;//*号0点开启 -export const SIGNIN_CLOSE = 31;//*号晚上24点结束 \ No newline at end of file +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 61c238d36..f11cd688a 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -1,7 +1,8 @@ import moment = require('moment'); -import { ACTIVITY_RESOURCES_TYPE, SIGNIN_CLOSE, SIGNIN_OPEN } from '../../consts'; +import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_CLOSE, SIGNIN_OPEN } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivitySignInModelType } from '../../db/ActivitySignIn'; +import { deltaDays } from '../../pubUtils/util'; import { ActivityBase } from './activityField'; @@ -57,25 +58,37 @@ export class SignInData extends ActivityBase { this.isVip = true } + //设置新手签到时间 + public setNewPlayerDate(beginTime: Date, endTime: Date) { + this.beginTime = moment(beginTime).valueOf(); + this.endTime = moment(endTime).valueOf(); + this.roundIndex = 1; + this.todayIndex = deltaDays(moment(beginTime).startOf('d').toDate(), new Date) + 1; + } + public initData(data: string) { let dataObj = JSON.parse(data); + this.price = dataObj.price; + this.productID = dataObj.productID; + this.consume = dataObj.consume; + this.startDate = dataObj.startDate ? dataObj.startDate : SIGNIN_OPEN; this.endDate = dataObj.endDate ? dataObj.endDate : SIGNIN_CLOSE; let date = new Date(); this.beginTime = moment(date.setDate(this.startDate)).startOf('day').valueOf(); this.endTime = moment(date.setDate(this.endDate)).endOf('day').valueOf(); - - this.price = dataObj.price; - this.productID = dataObj.productID; - this.consume = dataObj.consume; - this.roundIndex = moment().diff(moment(this.beginTime).startOf('months'), 'months') + 1; + this.roundIndex = moment().diff(moment(SERVER_OPEN_TIME).startOf('months'), 'months') + 1; + if (this.type === ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) { + this.roundIndex = 1; + } this.todayIndex = moment(Date.now()).date() - this.startDate + 1; let arr = dataObj.data for (let obj of arr) { this.list.push(new SignInItem(obj)) } + } constructor(activityData: ActivityModelType) { diff --git a/shared/domain/activityField/thirtyDaysField.ts b/shared/domain/activityField/thirtyDaysField.ts index 6c04fab72..13a366f83 100644 --- a/shared/domain/activityField/thirtyDaysField.ts +++ b/shared/domain/activityField/thirtyDaysField.ts @@ -66,7 +66,7 @@ export class ThirtyDaysItem { reward: string; //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品 point: number; // 任务达成获得的奖励点，只在当前活动中有用，虚拟 - + totalCount: number = 0; //任务完成次数 isComplete: boolean = false; //是否完成任务 isReceive: boolean = false; //是否领取过奖励 @@ -81,6 +81,10 @@ export class ThirtyDaysItem { this.reward = data.reward; this.point = data.point; + this.totalCount = 0; + this.isComplete = false; + this.isReceive = false; + this.taskParamArray = splitString(data.taskParam, '&') } @@ -229,6 +233,7 @@ export class ThirtyDaysData extends ActivityBase { let itemData = this.findThirtyDaysItem(record.pageIndex, record.cellIndex, record.tab) if (itemData) { itemData.isReceive = record.isReceive === true; + itemData.totalCount = record.totalCount ? record.totalCount : 0; itemData.isComplete = record.totalCount >= itemData.condition; if (itemData.isReceive) { this.totalPoint += itemData.point;