活动：弹出商店添加条件判断

game-server/app/servers/activity/handler/activityHandler.ts

@@ -15,6 +15,7 @@ import moment = require('moment');
 import { RoleModel } from '../../../db/Role';
 import { playerThirtyDaysActivityDays, thirtyDaysActivity } from '../../../services/thirtyDaysService';
 import { dailyRMBGiftsActivity } from '../../../services/dailyRMBGiftsService';
+import { popUpShopActivity } from '../../../services/popUpShopService';
 // import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
 // import { isComplete } from '../../../pubUtils/taskUtil';
 
@@ -332,6 +333,18 @@ export class ActivityHandler {
             }
         }
 
+        //弹出商店 24
+        {
+            let data = await popUpShopActivity(serverId, roleId);
+            if (data) {
+                playerActivityArray.push({
+                    type: ACTIVITY_TYPE.POP_UP_SHOP,
+                    activityId: 0,
+                    data,
+                });
+            }
+        }
+
         return resResult(STATUS.SUCCESS, { playerActivityArray });
     }