红点：军团活动推送

game-server/app/services/connectorService.ts

@@ -31,7 +31,7 @@ import { getEvent } from './eventSercive';
 import { getBattleListOfMain } from './normalBattleService';
 import { GuildType } from '../db/Guild';
 import UserGuild, { UserGuildType } from '../db/UserGuild';
-import { setMedianCe } from './guildActivityService';
+import { setMedianCe, getAllGuildActivityStatus } from './guildActivityService';
 import { getAllOnlineRoles } from './redisService';
 import Item from '../db/Item';
 import { PvpDefenseModel } from '../db/PvpDefense';
@@ -47,7 +47,7 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
         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'];
         if(guildData.hasGuild) {
-            modules.push('guild', 'auction', 'train', 'boss', 'wishPool');
+            modules.push('guild', 'auction', 'train', 'boss', 'wishPool', 'guildActivity');
         }
         let notIncludeModule: string[] = [];
         if(pushType == 'refresh') {
@@ -72,6 +72,7 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
     let { role, session } = data;
     const { roleId, serverId, roleName, guildCode } = role;
     let { hasGuild, guild, userGuild, guildResult } = guildData;
+    console.log('*********', type)
     switch(type) {
         case 'shop': // 商店
             return await getAllShopList(roleId);
@@ -131,6 +132,8 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
             return await getEvent(role.eventStatus, roleId, roleName);
         case 'battle':
             return await getBattleListOfMain(role);
+        case 'guildActivity': 
+            return getAllGuildActivityStatus();
         default:
             return null;
     }