活动：每日免费午饭、晚饭活动

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

@@ -21,6 +21,7 @@ import { sevenDaysActivity } from '../../../services/sevenDaysService';
 import { checkActivityTask } from '../../../services/taskService';
 import { treasureHuntActivity } from '../../../services/treasureHuntService';
 import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
+import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
 // import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
 // import { isComplete } from '../../../pubUtils/taskUtil';
 
@@ -233,10 +234,11 @@ export class ActivityHandler {
         {
             let data = await getSelfServiceShopActivityData(serverId, roleId);
             if (data) {
+                let playerGoods = await ActivitySelfServiceGoodsModel.findData(data.activityId, roleId, data.roundIndex, true);
                 playerActivityArray.push({
                     type: ACTIVITY_TYPE.SELF_SERVICE_SHOP,
                     activityId: data.activityId,
-                    data: data,
+                    data: { playerData: data, playerGoods: playerGoods ? playerGoods : [] },
                 });
             }
         }
@@ -437,6 +439,19 @@ export class ActivityHandler {
                 });
             }
         }
+
+        // //每日领取免费午饭、晚饭活动
+        // {
+        //     let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.DAILY_MEAL);
+        //     if (data) {
+        //         playerActivityArray.push({
+        //             type: ACTIVITY_TYPE.DAILY_MEAL,
+        //             activityId: data.activityId,
+        //             data,
+        //         });
+        //     }
+        // }
+
         return resResult(STATUS.SUCCESS, { playerActivityArray });
     }