From d4a40fc8ceaaacb86941a926d1ec6e94407cca22 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 22 Jun 2021 14:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=82=B9=EF=BC=9A=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/connector/handler/entryHandler.ts | 36 ++-----------------
 game-server/app/services/connectorService.ts  |  6 ++--
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts
index 465485c1a..1fc69a7b1 100644
--- a/game-server/app/servers/connector/handler/entryHandler.ts
+++ b/game-server/app/servers/connector/handler/entryHandler.ts
@@ -18,11 +18,10 @@ import { UserGuildModel } from '../../../db/UserGuild';
 import { GuildModel } from '../../../db/Guild';
 import { gameData } from '../../../pubUtils/data';
 
-import { getMails } from '../../../services/mailService';
 import { addRoleToGuildChannel, addRoleToSysChannel, addRoleToWorldChannel, leaveGuildChannel, leaveSysChannel, leaveWorldChannel, recentGuildMsgs, recentPrivateChatInfos, recentSysMsgs, recentWorldMsgs } from '../../../services/chatService';
 import { reportOneOnline } from '../../../services/timeTaskService';
 import { Rank } from '../../../services/rankService';
-import { checkTaskWithRole, getCurTask } from '../../../services/taskService';
+import { checkTaskWithRole, } from '../../../services/taskService';
 import { pushData, everydayRefresh } from '../../../services/connectorService';
 
 export default function (app: Application) {
@@ -78,7 +77,6 @@ export class EntryHandler {
         let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true);
         let equips = await EquipModel.findbyRole(role.roleId);
         let items = await ItemModel.findbyRole(role.roleId);
-        let mails = await getMails(role.roleId, serverId)
         await chackFunOpenWhenLogin(role, session);
         if (role.hasInit) await loginRefresh(role.roleId);
         reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), user.pkgName);
@@ -99,43 +97,15 @@ export class EntryHandler {
         role['consumeGoods'] = items;
         let apJson = await getAp(Date.now(), role.roleId);
         role['apJson'] = apJson;
-        role['mails'] = mails;
+
         if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid);
         role.heads = role.heads.filter(cur => cur.status);
         role.frames = role.frames.filter(cur => cur.status);
         role.spines = role.spines.filter(cur => cur.status);
 
-        const recentPrivateChats = await recentPrivateChatInfos(role.roleId, role.roleName);
-        if (recentPrivateChats) {
-            role['recentPrivateChats'] = recentPrivateChats;
-        }
-        role['worldMsgs'] = await recentWorldMsgs(role.serverId);
-        role['sysMsgs'] = await recentSysMsgs(role.serverId);
-
         if (role.hasGuild) {
-            let userGuild = await UserGuildModel.getMyGuild(role.roleId, USER_GUILD_SELECT.ENTRY);
-            if (userGuild) {
-                let guild = await GuildModel.findGuild(userGuild.guildCode, role.serverId, GUILD_SELECT.ENTRY);
-                if (guild) {
-                    addRoleToGuildChannel(role.roleId, self.app.get('serverId'), userGuild.guildCode);
-                    role['guildMsgs'] = await recentGuildMsgs(userGuild.guildCode);
-                    role['guildAuth'] = userGuild.auth;
-                    role['guildCode'] = userGuild.guildCode;
-                    let { lv: guildLv, memberCnt } = guild;
-                    let dicGuild = gameData.centerBase.get(guildLv);
-                    if (dicGuild && memberCnt >= dicGuild.peopleNum) {
-                        role['guildMemberMax'] = true;
-                    } else {
-                        role['guildMemberMax'] = false;
-                    }
-                }
-            }
+            addRoleToGuildChannel(role.roleId, self.app.get('serverId'), role.guildCode);
         }
-        // 任务
-        let { mainTask, dailyTask, achievement } = await getCurTask(role.roleId, session);
-        role['mainTask'] = mainTask;
-        role['dailyTask'] = dailyTask;
-        role['achievement'] = achievement;
 
         let todayZeroPoint = getZeroPoint();
         role['todayZeroPoint'] = todayZeroPoint;
diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts
index e59d1a1f1..1c74cda9a 100644
--- a/game-server/app/services/connectorService.ts
+++ b/game-server/app/services/connectorService.ts
@@ -46,9 +46,9 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         pushEntryStart(roleId, sid);
         // 军团
         const guildData = await getGuildEntryData(role, sid, session);
-        let modules = ['shop', 'rank', 'mail', 'friend', 'daily', 'expedition', 'tower', 'comBattle', 'dungeon', 'pvp', 'gacha', 'school', 'task', 'chat', 'event', 'battle'];
+        let modules = ['shop', 'rank', 'mail', 'friend', 'daily', 'expedition', 'tower', 'comBattle', 'dungeon', 'pvp', 'gacha', 'school', 'task', 'chat', 'event', 'battle', 'guild'];
         if(guildData.hasGuild) {
-            modules.push('guild', 'auction', 'train', 'boss', 'wishPool', 'guildActivity', 'donate');
+            modules.push('auction', 'train', 'boss', 'wishPool', 'guildActivity', 'donate');
         }
         let notIncludeModule: string[] = [];
         if(pushType == 'refresh') {
@@ -105,7 +105,7 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         case 'school': 
             return await getSchoolList(roleId);
         case 'guild':
-            return hasGuild? await guildResult: null;
+            return await guildResult;
         case 'auction':
             return hasGuild? await getAuction(guildCode, session): null;
         case 'train':