From 7a5202a5ba0aadb586a520b001500d7d3a19db71 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 May 2022 22:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=EF=BC=9A=E5=91=A8?=
 =?UTF-8?q?=E6=B4=BB=E8=B7=83=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/rankService.ts | 5 +++--
 shared/domain/rank.ts                   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game-server/app/services/rankService.ts b/game-server/app/services/rankService.ts
index 2e4243b40..9d1820e46 100644
--- a/game-server/app/services/rankService.ts
+++ b/game-server/app/services/rankService.ts
@@ -70,7 +70,8 @@ export class Rank {
             case REDIS_KEY.GUILD_LV_RANK:
                 this.valueConfig = [
                     new ValueConfig(true, 'lv', 0, false, false),
-                    new ValueConfig(false, 'active', 5, false, false)
+                    new ValueConfig(false, 'active', 5, false, false),
+                    new ValueConfig(false, 'time', 6, true, true)
                 ];
                 break;
             default:
@@ -1172,7 +1173,7 @@ export async function getRankInHandler(redisKey: REDIS_KEY, type: RANK_TYPE, key
         } else if (type == RANK_TYPE.GUILD_LV) {
             if(role.hasGuild) {
                 let guild = await GuildModel.findByCode(guildCode, serverId);
-                myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.activeWeekly, guild.lvUpdateTime, guild);
+                myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.lvUpdateTime, guild.activeWeekly, guild);
             }
         } else if (type == RANK_TYPE.GUILD_FUND) {
             if(role.hasGuild) {
diff --git a/shared/domain/rank.ts b/shared/domain/rank.ts
index cb2aec062..607c40a31 100644
--- a/shared/domain/rank.ts
+++ b/shared/domain/rank.ts
@@ -217,7 +217,7 @@ export class RoleAndGuildRankInfo {
     num: number;
     userInfo?: RankParam & { roleId: string };
     lineup?: LineupParam[];
-    guildInfo?: GuildRankParam & { code: string };
+    guildInfo?: GuildRankParam & { code: string, active?: number };
     
     constructor(rank: number, num: number) {
         this.rank = rank;
@@ -230,7 +230,8 @@ export class RoleAndGuildRankInfo {
     }
 
     setGuildInfo(guild: GuildRankInfo) {
-        this.guildInfo = pick(guild, ['code', 'icon', 'name', 'leader', 'guildCe', 'lv', 'memberCnt', 'active']);
+        this.guildInfo = pick(guild, ['code', 'icon', 'name', 'leader', 'guildCe', 'lv', 'memberCnt']);
+        this.guildInfo.active = guild.num1;
     }
 
     isMyInfo(myId: myIdInter) {