From 6e738d62b708098936cc6f356c2c6a58cc995364 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 24 Jun 2022 10:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E5=86=9B=E5=9B=A2?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8debug=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/gm/handler/gmHandler.ts             | 3 +++
 .../app/services/guildActivity/guildActivityService.ts      | 1 -
 game-server/app/services/rankService.ts                     | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts
index d6046d6b3..0e2d25496 100644
--- a/game-server/app/servers/gm/handler/gmHandler.ts
+++ b/game-server/app/servers/gm/handler/gmHandler.ts
@@ -312,6 +312,7 @@ export class GmHandler {
         await pinus.app.rpc.systimer.systimerRemote.setDay.broadcast(day);
         await pinus.app.rpc.connector.connectorRemote.setDay.broadcast(day);
         await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.broadcast(aid);
+        await pinus.app.rpc.guild.guildActivityRemote.clearActivityObj.broadcast();
 
         // 清空旧数据
         if (day <= 2) {
@@ -361,6 +362,8 @@ export class GmHandler {
         // 开启定时器
         await pinus.app.rpc.systimer.systimerRemote.setAuctionSchedule.broadcast();
         await pinus.app.rpc.systimer.systimerRemote.setGuildActivitySchedule.broadcast();
+        await pinus.app.rpc.guild.guildActivityRemote.clearActivityObj.broadcast();
+
         // 向客户端发送时间
         pinus.app.rpc.guild.guildActivityRemote.setCurrentTime.broadcast(now.getTime());
         await pushCurrentTime(now.getTime());
diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts
index 4e60c5a1b..2e08fc900 100644
--- a/game-server/app/services/guildActivity/guildActivityService.ts
+++ b/game-server/app/services/guildActivity/guildActivityService.ts
@@ -306,7 +306,6 @@ export async function settleGuildActivityReward(aid: number) {
         let obj = getCityActivityObj();
         let { cities } = obj.getAllCities();
         for (let { serverId, cityId } of cities) {
-            console.log('######', serverId, cityId)
             await cityActivitySettleReward(cityId, serverId);
         }
     } else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
diff --git a/game-server/app/services/rankService.ts b/game-server/app/services/rankService.ts
index a2157aab2..1696dfb14 100644
--- a/game-server/app/services/rankService.ts
+++ b/game-server/app/services/rankService.ts
@@ -252,18 +252,21 @@ export class Rank {
         if (infoKey == REDIS_KEY.USER_INFO) {
             if (!role) {
                 role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
+                if(!role) return;
             }
             let param = new RankParam(role);
             await this.setUserInfo(infoKey, { roleId }, param);
         } else if (infoKey == REDIS_KEY.GUILD_INFO) {
             if (!guild) {
                 guild = await GuildModel.findByCode(guildCode, this.keyName.serverId, GUILD_SELECT.RANK)
+                if(!guild) return;
             }
             let param = new GuildRankParam(guild);
             await this.setUserInfo(infoKey, { guildCode }, param);
         } else if (infoKey == REDIS_KEY.TOP_LINEUP_INFO) {
             if (!role) {
                 role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
+                if(!role) return;
             }
             let { topLineup = [] } = role;
             let heroes = await HeroModel.findByRole(roleId, [], HERO_SELECT.RANK_LINEUP);
@@ -279,6 +282,7 @@ export class Rank {
         } else if (infoKey == REDIS_KEY.HERO_INFO) {
             if (!hero) {
                 hero = await HeroModel.findByHidAndRole(hid, roleId, HERO_SELECT.RANK_LINEUP, true);
+                if(!hero) return;
             }
             let arr = new Array<LineupParam>();
             if (hero) {
@@ -289,6 +293,7 @@ export class Rank {
         } else if (infoKey == REDIS_KEY.DUNGEON_LINEUP) {
             if (!role) {
                 role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
+                if(!role) return;
             }
             let { dungeonWarId, dungeonHeroes } = role;
             if (dungeonWarId > 0) {
@@ -308,6 +313,7 @@ export class Rank {
         } else if (infoKey == REDIS_KEY.SHOW_LINEUP) {
             if (!role) {
                 role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.RANK, true);
+                if(!role) return;
             }
             let { showLineup, topLineup = [] } = role;
             let heroes = await HeroModel.findByRole(roleId, [], HERO_SELECT.RANK_LINEUP);