xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

红点：初始登录推送

Browse Source
This commit is contained in:
luying
2021-06-22 14:52:20 +08:00
parent 5e940001eb
commit d4a40fc8ce
2 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
game-server/app/servers/connector/handler/entryHandler.ts
View File

@@ -18,11 +18,10 @@ import { UserGuildModel } from '../../../db/UserGuild';
import { GuildModel } from '../../../db/Guild'; import { GuildModel } from '../../../db/Guild';
import { gameData } from '../../../pubUtils/data'; 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 { addRoleToGuildChannel, addRoleToSysChannel, addRoleToWorldChannel, leaveGuildChannel, leaveSysChannel, leaveWorldChannel, recentGuildMsgs, recentPrivateChatInfos, recentSysMsgs, recentWorldMsgs } from '../../../services/chatService';
import { reportOneOnline } from '../../../services/timeTaskService'; import { reportOneOnline } from '../../../services/timeTaskService';
import { Rank } from '../../../services/rankService'; import { Rank } from '../../../services/rankService';
import { checkTaskWithRole, getCurTask } from '../../../services/taskService'; import { checkTaskWithRole, } from '../../../services/taskService';
import { pushData, everydayRefresh } from '../../../services/connectorService'; import { pushData, everydayRefresh } from '../../../services/connectorService';
export default function (app: Application) { export default function (app: Application) {
@@ -78,7 +77,6 @@ export class EntryHandler {
let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true); let heros = await HeroModel.findByRole(role.roleId, [], HERO_SELECT.ENTRY, true);
let equips = await EquipModel.findbyRole(role.roleId); let equips = await EquipModel.findbyRole(role.roleId);
let items = await ItemModel.findbyRole(role.roleId); let items = await ItemModel.findbyRole(role.roleId);
let mails = await getMails(role.roleId, serverId)
await chackFunOpenWhenLogin(role, session); await chackFunOpenWhenLogin(role, session);
if (role.hasInit) await loginRefresh(role.roleId); if (role.hasInit) await loginRefresh(role.roleId);
reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), user.pkgName); reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), user.pkgName);
@@ -99,43 +97,15 @@ export class EntryHandler {
role['consumeGoods'] = items; role['consumeGoods'] = items;
let apJson = await getAp(Date.now(), role.roleId); let apJson = await getAp(Date.now(), role.roleId);
role['apJson'] = apJson; role['apJson'] = apJson;
role['mails'] = mails;
if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid); if (!role.showLineup) role.showLineup = role.topLineup.map(cur => cur.hid);
role.heads = role.heads.filter(cur => cur.status); role.heads = role.heads.filter(cur => cur.status);
role.frames = role.frames.filter(cur => cur.status); role.frames = role.frames.filter(cur => cur.status);
role.spines = role.spines.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) { if (role.hasGuild) {
let userGuild = await UserGuildModel.getMyGuild(role.roleId, USER_GUILD_SELECT.ENTRY); addRoleToGuildChannel(role.roleId, self.app.get('serverId'), role.guildCode);
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;
}
}
}
} }
// 任务
let { mainTask, dailyTask, achievement } = await getCurTask(role.roleId, session);
role['mainTask'] = mainTask;
role['dailyTask'] = dailyTask;
role['achievement'] = achievement;
let todayZeroPoint = getZeroPoint(); let todayZeroPoint = getZeroPoint();
role['todayZeroPoint'] = todayZeroPoint; role['todayZeroPoint'] = todayZeroPoint;

6
game-server/app/services/connectorService.ts
View File

@@ -46,9 +46,9 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
pushEntryStart(roleId, sid); pushEntryStart(roleId, sid);
// 军团 // 军团
const guildData = await getGuildEntryData(role, sid, session); 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) { if(guildData.hasGuild) {
modules.push('guild', 'auction', 'train', 'boss', 'wishPool', 'guildActivity', 'donate'); modules.push('auction', 'train', 'boss', 'wishPool', 'guildActivity', 'donate');
} }
let notIncludeModule: string[] = []; let notIncludeModule: string[] = [];
if(pushType == 'refresh') { if(pushType == 'refresh') {
@@ -105,7 +105,7 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
case 'school': case 'school':
return await getSchoolList(roleId); return await getSchoolList(roleId);
case 'guild': case 'guild':
return hasGuild? await guildResult: null; return await guildResult;
case 'auction': case 'auction':
return hasGuild? await getAuction(guildCode, session): null; return hasGuild? await getAuction(guildCode, session): null;
case 'train': case 'train':