From c26db282ffe00743ee3e2bffa47e87a3333fa867 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 14 Apr 2022 15:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E5=AF=BB=E5=AE=9D?= =?UTF-8?q?=E9=AA=91=E5=85=B5=E6=8C=91=E6=88=98=E6=B6=88=E8=80=97=E6=89=A3?= =?UTF-8?q?=E5=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/battle/handler/normalBattleHandler.ts | 2 +- .../app/services/activity/treasureHuntService.ts | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index e5fabb591..ae34687c0 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -237,7 +237,7 @@ export class NormalBattleHandler { } } else if (warInfo.warType == WAR_TYPE.ACT_TREASURE_HUNT) { if(isSuccess) { - await treasureHuntChallengeConsume(roleId, sid, activityId); + await treasureHuntChallengeConsume(serverId, roleId, sid); } } let curWarStar = warStar.find(cur => cur.id == battleId); diff --git a/game-server/app/services/activity/treasureHuntService.ts b/game-server/app/services/activity/treasureHuntService.ts index 97585a2c2..ba56ce96e 100644 --- a/game-server/app/services/activity/treasureHuntService.ts +++ b/game-server/app/services/activity/treasureHuntService.ts @@ -359,10 +359,13 @@ export async function makeShop(roleId: string, roleName: string, sid: string, se } } -export async function treasureHuntChallengeConsume(roleId: string, sid: string, activityId: number) { - - let activityData: ActivityModelType = await getActivityById(activityId); - let playerData = new TreasureHuntData(activityData, 0, 0); +export async function treasureHuntChallengeConsume(serverId: number, roleId: string, sid: string) { + let { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData } = await getTreasureHuntData(serverId, roleId); + if (!activityData) { + return false; + } + let playerData = await getPlayerTreasureHuntChallengeData(huntActivityId, serverId, roleId, huntRoundIndex, huntBeginTime, huntEndTime,); + if (!playerData) return false; let challengeData = playerData.challenge; //消耗资源