活动：修复七天乐任务无效

game-server/app/servers/activity/remote/activityRemote.ts

@@ -87,7 +87,7 @@ export class ActivityRemote {
     }
 
     public async updateActivities(activities: ActivityInRemote[]) {
-        console.log('******* activities', activities)
+        // console.log('******* activities', activities)
         let activityIds: number[] = [];
         for(let activity of activities) {
             this.activities.set(activity.activityId, activity);

game-server/app/servers/role/handler/friendHandler.ts

@@ -256,6 +256,13 @@ export class FriendHandler {
         roles.push(role);
         // 任务
         await checkTaskWithRoles(serverId, roleId, sid, TASK_TYPE.FRIEND_NUM, roles);
+        for(let curRole of roles) {
+            if(curRole.roleId == role.roleId) {
+                await checkActivityTask(serverId, sid, roleId, TASK_TYPE.FRIEND_NUM, curRole.friendCnt);
+            } else {
+                await checkActivityTask(serverId, null, curRole.roleId, TASK_TYPE.FRIEND_NUM, curRole.friendCnt);
+            }
+        }
 
         // 特殊处理：如果他点一键同意，有很多人，这个单独的人就不做这个额外的提示，直接把他好友申请删掉就好
         if (str == getResStr(STATUS.FRIEND_HAS_ADD) && resultApplyCodeList.length > 1) str = '';
@@ -423,6 +430,8 @@ export class FriendHandler {
 
         // 任务
         await checkTaskWithRoles(serverId, roleId, sid, TASK_TYPE.FRIEND_NUM, [role, friend]);
+        await checkActivityTask(serverId, sid, role.roleId, TASK_TYPE.FRIEND_NUM, role.friendCnt);
+        await checkActivityTask(serverId, null, friend.roleId, TASK_TYPE.FRIEND_NUM, friend.friendCnt);
 
         return resResult(STATUS.SUCCESS, {
             frdRoleIds, blackRoleIds,

game-server/app/servers/role/handler/heroHandler.ts

@@ -384,10 +384,10 @@ export class HeroHandler {
         });
         // 任务
         await checkTaskWithHero(roleId, sid, TASK_TYPE.HERO_TRAIN, hero, [oldJob, oldJobStage]);
-        await checkTask(roleId, sid, TASK_TYPE.HERO_TRAIN_SUM, 1, true, {});
+        await checkTask(roleId, sid, TASK_TYPE.HERO_TRAIN_SUM, newJobStage - oldJobStage, true, {});
         //活动统计
-        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.HERO_TRAIN_SUM, 1)
+        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.HERO_TRAIN_SUM, newJobStage - oldJobStage);
-        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.HERO_TRAIN, 1, { hid })
+        await checkActivityTask(serverId, sid, roleId, TASK_TYPE.HERO_TRAIN, newJobStage - oldJobStage, { hid })
 
         return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } });
     }

game-server/app/servers/role/handler/roleHandler.ts

@@ -347,7 +347,10 @@ export class RoleHandler {
         await calAllHeroCe(HERO_SYSTEM_TYPE.SCROLL, sid, roleId, {}, [hid]); // 全局增加战力
 
         // 任务
-        if (!scrollActive) await checkTask(roleId, sid, TASK_TYPE.ROLE_SCROLL_ACTIVE, 1, true, {});
+        if (!scrollActive) {
+            await checkTask(roleId, sid, TASK_TYPE.ROLE_SCROLL_ACTIVE, 1, true, {});
+            await checkActivityTask(serverId, sid, roleId, TASK_TYPE.ROLE_SCROLL_ACTIVE, 1);
+        }
 
         return resResult(STATUS.SUCCESS, {
             curHero: {

shared/pubUtils/taskUtil.ts

@@ -527,7 +527,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
             let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, activity.activityId, parma, recordData);
 
             if (addCount) {
-                if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV) {
+                if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV || taskType == TASK_TYPE.FRIEND_NUM) {
                     let playerRecord = await ActivityGrowthModel.setTaskCount(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);
                     //推送
                     task.totalCount = playerRecord.totalCount;
@@ -554,7 +554,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
             let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, activity.activityId, parma, recordData);
             console.log('******* dailyChallenge', addCount, record)
             if (addCount) {
-                if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV) {
+                if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV || taskType == TASK_TYPE.FRIEND_NUM) {
                     let playerRecord = await ActivityDailyChallengesModel.setTaskCount(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);
                     //推送
                     task.totalCount = playerRecord.totalCount;
@@ -1230,6 +1230,12 @@ export function isComplete(_roleId: string, taskType: TASK_TYPE, taskParam: stri
                 addCount = count;
             }
             break;
+        case TASK_TYPE.FRIEND_NUM:
+            addCount = count;
+            break;
+        case TASK_TYPE.ROLE_SCROLL_ACTIVE:
+            addCount = count;
+            break;
         default:
             addCount = 0;
             break;