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

活动：重写七天乐活动的数据结构

Browse Source
This commit is contained in:
qiaoxin
2021-06-04 11:54:47 +08:00
parent f77de8eb78
commit d6134ce67e
12 changed files with 852 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
game-server/app/servers/activity/handler/activityHandler.ts
View File

@@ -17,6 +17,7 @@ import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../servi
import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService';
import { popUpShopActivity } from '../../../services/popUpShopService';
import { vipRechargeMoneyActivity } from '../../../services/vipRechargeMoneyService';
import { sevenDaysActivity } from '../../../services/sevenDaysService';
// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
// import { isComplete } from '../../../pubUtils/taskUtil';
@@ -42,44 +43,44 @@ export class ActivityHandler {
let test = true;
let playerActivityArray = [];
//七天乐活动-成长任务 1 2 3
{
let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
if (new Date() < endTime || test) {//开启中，开服7天后过期
let sevenData = [];
let growthData = await growthActivity(serverId, roleId);
if (growthData) {
sevenData.push({
type: ACTIVITY_TYPE.TASK_GROWTH,
activityId: growthData.activityId,
data: growthData,
});
}
let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
if (dailyChallengesData) {
sevenData.push({
type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
activityId: dailyChallengesData.activityId,
data: dailyChallengesData,
});
}
let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
if (dailyGiftsData) {
sevenData.push({
type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
activityId: dailyGiftsData.activityId,
data: dailyGiftsData,
});
}
if (sevenData.length > 0) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SEVEN_DAY,
activityId: 0,
data: sevenData,
});
}
}
}
// //七天乐活动-成长任务 1 2 3
// {
// let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
// if (new Date() < endTime || test) {//开启中，开服7天后过期
// let sevenData = [];
// let growthData = await growthActivity(serverId, roleId);
// if (growthData) {
// sevenData.push({
// type: ACTIVITY_TYPE.TASK_GROWTH,
// activityId: growthData.activityId,
// data: growthData,
// });
// }
// let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
// if (dailyChallengesData) {
// sevenData.push({
// type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
// activityId: dailyChallengesData.activityId,
// data: dailyChallengesData,
// });
// }
// let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
// if (dailyGiftsData) {
// sevenData.push({
// type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
// activityId: dailyGiftsData.activityId,
// data: dailyGiftsData,
// });
// }
// if (sevenData.length > 0) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SEVEN_DAY,
// activityId: 0,
// data: sevenData,
// });
// }
// }
// }
//14天乐活动-成长任务 1 2 3
// {
// let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
@@ -383,6 +384,42 @@ export class ActivityHandler {
});
}
}
//七天乐活动 27
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
//十四天乐活动 28
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.FOURTEEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.FOURTEEN_DAY,
activityId: data.activityId,
data,
});
}
}
//通用七天乐活动 29
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.COMMON_SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.COMMON_SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
return resResult(STATUS.SUCCESS, { playerActivityArray });
}

79
game-server/app/servers/activity/handler/dailyChallengesHandler.ts Normal file
View File

@@ -0,0 +1,79 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS } from '../../../consts';
import { getPlayerDailyChallengesData } from '../../../services/dailyChallengesService';
import { DailyItem } from '../../../domain/activityField/dailyChallengesField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
export default function (app: Application) {
return new DailyChallengesHandler(app);
}
export class DailyChallengesHandler {
constructor(private app: Application) {
}
/************************今日挑战****************************/
/**
* @description 获取今日挑战活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof DailyChallengesHandler
*/
async getDailyChallengesActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyChallengesData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 获取今日挑战的单个奖励
* @param {{ activityId: number, dayIndex: number, cellIndex: number, type: number}} msg
* @param {BackendSession} session
* @memberof DailyChallengesHandler
*/
async getDailyChallengeReward(msg: { activityId: number, dayIndex: number, cellIndex: number, type: number }, session: BackendSession) {
const { activityId, dayIndex, cellIndex, type } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerDailyChallengesData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let dailyItemData: DailyItem = playerData.findDailyChallengesItem(dayIndex, cellIndex, type);
if (!dailyItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (!dailyItemData.isComplete()) {//未完成任务
return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
}
if (!dailyItemData.canReceive()) {//已经领取过
return resResult(STATUS.ACTIVITY_REWARDED);
}
await ActivityDailyChallengesModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
dailyItemData.receiveRewardCount = 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, dayIndex, cellIndex, type },
item: dailyItemData,
}));
}
}

92
game-server/app/servers/activity/handler/dailyGiftsHandler.ts Normal file
View File

