diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index e2ca189b4..3b334de13 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -60,7 +60,7 @@ export class RechargeMoneyHandler { return resResult(STATUS.ACTIVITY_RECHARGE_MONEY_ERROR); } - let recordArray = playerData.recordArray.filter(obj => { return obj && !obj.id }) + let recordArray = playerData.recordArray.filter(obj => { return obj && !obj.rewardTime }) let rechargeItem = recordArray[0]; console.log(JSON.stringify(recordArray)); await ActivityRechargeMoneyModel.addRecord(rechargeItem._id, item.id, item.reward) diff --git a/game-server/app/servers/activity/handler/signInHandler.ts b/game-server/app/servers/activity/handler/signInHandler.ts index 0027a486e..5eacd40c3 100644 --- a/game-server/app/servers/activity/handler/signInHandler.ts +++ b/game-server/app/servers/activity/handler/signInHandler.ts @@ -1,11 +1,12 @@ import { Application, BackendSession } from 'pinus'; import { resResult } from '../../../pubUtils/util'; -import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts'; -import { getPlayerSignInData, signInActivity } from '../../../services/signInService'; +import { STATUS, SIGNIN_VIP_OPEN_LIMIT, ACTIVITY_TYPE, SERVER_OPEN_TIME } from '../../../consts'; +import { canBuyVip, getPlayerSignInData, signInActivity } from '../../../services/signInService'; import { addItems, createHeroes, handleCost } from '../../../services/rewardService'; import { SignInItem } from '../../../domain/activityField/signInField'; import { ActivitySignInModel } from '../../../db/ActivitySignIn'; import moment = require('moment'); +import { RoleModel } from '../../../db/Role'; export default function (app: Application) { @@ -21,10 +22,11 @@ export class SignInHandler { /** * @description 获取普通签到活动数据 * @param {BackendSession} session + * @param {{ activityId: number}} msg * @memberof SignInHandler */ - async getSignInActivity(msg: {}, session: BackendSession) { - const { } = msg; + async getSignInActivity(msg: { activityId: number }, session: BackendSession) { + const { activityId } = msg; const roleId = session.get('roleId'); const serverId = session.get('serverId'); @@ -33,12 +35,12 @@ export class SignInHandler { return resResult(STATUS.ACTIVITY_CLOSED); } - let activityData = await signInActivity(ACTIVITY_TYPE.SIGN_IN, serverId, roleId); - if (!activityData) {//未配置活动数据 - return resResult(STATUS.ACTIVITY_MISSING); - } + // let activityData = await signInActivity(ACTIVITY_TYPE.SIGN_IN, serverId, roleId); + // if (!activityData) {//未配置活动数据 + // return resResult(STATUS.ACTIVITY_MISSING); + // } - let activityId = activityData.activityId;//活动ID + // let activityId = activityData.activityId;//活动ID let playerData = await getPlayerSignInData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); @@ -48,7 +50,7 @@ export class SignInHandler { /** * @description 签到获得奖励 - * @param {{ activityId: number, dayIndex: number}} msg + * @param {{ activityId: number, dayIndex: number}} msg * @param {BackendSession} session * @memberof SignInHandler */ @@ -64,9 +66,14 @@ export class SignInHandler { if (todayIndex < 5 || todayIndex > 24) {//未开启 return resResult(STATUS.ACTIVITY_CLOSED); } - if (todayIndex < dayIndex) { + if (dayIndex > todayIndex) { return resResult(STATUS.ACTIVITY_DAY_INDEX_OVER); } + let openTime = SERVER_OPEN_TIME; + //开服第一个月可以签到之前未领取的奖励,下个月只能签到当天奖励 + if (moment(openTime).diff(moment(), 'months') != 1 && (dayIndex != todayIndex)) { + return resResult(STATUS.ACTIVITY_SIGNIN_EXPIRE); + } let activityData = await signInActivity(ACTIVITY_TYPE.SIGN_IN, serverId, roleId); if (!activityData) {//未配置活动数据 @@ -76,9 +83,25 @@ export class SignInHandler { return resResult(STATUS.ACTIVITY_EXPIRE); } + + let playerData = await getPlayerSignInData(activityId, serverId, roleId) if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); + let roundIndex = playerData.roundIndex; + + //高级签到开启条件 + let { lv } = await RoleModel.findByRoleId(roleId); + if (playerData.type == ACTIVITY_TYPE.SIGN_IN_VIP) { + if (!canBuyVip(lv)) + return resResult(STATUS.ACTIVITY_SIGNIN_VIP_CONDITION); + + if (!await ActivitySignInModel.isBuyVip(activityId, roleId, roundIndex)) { + return resResult(STATUS.ACTIVITY_SIGNIN_VIP_CONDITION); + } + } + + let signinItemData: SignInItem = playerData.findDayItem(dayIndex); if (!signinItemData) { return resResult(STATUS.ACTIVITY_DATA_ERROR); @@ -87,7 +110,7 @@ export class SignInHandler { return resResult(STATUS.ACTIVITY_REWARDED); } - await ActivitySignInModel.addSignInRecord(activityId, roleId, dayIndex); + await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex); let reward = signinItemData.goodReward(); let goods = await addItems(roleId, roleName, sid, reward); let heroReward = signinItemData.heroReward(); diff --git a/game-server/app/services/orderService.ts b/game-server/app/services/orderService.ts index 21e212ba8..538bbb0ba 100644 --- a/game-server/app/services/orderService.ts +++ b/game-server/app/services/orderService.ts @@ -6,6 +6,7 @@ import { dicRMB } from '../pubUtils/dictionary/DicRMB'; import { makeYuanbaoShopReward } from './yuanbaoService'; import { RoleModel } from '../db/Role'; import { makeMonthlyTicketReward } from './monthlyTicketService'; +import { makeSignInVIP } from './signInService'; @@ -37,6 +38,11 @@ export async function makeOrder(localOrderID: string, sid: string) { const roleInfo = await RoleModel.findByRoleId(roleId); switch (productType) { + case ACTIVITY_TYPE.SIGN_IN_VIP: + { + let resule = await makeSignInVIP(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID) + break; + } case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE: { break; diff --git a/game-server/app/services/signInService.ts b/game-server/app/services/signInService.ts index 7f87027eb..7ea92c850 100644 --- a/game-server/app/services/signInService.ts +++ b/game-server/app/services/signInService.ts @@ -1,3 +1,5 @@ +import moment = require('moment'); +import { SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT } from '../consts'; import { ActivityModel, ActivityModelType } from '../db/Activity'; import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn'; import { SignInData, SignInItem } from '../domain/activityField/signInField'; @@ -29,12 +31,43 @@ export async function signInActivity(type: number, serverId: number, roleId: str */ export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) { let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); - let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId); - let playerData = new SignInData(activityData); + let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex); + playerData.setPlayerRecords(playerRecords); return playerData; } +/** + * 购买vip签到 + * + * @param {number} serverId 区Id + * @param {number} activityId 活动Id + * @param {string} roleId 角色Id + * @param {string} productID 商品ID + * + */ +export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], + activityId: number, productID: string) { + let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); + let playerData = new SignInData(activityData); + + await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex); +} + +//高级签到开启条件 +export async function canBuyVip(lv: number) { + //高级签到开启条件 + let openTime = SERVER_OPEN_TIME; + if (moment(openTime).valueOf() + 24 * 60 * 60 * 1000 * 8 > moment(new Date()).valueOf()) {//开服时间8天后才能开启vip签到 + return false; + } + // let { lv } = await RoleModel.findByRoleId(roleId); + if (lv < SIGNIN_VIP_OPEN_LIMIT) {//玩家等级大于等于15级才能开启vip签到 + return false + } + return true; +} + diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index 461a5c145..2a28669b0 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -9,7 +9,7 @@ export enum ACTIVITY_TYPE { TASK_GROWTH = 2, // 成长任务活动 TASK_DAILY_CHALLENGES = 3, // 今日挑战活动 SIGN_IN = 4, // 签到活动 - SIGN_IN_VIP = 5, // 签到活动(高级) + SIGN_IN_VIP = 5, // 签到活动(高级)RMB购买 GROWTH_FUND_MAIN = 6, // 主线成长基金 GROWTH_FUND_MAIN_VIP = 7, // 主线成长基金(高阶) GROWTH_FUND_TOWER = 8, // 镇念塔成长基金 @@ -83,3 +83,8 @@ export enum ORDER_STATE { CHECK_ORDER = 2, // 触发查询订单 RESULT_FAIL = 3, // 订单失败 } + +//服务器开服时间 +export const SERVER_OPEN_TIME = '2021-02-11T20:03:16.637+08:00'; +//玩家等级大于等于15级才能开启vip签到 +export const SIGNIN_VIP_OPEN_LIMIT = 15; diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index cc383f013..e56647082 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -354,6 +354,8 @@ export const STATUS = { ACTIVITY_NEW_PLAYER_LIMIT_PACKAGE_END: { code: 50017, simStr: '新手礼包结束' }, ACTIVITY_RECHARGE_MONEY_ERROR: { code: 50018, simStr: '充值数据错误' }, ACTIVITY_RECHARGE_MONEY_NO_REWARD: { code: 50019, simStr: '没有可领取的奖励' }, + ACTIVITY_SIGNIN_VIP_CONDITION: { code: 50020, simStr: '开启条件不足' }, + ACTIVITY_SIGNIN_EXPIRE: { code: 50021, simStr: '签到过期,补签' }, // GM后台相关状态 60000 - 69999 GM_ERR_PASSWORD: { code: 60001, simStr: '账号或密码错误' }, GM_MISS_API: { code: 60002, simStr: '未找到该接口' }, diff --git a/shared/db/ActivityRechargeMoney.ts b/shared/db/ActivityRechargeMoney.ts index 8a8e8d19a..5e0b9ffdd 100644 --- a/shared/db/ActivityRechargeMoney.ts +++ b/shared/db/ActivityRechargeMoney.ts @@ -41,7 +41,6 @@ export default class ActivityRechargeMoney extends BaseModel { { $set: { isEnd: true } }, { multi: true, }); } - //查询 public static async findData(serverId: number, roleId: string) { let result: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.find({ serverId, roleId, isEnd: { $ne: true } }).lean(true); diff --git a/shared/db/ActivitySignIn.ts b/shared/db/ActivitySignIn.ts index 54504be88..36750c94a 100644 --- a/shared/db/ActivitySignIn.ts +++ b/shared/db/ActivitySignIn.ts @@ -12,32 +12,47 @@ export default class ActivitySignIn extends BaseModel { @prop({ required: true }) roleId: string; // 用户Id @prop({ required: true }) + roundIndex: number; // 周期数,从活动设置的开始时间计算 + @prop({ required: true }) dayIndex: number; // 第几天 从1开始 @prop({ required: true }) isReceive: boolean; // 是否领取 //签到记录 - public static async addSignInRecord(activityId: number, roleId: string, dayIndex: number, lean = true) { - let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, dayIndex }, + public static async addSignInRecord(activityId: number, roleId: string, roundIndex: number, dayIndex: number, lean = true) { + let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, roundIndex, dayIndex }, { $set: { isReceive: true } }, { upsert: true, new: true }).lean(lean); return result; } //根据活动id查询活动数据 - public static async findData(activityId: number, roleId: string, lean = true) { - let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId }).lean(lean); + public static async findData(activityId: number, roleId: string, roundIndex: number, lean = true) { + let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, roundIndex }).lean(lean); return result; } //查询第几天的活动数据 - public static async findDataByDayIndex(activityId: number, roleId: string, dayIndex: number, lean = true) { - let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, dayIndex }).lean(lean); + public static async findDataByDayIndex(activityId: number, roleId: string, roundIndex: number, dayIndex: number, lean = true) { + let result: ActivitySignInModelType[] = await ActivitySignInModel.find({ roleId, activityId, roundIndex, dayIndex }).lean(lean); + return result; + } + + //查询第几天的活动数据 + public static async isBuyVip(activityId: number, roleId: string, roundIndex: number) { + let result: ActivitySignInModelType = await ActivitySignInModel.findOne({ roleId, activityId, roundIndex, dayIndex: 0 }).lean(true); + return result; + } + + //购买vip记录 + public static async buyVIP(activityId: number, roleId: string, roundIndex: number) { + let result: ActivitySignInModelType = await ActivitySignInModel.findOneAndUpdate({ roleId, activityId, roundIndex }, + { $set: { dayIndex: 0 } }, { upsert: true, new: true }).lean(true); return result; } //删除签到记录 - public static async deleteActivity(activityId: number, roleId: string, dayIndex: number) { - await ActivitySignInModel.deleteMany({ roleId, activityId, dayIndex }); + public static async deleteActivity(activityId: number, roleId: string, roundIndex: number, dayIndex: number) { + await ActivitySignInModel.deleteMany({ roleId, activityId, roundIndex, dayIndex }); } } diff --git a/shared/domain/activityField/rechargeMoneyField.ts b/shared/domain/activityField/rechargeMoneyField.ts index cc304e218..08dc98c97 100644 --- a/shared/domain/activityField/rechargeMoneyField.ts +++ b/shared/domain/activityField/rechargeMoneyField.ts @@ -29,7 +29,7 @@ export class RechargeMoneyData extends ActivityBase { totalCount: number = 0;//一共可领取次数 receiveCount: number = 0;//已经领取次数 - recordArray = [] + recordArray: ActivityRechargeMoneyModelType[] = []; //当前回合最后一个 public isLast() { diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index 4a0cc1c25..c1b452fee 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -1,3 +1,4 @@ +import moment = require('moment'); import { ACTIVITY_RESOURCES_TYPE } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivitySignInModelType } from '../../db/ActivitySignIn'; @@ -49,6 +50,8 @@ export class SignInItem { // 成长活动数据 export class SignInData extends ActivityBase { list: Array = []; + roundIndex: number = 0;//活动周期 + todayIndex: number = 0;//本月第几天 //第几天的签到奖励 public findDayItem(dayIndex: number) { @@ -68,6 +71,11 @@ export class SignInData extends ActivityBase { public initData(data: string) { let arr = JSON.parse(data); + + this.roundIndex = moment(this.beginTime).diff(moment(), 'months'); + console.log('dddddddddddd', this.roundIndex); + this.todayIndex = moment(Date.now()).date(); + for (let obj of arr) { console.log('obj', obj) this.list.push(new SignInItem(obj))