红点：军团活动

game-server/app/services/connectorService.ts

@@ -25,7 +25,6 @@ import { addRoleToGuildChannel } from './chatChannelService';
 import { getMyGuildInfo, getGuildWithRefActive, getUserGuildWithRefActive, getWishPool, getInvitationList } from './guildService';
 import { getAuction } from './auctionService';
 import { getGuildTrainInstance, getTrainBoxRewardsResult } from './guildTrainService';
-import { BossInstanceModel } from '../db/BossInstance';
 import { getBossInstanceInfo } from './guildBossService';
 import { getEvent } from './eventSercive';
 import { getBattleListOfMain, getMainChapter } from './normalBattleService';
@@ -201,7 +200,7 @@ export async function getModuleData(type: string, data: { role: RoleType, sessio
         case 'battle':
             return await getBattleListOfMain(role);
         case 'guildActivity':
-            return getAllGuildActivityStatus();
+            return getAllGuildActivityStatus(role.guildCode, role.serverId);
         case 'chapter':
             return getMainChapter(role);
         case 'survey':

game-server/app/services/guildActivity/guildActivityService.ts

@@ -107,12 +107,17 @@ export function getGuildActivityStatus(id: number) {
     return getGuildActivityByDic(dicGuildActivity);
 }
 
-export function getAllGuildActivityStatus() {
-    let guildActivities: { aid: number, status: number, time: number, isOpen: boolean }[] = [];
-    gameData.guildActivity.forEach((dicGuildActivity, aid) => {
+export async function getAllGuildActivityStatus(guildCode: string, serverId: number) {
+    let guildActivities: { aid: number, status: number, time: number, isOpen: boolean, isCompleted?: boolean }[] = [];
+    for(let [ aid, dicGuildActivity ] of gameData.guildActivity) {
         let res = getGuildActivityByDic(dicGuildActivity);
-        guildActivities.push({aid ,...res});
-    });
+        let isCompleted = res.isOpen;
+        if(res.status == GUILD_ACTIVITY_STATUS.START && guildCode) {
+            let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, aid);
+            if(guildActivityRec) isCompleted = guildActivityRec.isCompleted;
+        }
+        guildActivities.push({aid, ...res, isCompleted});
+    }
     return guildActivities;
 }
 
@@ -342,7 +347,11 @@ export async function sendEndMsgToAllServer() {
 }
 
 export async function sendGuildActivityStatus(serverId: number) {
-    let guildActivities = getAllGuildActivityStatus();
+    let guildActivities: { aid: number, status: number, time: number, isOpen: boolean }[] = [];
+    gameData.guildActivity.forEach((dicGuildActivity, aid) => {
+        let res = getGuildActivityByDic(dicGuildActivity);
+        guildActivities.push({aid ,...res});
+    });
     await sendMessageToServerWithSuc(serverId, PUSH_ROUTE.GUILD_ACTIVITY_STATUS, { guildActivities });
 }