@@ -0,0 +1,92 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, ACTIVITY_RESOURCES_TYPE } from '../../../consts';
import { handleCost } from '../../../services/rewardService';
import { getPlayerDailyGiftsData } from '../../../services/dailyGiftsService';
import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField';
import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
export default function (app: Application) {
return new DailyGiftsHandler(app);
}
export class DailyGiftsHandler {
constructor(private app: Application) {
}
/************************每日特惠礼包****************************/
/**
* @description 获取每日特惠礼包活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof DailyGiftsHandler
*/
async getDailyGiftsActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 购买每日特惠礼包
* @param {{ activityId: number, dayIndex: number, cellIndex: number}} msg
* @param {BackendSession} session
* @memberof DailyGiftsHandler
*/
async buyDailyGiftsCell(msg: { activityId: number, dayIndex: number, cellIndex: number }, session: BackendSession) {
const { activityId, dayIndex, cellIndex } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let dailyItemData: DailyGiftItem = playerData.findDailyGiftsItem(dayIndex, cellIndex);
if (!dailyItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (!dailyItemData.canBuy()) {//最大次数
return resResult(STATUS.ACTIVITY_MAX_COUNT);
}
if (dayIndex > playerData.today()) {//还未开启
return resResult(STATUS.ACTIVITY_UNOPENED);
}
//货币是否足够
let consumeData = dailyItemData.consumeRes();
let consumeType = consumeData.type;//购买类型
if (consumeType == ACTIVITY_RESOURCES_TYPE.GOODS) {//物品表，元宝、金币、体力
let result = await handleCost(roleId, sid, [{ id: consumeData.id, count: consumeData.count }]);
if (!result) return resResult(STATUS.ACTIVITY_RES_NOT_ENOUGH);
} else if (consumeType == ACTIVITY_RESOURCES_TYPE.RMB) {//RMB购买
return resResult(STATUS.ACTIVITY_NEED_PAY);
}
await ActivityDailyGiftsModel.buyRecord(serverId, activityId, roleId, dayIndex, cellIndex, 1);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
dailyItemData.buyCount += 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, dayIndex, cellIndex },
item: dailyItemData,
}));
}
}

119
game-server/app/servers/activity/handler/growthHandler.ts Normal file
View File

@@ -0,0 +1,119 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS } from '../../../consts';
import { getPlayerGrowthData } from '../../../services/growthService';
import { GrowthItem, PointRewardItem } from '../../../domain/activityField/growthField';
import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
export default function (app: Application) {
return new GrowthHandler(app);
}
export class GrowthHandler {
constructor(private app: Application) {
}
/************************成长任务****************************/
/**
* @description 获取成长任务活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof GrowthHandler
*/
async getGrowthActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 获取成长任务每天完成的单个奖励
* @param {{ activityId: number, dayIndex: number, cellIndex: number, type: number}} msg
* @param {BackendSession} session
* @memberof GrowthHandler
*/
async getGrowthCellReward(msg: { activityId: number, dayIndex: number, cellIndex: number, type: number }, session: BackendSession) {
const { activityId, dayIndex, cellIndex, type } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let growthItemData: GrowthItem = playerData.findGrowthItem(dayIndex, cellIndex, type);
if (!growthItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (!growthItemData.isComplete()) {//未完成任务
return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED);
}
if (!growthItemData.canReceive()) {//已经领取过
return resResult(STATUS.ACTIVITY_REWARDED);
}
await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(growthItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
growthItemData.receiveRewardCount = 1;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, dayIndex, cellIndex, type },
item: growthItemData,
}));
}
/**
* @description 成长任务每天奖章兑换奖励
* @param {{ activityId: number, id: number}} msg
* @param {BackendSession} session
* @memberof GrowthHandler
*/
async getGrowthDayReward(msg: { activityId: number, id: number }, session: BackendSession) {
const { activityId, id } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let pointItemData: PointRewardItem = playerData.findPointItem(id);
if (!pointItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (playerData.getTotalPoint() < pointItemData.progress) {
return resResult(STATUS.ACTIVITY_NO_POINT);
}
if (pointItemData.getPointReward) {//已经领取过
return resResult(STATUS.ACTIVITY_REWARDED);
}
await ActivityGrowthPointModel.addRecord(serverId, activityId, roleId, id);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(pointItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
pointItemData.getPointReward = true;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, id },
item: pointItemData,
}));
}
}

83
game-server/app/servers/activity/handler/sevenDaysHandler.ts
View File

