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

活动：幸运转盘循环记录

Browse Source
This commit is contained in:
luying
2022-10-17 16:04:34 +08:00
parent 35ceef87b4
commit ddff18eb20
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/luckyTurntableHandler.ts
+2 -2
View File
@@ -60,7 +60,7 @@ export class LuckyTurntableHandler {
if(!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH); if(!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let { result, records, goodResult } = playerData.pull(roleName, count); let { result, records, goodResult } = playerData.pull(roleName, count);
await ActivityTurntableModel.updateData(serverId, activityId, roleId, {...pick(playerData, ['todayCount', 'count', 'records', 'greatRewardCount']), refTodayCount: new Date()}); await ActivityTurntableModel.updateData(serverId, activityId, roleId, playerData.roundIndex, {...pick(playerData, ['todayCount', 'count', 'records', 'greatRewardCount']), refTodayCount: new Date()});
await addItems(roleId, roleName, sid, goodResult, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL); await addItems(roleId, roleName, sid, goodResult, ITEM_CHANGE_REASON.ACT_TURNTABLE_PULL);
return resResult(STATUS.SUCCESS, { result, records, todayCount: playerData.todayCount, count: playerData.count }); return resResult(STATUS.SUCCESS, { result, records, todayCount: playerData.todayCount, count: playerData.count });
@@ -91,7 +91,7 @@ export class LuckyTurntableHandler {
let box = playerData.findBox(boxCount); let box = playerData.findBox(boxCount);
let rewardArray = stringToRewardParam(box.rewards) let rewardArray = stringToRewardParam(box.rewards)
let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.BUY_LIMIT_PACKAGE); let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.BUY_LIMIT_PACKAGE);
await ActivityTurntableModel.receiveBox(serverId, activityId, roleId, boxCount); await ActivityTurntableModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, boxCount);
return resResult(STATUS.SUCCESS, { ...result, box: {...box, isReceived: true} }); return resResult(STATUS.SUCCESS, { ...result, box: {...box, isReceived: true} });
} }
game-server/app/services/activity/luckyTurntableService.ts
+5 -5
View File
@@ -15,14 +15,14 @@ import { getActivityById } from "./activityService";
*/ */
export async function getPlayerLuckyTurntableData(activityId: number, serverId: number, roleId: string) { export async function getPlayerLuckyTurntableData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId); let activityData = await getActivityById(activityId);
let playerRecord = await ActivityTurntableModel.findByActivityId(serverId, activityId, roleId);
if(playerRecord && shouldRefresh(playerRecord.refTodayCount, new Date())) {
playerRecord = await ActivityTurntableModel.refreshTodayCount(serverId, activityId, roleId);
}
let createTime = await getRoleCreateTime(roleId); let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId); let serverTime = await getServerCreateTime(serverId);
let playerData = new LuckyTurntableData(activityData, createTime, serverTime); let playerData = new LuckyTurntableData(activityData, createTime, serverTime);
let playerRecord = await ActivityTurntableModel.findByActivityId(serverId, activityId, roleId, playerData.roundIndex);
if(playerRecord && shouldRefresh(playerRecord.refTodayCount, new Date())) {
playerRecord = await ActivityTurntableModel.refreshTodayCount(serverId, activityId, roleId, playerData.roundIndex);
}
playerData.setPlayerRecords(playerRecord); playerData.setPlayerRecords(playerRecord);
return playerData; return playerData;
} }
shared/db/ActivityTurntableRec.ts
+11 -8
View File
@@ -28,6 +28,9 @@ export default class Activity_Turntable_Rec extends BaseModel {
@prop({ required: true }) @prop({ required: true })
roleId: string; // 用户id roleId: string; // 用户id
@prop({ required: true })
roundIndex: number; // 循环次数
@prop({ required: true }) @prop({ required: true })
count: number; // 抽卡次数 count: number; // 抽卡次数
@@ -46,23 +49,23 @@ export default class Activity_Turntable_Rec extends BaseModel {
@prop({ required: true, type: Number }) @prop({ required: true, type: Number })
box: number[]; // 宝箱已领取次数 box: number[]; // 宝箱已领取次数
public static async findByActivityId(serverId: number, activityId: number, roleId: string) { public static async findByActivityId(serverId: number, activityId: number, roleId: string, roundIndex: number) {
let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOne({ roleId, activityId, serverId }).lean(); let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOne({ roleId, activityId, serverId, roundIndex }).lean();
return rec; return rec;
} }
public static async updateData(serverId: number, activityId: number, roleId: string, update: ActivityTurntableModelTypeParam) { public static async updateData(serverId: number, activityId: number, roleId: string, roundIndex: number, update: ActivityTurntableModelTypeParam) {
let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId }, { $set: update }, { upsert: true, new: true }).lean(); let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, { $set: update }, { upsert: true, new: true }).lean();
return rec; return rec;
} }
public static async refreshTodayCount(serverId: number, activityId: number, roleId: string) { public static async refreshTodayCount(serverId: number, activityId: number, roleId: string, roundIndex: number) {
let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId }, {$set: { todayCount: 0, refTodayCount: new Date() }}).lean(); let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, {$set: { todayCount: 0, refTodayCount: new Date() }}).lean();
return rec; return rec;
} }
public static async receiveBox(serverId: number, activityId: number, roleId: string, boxCount: number) { public static async receiveBox(serverId: number, activityId: number, roleId: string, roundIndex: number, boxCount: number) {
let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId }, {$addToSet: { box: boxCount }}, { new: true }).lean(); let rec: ActivityTurntableModelType = await ActivityTurntableModel.findOneAndUpdate({ roleId, activityId, serverId, roundIndex }, {$addToSet: { box: boxCount }}, { new: true }).lean();
return rec; return rec;
} }
} }