✨ feat(gvg): 组建期

game-server/app/services/guildService.ts

@@ -27,6 +27,8 @@ import { RewardInter } from "../pubUtils/interface";
 import { getGuildFundByRefTime } from "./donateService";
 import { BattleRecordModel } from "../db/BattleRecord";
 import { BossInstanceModel } from "../db/BossInstance";
+import { pick } from "underscore";
+import { memberJoinGuildToLeague } from "./gvg/gvgTeamService";
 
 export async function getMyGuildInfo(roleId: string, sid: string, userGuild: UserGuildType, guild: GuildType, serverId: number, session: FrontendOrBackendSession) {
 
@@ -51,7 +53,7 @@ export async function getMyGuildInfo(roleId: string, sid: string, userGuild: Use
     let guildActive = await getTodayGuildActive(guild.code);
 
     // 返回
-    return { hasGuild: true, guildMemberMax, ...guild, activeDaily: guildActive, leader: { ...leader, isOnline: leaderIsOnline }, rank, myInfo: { ...userGuild } };
+    return { hasGuild: true, guildMemberMax, ...guild, activeDaily: guildActive, leader: { ...pick(leader, ['ce', 'lv', 'quitTime', 'roleId', 'roleName', 'head', 'frame', 'spine', 'title', 'isOnline']), isOnline: leaderIsOnline }, rank, myInfo: { ...userGuild } };
 }
 
 /**
@@ -116,6 +118,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
         return { status: -1, resResult: resResult(STATUS.GUILD_HAS_JOIN) };
     }
     await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'guildName', value: guildName }]);
+    await memberJoinGuildToLeague(guild, role);
 
     const userGuild = await UserGuildModel.createUserGuild(guild.code, role, false);
     if (!userGuild) {