@@ -1,19 +1,15 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, ACTIVITY_RESOURCES_TYPE } from '../../../consts';
import { getPlayerGrowthData } from '../../../services/growthService';
import { getPlayerDailyChallengesData } from '../../../services/dailyChallengesService';
import { GrowthItem, PointRewardItem } from '../../../domain/activityField/growthField';
import { addItems, createHeroes, handleCost } from '../../../services/rewardService';
import { handleCost } from '../../../services/rewardService';
import { ActivityGrowthModel } from '../../../db/ActivityGrowth';
import { DailyItem } from '../../../domain/activityField/dailyChallengesField';
import { getPlayerDailyGiftsData } from '../../../services/dailyGiftsService';
import { DailyGiftItem } from '../../../domain/activityField/dailyGiftsField';
import { ActivityDailyGiftsModel } from '../../../db/ActivityDailyGifts';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
import { ActivityGrowthPointModel } from '../../../db/ActivityGrowthPoint';
import { getPlayerSevenDaysData, getPlayerSevenDaysGrowthData, getPlayerSevenDaysDailyChallengesData, getPlayerSevenDaysDailyGiftsData } from '../../../services/sevenDaysService';
import { SevenDaysGrowthItem, SevenDaysPointRewardItem, SevenDaysDailyItem, SevenDaysDailyGiftItem } from '../../../domain/activityField/sevenDaysField';
export default function (app: Application) {
@@ -24,26 +20,27 @@ export class SevenDaysHandler {
constructor(private app: Application) {
}
/************************成长任务****************************/
/**第一个七天乐(人物注册时间-人物注册时间第7天结束），开启第二个七天乐(人物注册时间第8天-人物注册时间第14天结束）;之后会有七天乐
* @description 获取七天乐活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof SevenDaysHandler
*/
async getSevenDaysGrowthActivity(msg: { activityId: number }, session: BackendSession) {
/**
* @description 获取七天乐活动总的数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof SevenDaysHandler
*/
async getSevenDaysActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
let playerData = await getPlayerSevenDaysData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/************************成长任务****************************/
/**
* @description 获取成长任务每天完成的单个奖励
* @param {{ activityId: number, dayIndex: number, cellIndex: number, type: number}} msg
@@ -58,10 +55,10 @@ export class SevenDaysHandler {
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
let playerData = await getPlayerSevenDaysGrowthData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let growthItemData: GrowthItem = playerData.findGrowthItem(dayIndex, cellIndex, type);
let growthItemData: SevenDaysGrowthItem = playerData.growth.findGrowthItem(dayIndex, cellIndex, type);
if (!growthItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
@@ -97,14 +94,14 @@ export class SevenDaysHandler {
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerGrowthData(activityId, serverId, roleId)
let playerData = await getPlayerSevenDaysGrowthData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let pointItemData: PointRewardItem = playerData.findPointItem(id);
let pointItemData: SevenDaysPointRewardItem = playerData.growth.findPointItem(id);
if (!pointItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (playerData.getTotalPoint() < pointItemData.progress) {
if (playerData.growth.getTotalPoint() < pointItemData.progress) {
return resResult(STATUS.ACTIVITY_NO_POINT);
}
if (pointItemData.getPointReward) {//已经领取过
@@ -126,24 +123,6 @@ export class SevenDaysHandler {
/************************今日挑战****************************/
/**
* @description 获取今日挑战活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof SevenDaysHandler
*/
async getSevenDayDailyChallengesActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyChallengesData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 获取今日挑战的单个奖励
* @param {{ activityId: number, dayIndex: number, cellIndex: number, type: number}} msg
@@ -158,10 +137,10 @@ export class SevenDaysHandler {
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerDailyChallengesData(activityId, serverId, roleId)
let playerData = await getPlayerSevenDaysDailyChallengesData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let dailyItemData: DailyItem = playerData.findDailyChallengesItem(dayIndex, cellIndex, type);
let dailyItemData: SevenDaysDailyItem = playerData.dailyChallenge.findDailyChallengesItem(dayIndex, cellIndex, type);
if (!dailyItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
@@ -187,24 +166,6 @@ export class SevenDaysHandler {
/************************每日特惠礼包****************************/
/**
* @description 获取每日特惠礼包活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof SevenDaysHandler
*/
async getSevenDayDailyGiftsActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 购买每日特惠礼包
* @param {{ activityId: number, dayIndex: number, cellIndex: number}} msg
@@ -219,10 +180,10 @@ export class SevenDaysHandler {
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
let playerData = await getPlayerSevenDaysDailyGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let dailyItemData: DailyGiftItem = playerData.findDailyGiftsItem(dayIndex, cellIndex);
let dailyItemData: SevenDaysDailyGiftItem = playerData.dailyGift.findDailyGiftsItem(dayIndex, cellIndex);
if (!dailyItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}