弹出礼包：添加两种条件

game-server/app/services/activity/popUpShopService.ts

@@ -72,9 +72,9 @@ export async function checkPopUpConditionWhenGuildActivityEnd() {
     let i = -1;
     let interval = setInterval(async () => {
         if (++i < n) {
-            console.log('****', i)
+            // console.log('****', i)
             let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1);
-            console.log('****', users)
+            // console.log('****', users)
             for(let { serverId, roleId, sid } of users) {
                 await checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.AUCTION, {}, sid);
             }

game-server/app/services/battleService.ts

@@ -1,6 +1,6 @@
 import { HeroModel, HeroType } from './../db/Hero';
 import { HangUpRecordModel } from './../db/HangUpRecord';
-import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE, MSG_SOURCE } from './../consts';
+import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE, MSG_SOURCE, POP_UP_SHOP_CONDITION_TYPE } from './../consts';
 import { BattleRecordModel } from './../db/BattleRecord';
 import { TowerRecordModel } from './../db/TowerRecord';
 import { RoleModel, RoleType } from './../db/Role';
@@ -19,6 +19,7 @@ import { DicTowerTask } from '../pubUtils/dictionary/DicTowerTask';
 import * as dicParam from '../pubUtils/dicParam';
 import { getVipHungupReward } from './activity/monthlyTicketService';
 import { pushTowerMsg } from './sysChatService';
+import { checkPopUpCondition } from './activity/popUpShopService';
 
 /**
  * 获取当前镇念塔状态
@@ -240,6 +241,8 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
             await checkAndStartHungUp(roleId, roleName, role.towerLv);
             // 任务
             await checkTask(serverId, roleId, sid, TASK_TYPE.BATTLE_TOWER_LV, { towerLv: role.towerLv - 1 });
+            await checkPopUpCondition(serverId, roleId, POP_UP_SHOP_CONDITION_TYPE.TOWER, { oldLv: towerLv - 1, newLv: role.towerLv - 1 })
+
             pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, role.towerLv - 1);
         }
         return {