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

活动：每日挑战添加服务器id

Browse Source
This commit is contained in:
qiaoxin
2021-05-20 18:41:37 +08:00
parent a2dc4c6239
commit d637e5701d
8 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/sevenDaysHandler.ts
+18 -22
View File
@@ -179,17 +179,15 @@ export class SevenDaysHandler {
} }
await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, 0); await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, 0);
let reward = dailyItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = dailyItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
return resResult(STATUS.SUCCESS, { goods, addHeros }); 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: msg,
item: dailyItemData,
}));
} }
@@ -249,21 +247,19 @@ export class SevenDaysHandler {
let result = await handleCost(roleId, sid, [{ id: consumeData.id, count: consumeData.count }]); let result = await handleCost(roleId, sid, [{ id: consumeData.id, count: consumeData.count }]);
if (!result) return resResult(STATUS.ACTIVITY_RES_NOT_ENOUGH); if (!result) return resResult(STATUS.ACTIVITY_RES_NOT_ENOUGH);
} else if (consumeType == ACTIVITY_RESOURCES_TYPE.RMB) {//RMB购买 } else if (consumeType == ACTIVITY_RESOURCES_TYPE.RMB) {//RMB购买
return resResult(STATUS.ACTIVITY_NEED_PAY);
} }
await ActivityDailyGiftsModel.buyRecord(activityId, roleId, dayIndex, cellIndex, 1); await ActivityDailyGiftsModel.buyRecord(serverId, activityId, roleId, dayIndex, cellIndex, 1);
let reward = dailyItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = dailyItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
return resResult(STATUS.SUCCESS, { goods, addHeros }); 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: msg,
item: dailyItemData,
}));
} }
} }
game-server/app/services/dailyChallengesService.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
*/ */
export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) { export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(activityId, roleId); let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
let playerData = new DailyChallengesData(activityData); let playerData = new DailyChallengesData(activityData);
playerData.setPlayerRecords(playerRecords); playerData.setPlayerRecords(playerRecords);
game-server/app/services/dailyGiftsService.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
*/ */
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) { export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(activityId, roleId); let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
let playerData = new DailyGiftsData(activityData); let playerData = new DailyGiftsData(activityData);
playerData.setPlayerRecords(playerRecords); playerData.setPlayerRecords(playerRecords);
shared/db/ActivityDailyChallenges.ts
+18 -16
View File
@@ -7,6 +7,8 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
@index({ roleId: 1 }) @index({ roleId: 1 })
export default class ActivityDailyChallenges extends BaseModel { export default class ActivityDailyChallenges extends BaseModel {
@prop({ required: true })
serverId: number; // 服id
@prop({ required: true }) @prop({ required: true })
activityId: number; // 活动Id activityId: number; // 活动Id
@prop({ required: true }) @prop({ required: true })
@@ -23,55 +25,55 @@ export default class ActivityDailyChallenges extends BaseModel {
receiveRewardCount: number; // 领取奖励次数 receiveRewardCount: number; // 领取奖励次数
//任务领取记录 //任务领取记录
public static async addCellRecord(activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, count: number, lean = true) { public static async addCellRecord(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, count: number, lean = true) {
let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ roleId, activityId, dayIndex, cellIndex, type }, let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex, type },
{ $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(lean); { $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(lean);
return result; return result;
} }
//根据活动统计完成任务次数 //根据活动统计完成任务次数
public static async setTaskCount(activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, count: number, lean = true) { public static async setTaskCount(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, count: number, lean = true) {
let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ roleId, activityId, dayIndex, cellIndex, type }, let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex, type },
{ $set: { totalCount: count } }, { upsert: true, new: true }).lean(lean); { $set: { totalCount: count } }, { upsert: true, new: true }).lean(lean);
return result; return result;
} }
//根据活动统计完成任务次数 //根据活动统计完成任务次数
public static async addTaskCount(activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, addCount: number, lean = true) { public static async addTaskCount(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, type: number, addCount: number, lean = true) {
let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ roleId, activityId, dayIndex, cellIndex, type }, let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex, type },
{ $inc: { totalCount: addCount } }, { upsert: true, new: true }).lean(lean); { $inc: { totalCount: addCount } }, { upsert: true, new: true }).lean(lean);
return result; return result;
} }
//根据活动id查询活动数据 //根据活动id查询活动数据
public static async findData(activityId: number, roleId: string, lean = true) { public static async findData(serverId: number, activityId: number, roleId: string, lean = true) {
let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ roleId, activityId }).lean(lean); let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ serverId, roleId, activityId }).lean(lean);
return result; return result;
} }
//查询第几天的活动数据 //查询第几天的活动数据
public static async findDataByDayIndex(activityId: number, roleId: string, dayIndex: number, lean = true) { public static async findDataByDayIndex(serverId: number, activityId: number, roleId: string, dayIndex: number, lean = true) {
let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ roleId, activityId, dayIndex }).lean(lean); let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ serverId, roleId, activityId, dayIndex }).lean(lean);
return result; return result;
} }
//查询第几天某个的活动数据 //查询第几天某个的活动数据
public static async findDataByCellIndex(activityId: number, roleId: string, dayIndex: number, cellIndex: number, lean = true) { public static async findDataByCellIndex(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, lean = true) {
let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ roleId, activityId, dayIndex, cellIndex }).lean(lean); let result: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.find({ serverId, roleId, activityId, dayIndex, cellIndex }).lean(lean);
return result; return result;
} }
//新增领取记录 //新增领取记录
public static async addData(activityId: number, roleId: string, dayIndex: number, cellIndex: number, count: number, lean = true) { public static async addData(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, count: number, lean = true) {
let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ roleId, activityId, dayIndex, cellIndex }, let result: ActivityDailyChallengesModelType = await ActivityDailyChallengesModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex },
{ $: { count: count } }, { $: { count: count } },
{ upsert: true, new: true }).lean(lean); { upsert: true, new: true }).lean(lean);
return result; return result;
} }
//删除活动领取记录 //删除活动领取记录
public static async deleteActivity(activityId: number, roleId: string, dayIndex: number, cellIndex: number) { public static async deleteActivity(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number) {
await ActivityDailyChallengesModel.deleteMany({ roleId, activityId, dayIndex, cellIndex }); await ActivityDailyChallengesModel.deleteMany({ serverId, roleId, activityId, dayIndex, cellIndex });
} }
} }
shared/db/ActivityDailyGifts.ts
+12 -10
View File
@@ -8,6 +8,8 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
@index({ roleId: 1 }) @index({ roleId: 1 })
export default class ActivityDailyGifts extends BaseModel { export default class ActivityDailyGifts extends BaseModel {
@prop({ required: true })
serverId: number; // 服Id
@prop({ required: true }) @prop({ required: true })
activityId: number; // 活动Id activityId: number; // 活动Id
@prop({ required: true }) @prop({ required: true })
@@ -20,33 +22,33 @@ export default class ActivityDailyGifts extends BaseModel {
buyCount: number; // 购买次数 buyCount: number; // 购买次数
//购买记录 //购买记录
public static async buyRecord(activityId: number, roleId: string, dayIndex: number, cellIndex: number, count: number, lean = true) { public static async buyRecord(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, count: number, lean = true) {
let result: ActivityDailyGiftsModelType = await ActivityDailyGiftsModel.findOneAndUpdate({ roleId, activityId, dayIndex, cellIndex }, let result: ActivityDailyGiftsModelType = await ActivityDailyGiftsModel.findOneAndUpdate({ serverId, roleId, activityId, dayIndex, cellIndex },
{ $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(lean); { $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(lean);
return result; return result;
} }
//根据活动id查询活动数据 //根据活动id查询活动数据
public static async findData(activityId: number, roleId: string, lean = true) { public static async findData(serverId: number, activityId: number, roleId: string, lean = true) {
let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ roleId, activityId }).lean(lean); let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ serverId, roleId, activityId }).lean(lean);
return result; return result;
} }
//查询第几天的活动数据 //查询第几天的活动数据
public static async findDataByDayIndex(activityId: number, roleId: string, dayIndex: number, lean = true) { public static async findDataByDayIndex(serverId: number, activityId: number, roleId: string, dayIndex: number, lean = true) {
let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ roleId, activityId, dayIndex }).lean(lean); let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ serverId, roleId, activityId, dayIndex }).lean(lean);
return result; return result;
} }
//查询第几天某个的活动数据 //查询第几天某个的活动数据
public static async findDataByCellIndex(activityId: number, roleId: string, dayIndex: number, cellIndex: number, lean = true) { public static async findDataByCellIndex(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number, lean = true) {
let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ roleId, activityId, dayIndex, cellIndex }).lean(lean); let result: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.find({ serverId, roleId, activityId, dayIndex, cellIndex }).lean(lean);
return result; return result;
} }
//删除活动领取记录 //删除活动领取记录
public static async deleteActivity(activityId: number, roleId: string, dayIndex: number, cellIndex: number) { public static async deleteActivity(serverId: number, activityId: number, roleId: string, dayIndex: number, cellIndex: number) {
await ActivityDailyGiftsModel.deleteMany({ roleId, activityId, dayIndex, cellIndex }); await ActivityDailyGiftsModel.deleteMany({ serverId, roleId, activityId, dayIndex, cellIndex });
} }
} }
shared/db/ActivityGrowth.ts
+2
View File
@@ -7,6 +7,8 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
@index({ roleId: 1 }) @index({ roleId: 1 })
export default class ActivityGrowth extends BaseModel { export default class ActivityGrowth extends BaseModel {
@prop({ required: true })
serverId: number; // 活动Id
@prop({ required: true }) @prop({ required: true })
activityId: number; // 活动Id activityId: number; // 活动Id
@prop({ required: true }) @prop({ required: true })
shared/domain/activityField/dailyGiftsField.ts
+3
View File
@@ -26,6 +26,7 @@ export class DailyGiftItem {
this.name = data.name; this.name = data.name;
this.consume = data.consume; this.consume = data.consume;
this.reward = data.reward; this.reward = data.reward;
this.maxCount = data.maxCount;
this.discount = data.discount; this.discount = data.discount;
} }
@@ -77,6 +78,8 @@ export class DailyGiftsData extends ActivityBase {
let index = data.findIndex(record => { return obj.dayIndex == record.dayIndex && obj.cellIndex == record.cellIndex }) let index = data.findIndex(record => { return obj.dayIndex == record.dayIndex && obj.cellIndex == record.cellIndex })
if (index != -1) { if (index != -1) {
obj.buyCount = data[index].buyCount; obj.buyCount = data[index].buyCount;
} else {
obj.buyCount = 0;
} }
} }
} }
shared/pubUtils/taskUtil.ts
+2 -2
View File
@@ -508,9 +508,9 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count:
let addCount = isComplete(roleId, task.taskType, task.taskParam, count, parma); let addCount = isComplete(roleId, task.taskType, task.taskParam, count, parma);
if (addCount) { if (addCount) {
if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) { if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) {
await ActivityDailyChallengesModel.setTaskCount(growthActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount); await ActivityDailyChallengesModel.setTaskCount(activity.serverId, growthActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);
} else { } else {
await ActivityDailyChallengesModel.addTaskCount(growthActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount); await ActivityDailyChallengesModel.addTaskCount(activity.serverId, growthActivity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);
} }
} }
} }