From 6bbd5e9dd3756e85a7d6ec8c365bdb8d53af195f Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 24 Feb 2023 19:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=83=E6=9C=BA=E9=98=81=E6=8E=A8=E9=80=81=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=92=8C=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/gvgHandler.ts | 4 ++-- game-server/app/services/gvg/gvgPrepareService.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/game-server/app/servers/guild/handler/gvgHandler.ts b/game-server/app/servers/guild/handler/gvgHandler.ts index b42cb5c4e..d396df6b9 100644 --- a/game-server/app/servers/guild/handler/gvgHandler.ts +++ b/game-server/app/servers/guild/handler/gvgHandler.ts @@ -389,7 +389,7 @@ export class GVGHandler { // 推送千机阁解锁消息 let curQueue = leaguePrepare.techQueue.find(cur => cur.id == techId); - await pushTechChange(myLeague.guildCodes, PUSH_ROUTE.LEAGUE_TECH_UNLOCK, techId, curQueue.progress, curQueue.maxProgress); + await pushTechChange(myLeague.guildCodes, false, techId, curQueue.progress, curQueue.maxProgress); return resResult(STATUS.SUCCESS, { queue: leaguePrepare?.techQueue||[] @@ -453,7 +453,7 @@ export class GVGHandler { checkGVGTask(serverId, roleId, sid, configId, myLeague.leagueCode, TASK_TYPE.GVG_TECH, { count: 1 }); // 推送千机阁激活消息 - await pushTechChange(myLeague.guildCodes, PUSH_ROUTE.LEAGUE_TECH_ACITVE, techId, curQueue.progress, curQueue.maxProgress); + await pushTechChange(myLeague.guildCodes, true, techId, curQueue.progress, curQueue.maxProgress); return resResult(STATUS.SUCCESS, { active, diff --git a/game-server/app/services/gvg/gvgPrepareService.ts b/game-server/app/services/gvg/gvgPrepareService.ts index 744031cd6..b58d207b7 100644 --- a/game-server/app/services/gvg/gvgPrepareService.ts +++ b/game-server/app/services/gvg/gvgPrepareService.ts @@ -470,10 +470,10 @@ export function checkItemCanUserInFarm(farmId: number, itemId: number) { } // 推送千机阁状态变化 -export async function pushTechChange(guildCodes: string[], route: string, id: number, progress: number, maxProgress: number) { +export async function pushTechChange(guildCodes: string[], isActive: boolean, id: number, progress: number, maxProgress: number) { for(let guildCode of guildCodes) { - await sendMessageToGuildWithSuc(guildCode, route, { - id, progress, maxProgress + await sendMessageToGuildWithSuc(guildCode, PUSH_ROUTE.LEAGUE_TECH_CHANGE, { + id, progress, maxProgress, isActive }); } }