From 11cdf9008f5290822d510de954614b57484463bf Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 29 Apr 2022 23:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E5=95=86=E5=BA=97pvp=E6=94=B9=E6=88=90score?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/pvpHandler.ts | 2 +- game-server/app/services/task/taskService.ts | 6 +++--- shared/domain/activityField/popUpShopField.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index 2b9c82bd1..fa5286376 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -276,7 +276,7 @@ export class PvpHandler { let myRank = await r.getMyRank({ roleId }); result.setMyRank(myRank); - await checkTaskInPvpEnd(serverId, roleId, sid, isSuccess, pvpDefense.heroScores, myRank); + await checkTaskInPvpEnd(serverId, roleId, sid, isSuccess, pvpDefense.heroScores, pvpDefense.score); if(hisWinStreakNum < pvpDefense.hisWinStreakNum) { await unlockFigure(sid, roleId, [{ type: FIGURE_UNLOCK_CONDITION.PVP_WIN_SERIES, paramWinStreakNum: pvpDefense.hisWinStreakNum }]); } diff --git a/game-server/app/services/task/taskService.ts b/game-server/app/services/task/taskService.ts index ce72ef01a..481be404a 100644 --- a/game-server/app/services/task/taskService.ts +++ b/game-server/app/services/task/taskService.ts @@ -201,14 +201,14 @@ export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: s } } -export async function checkTaskInPvpEnd(serverId: number, roleId: string, sid: string, isSuccess: boolean, heroScores: HeroScores[], myRank: number) { +export async function checkTaskInPvpEnd(serverId: number, roleId: string, sid: string, isSuccess: boolean, heroScores: HeroScores[], score: number) { let task = new CheckTask(serverId, roleId); task.setParam(TASK_TYPE.PVP_WIN, { isSuccess }); task.setParam(TASK_TYPE.PVP_WIN_SERIES, { isSuccess }); task.setParam(TASK_TYPE.PVP_HERO_SCORE, { heroScores }); await task.saveAndPush(sid); - if(myRank) { - checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.PVP, { rank: myRank }, sid); + if(score) { + checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.PVP, { score }, sid); } } diff --git a/shared/domain/activityField/popUpShopField.ts b/shared/domain/activityField/popUpShopField.ts index 8aef2638d..72fac1803 100644 --- a/shared/domain/activityField/popUpShopField.ts +++ b/shared/domain/activityField/popUpShopField.ts @@ -375,7 +375,7 @@ export class PopShopItem { case POP_UP_SHOP_CONDITION_TYPE.MAIN_BATTLE: return param.warId == this.conditionParam[0]; case POP_UP_SHOP_CONDITION_TYPE.PVP: - return param.rank <= this.conditionParam[0]; + return param.score >= this.conditionParam[0]; case POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR: return param.equipStar >= this.conditionParam[0]; case POP_UP_SHOP_CONDITION_TYPE.AUCTION: @@ -445,7 +445,7 @@ export interface PopUpConditionParamInter { newLv?: number; quality?: number; warId?: number; - rank?: number; + score?: number; equipStar?: number; }