任务：修改taskType

game-server/app/services/role/createHero.ts

@@ -4,7 +4,6 @@ import { HeroModel, HeroSkin, HeroType, HeroUpdate } from "../../db/Hero";
 import { RoleModel, RoleType, RoleUpdate } from "../../db/Role";
 import { SkinUpdate } from "../../db/Skin";
 import { Figure, TopHero } from "../../domain/dbGeneral";
-import { accomplishTask, checkTask, checkTaskWithHeroes } from '../../pubUtils/taskUtil';
 import { combineFigureInfo, unlockFigureWithoutSave } from '../../pubUtils/itemUtils';
 import { TaskListReturn } from "../../domain/roleField/task";
 import { GuildModel, GuildType } from "../../db/Guild";
@@ -15,10 +14,10 @@ import { nowSeconds } from "../../pubUtils/timeUtil";
 import { saveCeChangeLog } from "../../pubUtils/logUtil";
 import { reduceCe, resResult } from "../../pubUtils/util";
 import { AttributeCal } from "../../domain/roleField/attribute";
-import { ActivityInRemote } from "../../domain/activityField/activityField";
 import { HeroShowParam } from "../../domain/roleField/hero";
 import { pinus } from "pinus";
 import { Rank } from "../rankService";
+import { checkTaskInCreateHero } from "../task/taskService";
 
 export class UpdateHeroes {
     roleId: string;
@@ -188,36 +187,17 @@ export class CreateHeroes extends UpdateHeroes {
         this.resultHeroes = await HeroModel.insertHeroes(this.roleId, this.roleName, this.serverId, heroeInfos);
     }
 
-    public async clearTask(activitiesTypeMap: ActivityInRemote[]) {
-        // 任务
-        // console.log('****** checkTask before', Date.now())
-        let m1 = await checkTask(this.roleId, TASK_TYPE.HERO_NUM, this.heroNum, true, {});
-        let m2 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_QUALITY, this.resultHeroes);
-        let m3 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, this.resultHeroes);
-        let m4 = await checkTaskWithHeroes(this.roleId, TASK_TYPE.HERO_LV, this.resultHeroes);
-        this.taskPushMessage.push(...m1, ...m2, ...m3, ...m4);
-        // console.log('****** checkTask after', Date.now())
-        //成长任务
-        // console.log('****** accomplishTask before', Date.now())
-        let mm1 = await accomplishTask(this.serverId, this.roleId, TASK_TYPE.HERO_NUM, this.heroNum, null,  activitiesTypeMap)
-        console.log('****mn1', mm1)
-        let mm2 = await accomplishTask(this.serverId, this.roleId, TASK_TYPE.HERO_QUALITY, this.heroNum, { heroes: this.resultHeroes }, activitiesTypeMap);
-        // console.log('****** accomplishTask after', Date.now())
-        this.activityTaskPushMessage.push(...mm1, ...mm2);
-    }
-
     public async pushMessage(sid: string) {
         let role = await this.getRole();
         let uids = [{ uid: this.roleId, sid }];
         pinus.app.get('channelService').pushMessageByUids('onPlayerCeUpdate', resResult(STATUS.SUCCESS, { ce: reduceCe(role.ce) , heros: this.pushHeroes.map(cur => { return {...cur, ce: reduceCe(cur.ce), incHeroCe: reduceCe(cur.incHeroCe) }}), topLineupCe:  reduceCe(role.topLineupCe) }), uids);
-        pinus.app.get('channelService').pushMessageByUids('onTaskUpdate', resResult(STATUS.SUCCESS, this.taskPushMessage), uids);
-        pinus.app.get('channelService').pushMessageByUids('onActivityTaskUpdate', resResult(STATUS.SUCCESS, this.activityTaskPushMessage), uids);
         let figureInfo = combineFigureInfo(this.figureInfos);
         if (!!figureInfo && (figureInfo.heads.length > 0 || figureInfo.frames.length > 0 || figureInfo.spines.length > 0)) {
             pinus.app.get('channelService').pushMessageByUids('onHeadChange', resResult(STATUS.SUCCESS, { ...figureInfo }), uids);
         }
         pinus.app.get('channelService').pushMessageByUids('onHeroSkinChange', resResult(STATUS.SUCCESS, this.skinPushMessages), uids);
         pinus.app.get('channelService').pushMessageByUids('onHeroUpdate', resResult(STATUS.SUCCESS, { heroes: this.getResultHeroes() }), uids);
+        checkTaskInCreateHero(this.serverId, this.roleId, sid, this.heroNum, this.resultHeroes)
     }
 
     public getResultHeroes() {

game-server/app/services/role/rewardService.ts

@@ -600,7 +600,6 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
     if (infos.size > 0) {
         let createHero = new CreateHeroes(roleId, roleName, serverId);
         await createHero.createWithHeroInfo(infos);
-        await createHero.clearTask(await getActivities())
         await createHero.pushMessage(sid);
         await createHero.updateRedisRank();
         heroes = createHero.getShowHeroes();