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

活动：修改活动bug

Browse Source
This commit is contained in:
qiaoxin
2021-05-26 16:09:13 +08:00
parent b9c6f5541c
commit 064b3258fe
32 changed files with 162 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/treasureHuntService.ts
+5 -5
View File
@@ -35,7 +35,7 @@ export async function treasureHuntActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerTreasureHuntData(activityId: number, serverId: number, roleId: string, huntRoundIndex: number, huntBeginTime: Date, huntEndTime: Date) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let playerData = new TreasureHuntData(activityData);
playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -49,7 +49,7 @@ export async function getPlayerTreasureHuntData(activityId: number, serverId: nu
}
export async function getPlayerTreasureHuntShopData(activityId: number, serverId: number, roleId: string, huntRoundIndex: number, huntBeginTime: Date, huntEndTime: Date) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let playerData = new TreasureHuntData(activityData);
playerData.beginTime = moment(huntBeginTime).valueOf();
@@ -74,7 +74,7 @@ export async function getTreasureHuntData(serverId: number) {
return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
}
tempData = await ServerTempModel.updateTreasureHuntData(serverId, huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex);
activityData = await ActivityModel.findActivity(serverId, huntActivityId, true);
activityData = await ActivityModel.findActivity(serverId, huntActivityId);
return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
}
if (now > tempData.huntEndTime) {//活动过期
@@ -83,11 +83,11 @@ export async function getTreasureHuntData(serverId: number) {
return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
}
tempData = await ServerTempModel.updateTreasureHuntData(serverId, huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex);
activityData = await ActivityModel.findActivity(serverId, huntActivityId, true);
activityData = await ActivityModel.findActivity(serverId, huntActivityId);
return { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData }
}
if (!activityData) {
activityData = await ActivityModel.findActivity(serverId, tempData.huntActivityId, true);
activityData = await ActivityModel.findActivity(serverId, tempData.huntActivityId);
}
return {
huntActivityId: tempData.huntActivityId,