From 9f95c0001e8ab0735761cdfdbb922829fc4e95de Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 13 Jan 2022 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=86=9B=E5=9B=A2?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BB=BB=E5=8A=A1=E6=94=B9=E4=B8=BA=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E6=88=98=E5=9C=BA=E5=B0=B1=E7=AE=97=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/guild/handler/cityActivityHandler.ts | 10 +++++----- .../app/servers/guild/handler/gateActivityHandler.ts | 10 ++++++---- .../app/servers/guild/handler/raceActivityHandler.ts | 6 ++++++ game-server/app/services/guildActivityService.ts | 4 ---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/game-server/app/servers/guild/handler/cityActivityHandler.ts b/game-server/app/servers/guild/handler/cityActivityHandler.ts index e727d2ea9..0e939da22 100644 --- a/game-server/app/servers/guild/handler/cityActivityHandler.ts +++ b/game-server/app/servers/guild/handler/cityActivityHandler.ts @@ -189,6 +189,11 @@ export class CityActivityHandler { const dbCities = await GuildActivityCityModel.getAllCities(serverId); let cityStatus = pubGetCityStatus(guildCode, cityId, dicCity, dbCities); + // 任务 + await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); + //成长任务 + await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) + // 前一天中位数战力 let medianCe = await getMedianCe(serverId); @@ -323,11 +328,6 @@ export class CityActivityHandler { let guildScore = await r.getMyScore({ guildCode }); let gateHp = obj.getGateHpAndInc(serverId, cityId, dicCity.hp); - // 任务 - await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); - //成长任务 - await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) - return resResult(STATUS.SUCCESS, { isSuccess, code, diff --git a/game-server/app/servers/guild/handler/gateActivityHandler.ts b/game-server/app/servers/guild/handler/gateActivityHandler.ts index 892142625..45fb32c46 100644 --- a/game-server/app/servers/guild/handler/gateActivityHandler.ts +++ b/game-server/app/servers/guild/handler/gateActivityHandler.ts @@ -70,6 +70,7 @@ export class GateActivityHandler { const roleName = session.get('roleName'); const serverId = session.get('serverId'); const guildCode = session.get('guildCode'); + const sid = session.get('sid'); if (!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH); let obj = getGateActivityObj(); @@ -102,6 +103,11 @@ export class GateActivityHandler { // 前一天中位数战力 let medianCe = await getMedianCe(serverId); + // 任务 + await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); + //成长任务 + await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) + return resResult(STATUS.SUCCESS, { code, ...statusResult, @@ -254,10 +260,6 @@ export class GateActivityHandler { isSuccess } - // 任务 - await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); - //成长任务 - await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) return resResult(STATUS.SUCCESS, { code, ...statusResult, diff --git a/game-server/app/servers/guild/handler/raceActivityHandler.ts b/game-server/app/servers/guild/handler/raceActivityHandler.ts index ef3cd8e03..45aedc3e0 100644 --- a/game-server/app/servers/guild/handler/raceActivityHandler.ts +++ b/game-server/app/servers/guild/handler/raceActivityHandler.ts @@ -91,6 +91,12 @@ export class RaceActivityHandler { let chatSid = await getGuildChannelSid(guildCode); this.app.rpc.chat.guildRemote.pushRaceHorseJoin.toServer(chatSid, guildCode, woodenHorse); + // 任务 + await checkTask(roleId, sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); + //成长任务 + await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) + + return resResult(STATUS.SUCCESS, { code: myGuildActivityRec.code, ...statusResult, diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index 64b64d84f..77bb268ac 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -723,10 +723,6 @@ export async function raceActivitySettleReward(guildCode: string, woodenHorse: W let onlineUser = await getRoleOnlineInfo(roleId); // 发放活跃 await addActive(roleId, serverId, GUILD_POINT_WAYS.ACTIVITY); //获得活跃值 - // 任务 - await checkTask(roleId, onlineUser.sid, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: GUILD_ACTIVITY_TYPE.RACE_ACTIVITY }); - //成长任务 - await checkActivityTask(serverId, onlineUser.sid, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: GUILD_ACTIVITY_TYPE.RACE_ACTIVITY }) } }