活动：弹窗活动新类型

game-server/app/servers/guild/remote/guildActivityRemote.ts

@@ -18,6 +18,7 @@ export class GuildActivityRemote {
 
     private currentTime: number = Date.now();
     private setTime: number = Date.now();
+    private isAuctionPopUp: boolean = false;
 
     /**
      * 从systimer服分发到guild各个服，发送排行榜数据
@@ -36,6 +37,10 @@ export class GuildActivityRemote {
     public async guildActivityEnd(aid: number) {
         try {
             await settleGuildActivityReward(aid);
+            this.isAuctionPopUp = true;
+            setTimeout(() => { // 军团活动结束的15分钟内就不会再弹出了
+                this.isAuctionPopUp = false;
+            }, 15 * 60 * 1000);
         } catch(e) {
             errlogger.error(`remote ${__filename} \n ${e.stack}`);
         }
@@ -147,4 +152,12 @@ export class GuildActivityRemote {
             errlogger.error(`remote ${__filename} \n ${e.stack}`);
         }
     }
+
+    public getAuctionPopUpShow() {
+        try {
+            return this.isAuctionPopUp;
+        } catch(e) {
+            errlogger.error(`remote ${__filename} \n ${e.stack}`);
+        }
+    }
 }