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

活动：vip签到判断购买条件

Browse Source
This commit is contained in:
qiaoxin
2021-05-15 15:20:00 +08:00
parent ee49699abd
commit 089617b6e9
10 changed files with 117 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/rechargeMoneyHandler.ts
+1 -1
View File
@@ -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)
game-server/app/servers/activity/handler/signInHandler.ts
+35 -12
View File
@@ -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();
game-server/app/services/orderService.ts
+6
View File
@@ -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;
game-server/app/services/signInService.ts
+35 -2
View File
@@ -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;
}