活动：修改活动bug

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

@@ -1,6 +1,6 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
-import { ACTIVITY_TYPE, FIRST_GIFT_STATE, SERVER_OPEN_TIME, STATUS } from '../../../consts';
+import { ACTIVITY_TYPE, FIRST_GIFT_STATE, SERVER_OPEN_TIME, STATUS, TASK_TYPE } from '../../../consts';
 import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
 import { signInActivity, signInVIPActivity } from '../../../services/signInService';
 import { growthFundActivity } from '../../../services/growthFundService';
@@ -12,6 +12,9 @@ import { yuanbaoActivity } from '../../../services/yuanbaoService';
 import { monthlyTicketActivity } from '../../../services/monthlyTicketService';
 import { rechargeMoneyActivity } from '../../../services/rechargeMoneyService';
 import moment = require('moment');
+import { RoleModel } from '../../../db/Role';
+// import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
+// import { isComplete } from '../../../pubUtils/taskUtil';
 
 export default function (app: Application) {
     return new ActivityHandler(app);
@@ -28,8 +31,8 @@ export class ActivityHandler {
     * @param {BackendSession} session
     * @memberof ActivityHandler
     */
-    async getAllOpenActivity(msg: {}, session: BackendSession) {
-        const { } = msg;
+    async getAllOpenActivity(msg: { hid: number, lv: number }, session: BackendSession) {
+        const { hid, lv } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
@@ -69,6 +72,41 @@ export class ActivityHandler {
                 });
             }
         }
+        //14天乐活动-成长任务 1 2 3
+        {
+            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.FOURTEEN_DAY,
+                    activityId: 0,
+                    data: sevenData,
+                });
+            }
+        }
         //签到 4
         {
             let data = await signInActivity(serverId, roleId);
@@ -174,7 +212,9 @@ export class ActivityHandler {
 
         //新手限定RMB购买礼包 15
         {
-            let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').add(5, 'h').toDate();
+            let { createTime } = await RoleModel.findByRoleId(roleId);
+            let createDate = moment(createTime * 1000).toDate();
+            let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate();
             if (new Date() <= endTime) {
                 let data = await newPlayerLimitPackageActivity(serverId, roleId);
                 if (data) {