任务：埋点完成

game-server/app/services/comBattleService.ts

@@ -21,7 +21,7 @@ import { getRoleIds } from '../pubUtils/friendUtil';
 import { getTeamSearchByQuality, rmRoleFromQueue } from './redisService';
 import { addUserToChannel } from './roleService';
 import { ChannelUser } from '../domain/ChannelUser';
-
+import { checkTaskInComBattleEnd } from './taskService';
 
 /**
  * 在给定的品质列表中随机返回一定数量的藏宝图Id
@@ -233,7 +233,7 @@ function updateRobotKilled(bossHp: number, roleSt: RoleStatus) {
 }
 
 export async function handleComBtlProgress(teamStatus, robotHurtTimer: Map<string, NodeJS.Timer>, teamMap: Map<string, any>, channel: Channel) {
-    const { teamCode } = teamStatus;
+    const { teamCode, roleIds, capId, quality } = teamStatus;
     // 判断战斗是否结束
     let battleSt = checkComBattleResult(teamStatus);
     teamStatus.status = battleSt;
@@ -258,6 +258,10 @@ export async function handleComBtlProgress(teamStatus, robotHurtTimer: Map<strin
         }
         clearRobotHurtTimer(teamStatus, robotHurtTimer);
         channel.pushMessage('onTeamComplete', resResult(STATUS.SUCCESS, {teamCode, result}));
+
+        // 任务
+        await checkTaskInComBattleEnd(roleIds, capId, quality);
+
         teamMap.delete(teamCode);
     }
 }

game-server/app/services/guildService.ts

@@ -1,7 +1,7 @@
 import { gameData, getGuildActiveWeekReward, getGuildActiveByIdAndType, getGoodById } from "../pubUtils/data";
 import { GuildModel } from "../db/Guild";
 import { resResult, shouldRefresh } from "../pubUtils/util";
-import { STATUS, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, CHAT_SERVER } from "../consts";
+import { STATUS, MAIL_TYPE, GUILD_AUTH, GUILD_JOB, REDIS_KEY, CHAT_SERVER, TASK_TYPE } from "../consts";
 import { RoleModel } from "../db/Role";
 import { UserGuildModel, UserGuildType } from "../db/UserGuild";
 import { UserGuildApplyModel } from "../db/UserGuildApply";
@@ -20,6 +20,7 @@ import { getMailContent } from '../services/mailService';
 import { DATA_NAME } from '../consts/dataName';
 import { addRoleToGuildChannel } from "./chatService";
 import { Rank } from "./rankService";
+import { checkTask } from "./taskService";
 
 /**
  * @description 检查该玩家是否有权限做操作
@@ -277,6 +278,8 @@ export async function settleGuildWeekly() {
                 }
             });
             await sendMail(MAIL_TYPE.GUILD_ACTIVE_REWARD, roleId, '系统', [], reward);
+            // 任务
+            await checkTask(roleId, null, TASK_TYPE.GUILD_JOB, 1, false, { job });
         }
 
         await GuildModel.updateInfo(code, { activeWeekly: 0 }, {});

game-server/app/services/taskService.ts

@@ -7,7 +7,7 @@ import { TaskParam } from '../domain/roleField/task';
 import { HeroType } from '../db/Hero';
 import { EquipType } from '../db/Equip';
 import { getRoleOnlineInfo } from './redisService';
-import { TASK } from '../pubUtils/dicParam';
+import { HeroScores } from '../db/PvpHistoryOpp';
 
 export async function checkTaskWithRoles(roleId: string, sid: string, taskType: number, roles: RoleType[]) {
     for(let role of roles) {
@@ -69,5 +69,30 @@ export async function checkTaskInBattleEnd(roleId: string, sid: string, battleId
     await checkTaskWithWar(roleId, sid, TASK_TYPE.BATTLE_DUNGEON_WAR, battleId, heroes, 1, star);
     await checkTaskWithWar(roleId, sid, TASK_TYPE.BATTLE_TOWER, battleId, heroes, 1, star);
     await checkTaskWithWar(roleId, sid, TASK_TYPE.BATTLE_VESTIGE, battleId, heroes, 1, star);
+    await checkTaskWithWar(roleId, sid, TASK_TYPE.BATTLE_EXPEDITION, battleId, heroes, 1, star);
 
+}
+
+export async function checkTaskInComBattleEnd(roleIds: string[], capId: string, quality: number) {
+    for(let roleId of roleIds) {
+        if(roleId == capId && roleIds.length > 1) {  // 招募队友
+            await checkTask(roleId, null, TASK_TYPE.COM_BATTLE_CREATE_TEAM, 1, true, {});
+        } else if (roleId !== capId) { // 协助寻宝
+            await checkTask(roleId, null, TASK_TYPE.COM_BATTLE_ASSIST_TEAM, 1, true, {});
+        }
+        await checkTask(roleId, null, TASK_TYPE.COM_BATTLE, 1, true, {});
+        await checkTask(roleId, null, TASK_TYPE.COM_BATTLE_QUALITY, 1, true, { quality });
+    }
+}
+
+export async function checkTaskInPvpEnd(roleId: string, sid: string, isSuccess: boolean, heroScores: HeroScores[]) {
+    await checkTask(roleId, sid, TASK_TYPE.PVP, 1, true, {});
+    if(isSuccess) {
+        await checkTask(roleId, sid, TASK_TYPE.PVP_WIN, 1, true, {});
+        await checkTask(roleId, sid, TASK_TYPE.PVP_WIN_SERIES, 1, true, {});
+    } else {
+        await checkTask(roleId, sid, TASK_TYPE.PVP_WIN_SERIES, 0, false, {});
+    }
+
+    await checkTask(roleId, sid, TASK_TYPE.PVP, 0, false, { heroScores });
 }

game-server/app/services/timeTaskService.ts

@@ -8,7 +8,7 @@ import { getPvpGkWarIds, getPvpRankRewards, getPvpHeroRewards, getResultMaxRank,
 import { deepCopy, getRandomArr, resResult } from '../pubUtils/util';
 import { getLvByScore } from './pvpService';
 import { getAllOnlineRoles, getAllServers, initSingleRank, delGuildActivityRank } from './redisService';
-import { MAIL_TYPE, REDIS_KEY, ADULT_AGE, GUEST_MAX_TIME, ADDICTION_PREVENTION_CODE, GUILD_ACTIVITY_STATUS, GUILD_ACTIVITY_TYPE } from '../consts';
+import { MAIL_TYPE, REDIS_KEY, ADULT_AGE, GUEST_MAX_TIME, ADDICTION_PREVENTION_CODE, GUILD_ACTIVITY_STATUS, GUILD_ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { RoleModel } from '../db/Role';
 import { MailModel, MailType } from '../db/Mail';
 import { pinus } from 'pinus';
@@ -25,6 +25,7 @@ import { DicGuildActivity } from '../pubUtils/dictionary/DicGuildActivity';
 import { GuildModel } from '../db/Guild';
 import { dispatch } from '../util/dispatcher';
 import { Rank } from './rankService';
+import { checkTask } from './taskService';
 
 const PER_SECOND = 1 * 1000;
 const PER_DAY = 24 * 60 * 60;
@@ -184,6 +185,9 @@ export async function checkResult(pvpDefense: PvpDefenseType, seasonNum: number,
         oldSeasonData:{refOppCnt: pvpDefense.refOppCnt, rankLv, score: pvpDefense.score, pLv: oldPLv, heroScores: oldHeroScores, 
             seasonNum: pvpDefense.seasonNum, challengeCnt, challengeRefTime, seasonEndTime: oldSeasonEndTime
         }, heroGoods, rankGoods, show: true });//结算修改玩家pvp信息
+    // 更新任务
+    await checkTask(pvpDefense.roleId, null, TASK_TYPE.PVP_HERO_SCORE, 0, false, { heroScores: pvpDefense.heroScores });
+    await checkTask(pvpDefense.roleId, null, TASK_TYPE.PVP_RANK, 1, false, { rankLv });
     return { rankLv, score, pLv, heroScores: pvpDefense.heroScores, seasonNum, challengeCnt:PVP.PVP_CHALLENGE_COUNTS, challengeRefTime:0, oldSeasonEndTime, heroGoods:heroGoods.map(({id, count})=>{
         return {id, count};
     }), rankGoods};