活动：修改活动bug

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

@@ -2,12 +2,12 @@ import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, FIRST_GIFT_STATE, STATUS } from '../../../consts';
 import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
-import { RoleModel } from '../../../db/Role';
-import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
-import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
 import { signInActivity, signInVIPActivity } from '../../../services/signInService';
 import { growthFundActivity } from '../../../services/growthFundService';
 import { newPlayerLimitPackageActivity } from '../../../services/limitPackageService';
+import { growthActivity } from '../../../services/growthService';
+import { dailyChallengesActivity } from '../../../services/dailyChallengesService';
+import { dailyGiftsActivity } from '../../../services/dailyGiftsService';
 
 export default function (app: Application) {
     return new ActivityHandler(app);
@@ -30,6 +30,42 @@ export class ActivityHandler {
         const serverId = session.get('serverId');
 
         let playerActivityArray = [];
+        //七天乐活动-成长任务
+        {
+            let sevenData = [];
+            let growthData = await growthActivity(serverId, roleId);
+            if (growthData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.TASK_GROWTH,
+                    activityId: growthData.activityId,
+                    data: growthData,
+                });
+            }
+            let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
+            if (dailyChallengesData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
+                    activityId: dailyChallengesData.activityId,
+                    data: dailyChallengesData,
+                });
+            }
+            let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
+            if (dailyGiftsData) {
+                sevenData.push({
+                    type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
+                    activityId: dailyGiftsData.activityId,
+                    data: dailyGiftsData,
+                });
+            }
+            if (sevenData.length > 0) {
+                playerActivityArray.push({
+                    type: ACTIVITY_TYPE.SEVEN_DAY,
+                    activityId: 0,
+                    data: sevenData,
+                });
+            }
+        }
+
         //首冲礼包活动
         {
             let data = await firstGiftActivity(serverId, roleId);

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

@@ -266,7 +266,7 @@ export class GachaHandler {
 
         let heroes: number[] = [];
         if (gachaId == GACHA_ID.TIMELIMIT) {
-            let activityData = await ActivityModel.findActivity(serverId, activityId, true);
+            let activityData = await ActivityModel.findActivity(serverId, activityId);
             if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
 
             let gachaData = new GachaData(activityData);

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

@@ -91,6 +91,9 @@ export class LimitPackageHandler {
         }
 
         let item = playerData.findItem(id);
+        if (!item) {
+            return resResult(STATUS.ACTIVITY_ID_ERROR);
+        }
         if (item.countMax > 0 && item.buyCount >= item.countMax) {
             return resResult(STATUS.ACTIVITY_MAX_COUNT);
         }

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

@@ -51,7 +51,7 @@ export class PopUpShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
         if (!activityData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }

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

@@ -50,7 +50,7 @@ export class SelfServiceShopHandler {
         const roleName = session.get('roleName');
         const funcs: number[] = session.get('funcs');
 
-        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
+        let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
         let playerData = new SelfServiceShopData(activityData);
         let item = playerData.getItem(index);
 

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

@@ -72,7 +72,7 @@ export class SevenDaysHandler {
             return resResult(STATUS.ACTIVITY_REWARDED);
         }
 
-        await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1, growthItemData.point);
+        await ActivityGrowthModel.addCellRecord(serverId, activityId, roleId, dayIndex, cellIndex, type, 1);
         let rewardParamArr: Array<RewardParam> = stringToRewardParam(growthItemData.reward);
         let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)