任务：埋点30/70

shared/pubUtils/itemUtils.ts

@@ -5,7 +5,7 @@ import { ItemModel } from '../db/Item';
 import { EquipModel, RandSe, Holes } from './../db/Equip';
 import { BagInter, EquipInter } from './interface';
 import { gameData } from './data';
-import { RANDOM_SE_COUNT, FIX_ATTRIBUTES_RAN, ITID, CURRENCY_BY_TYPE, CURRENCY_TYPE, ROLE_SELECT, FIGURE_UNLOCK_CONDITION, CONSUME_TYPE, HERO_SYSTEM_TYPE } from '../consts';
+import { RANDOM_SE_COUNT, FIX_ATTRIBUTES_RAN, ITID, CURRENCY_BY_TYPE, CURRENCY_TYPE, ROLE_SELECT, FIGURE_UNLOCK_CONDITION, CONSUME_TYPE, HERO_SYSTEM_TYPE, TASK_TYPE } from '../consts';
 import { getRandValueByMinMax, getRandEelm } from './util';
 
 import { findWhere } from 'underscore';
@@ -13,6 +13,7 @@ import { RoleModel, RoleType } from '../db/Role';
 import { Figure } from '../domain/dbGeneral';
 import { getBeforeDaySeconds, nowSeconds } from './timeUtil';
 import { calPlayerCeAndSave, reCalAllHeroCe } from './playerCe';
+import { checkTask, checkTaskWithHeroes, checkTaskWithEquip } from './taskUtil';
 
 export async function addSkins(roleId: string, id: number) {
     let skinInfo = gameData.fashion.get(id);
@@ -61,7 +62,11 @@ export async function addEquips(roleId: string, roleName: string, weapon: EquipI
     }
 
     const equip = await EquipModel.createEquip({roleId, roleName, id, name, quality, suitId, randRange, ePlaceId: type, randSe, holes, hid});
-    return equip
+    
+    // 任务
+    let pushMessage = await checkTaskWithEquip(roleId, TASK_TYPE.EQUIP_SUIT, equip);
+
+    return { equipInfo: equip, pushMessage }
 }
 
 /**
@@ -217,8 +222,8 @@ function unlockSingleFigure(dbFigures: Figure[], id: number, unlockDirect = fals
 }
 
 export async function createHero(roleId: string, heroInfo: HeroUpdate) {
-    let { role, figureInfo, heroes, calHeroResults, calAllHeroResults } = await createHeroes(roleId, [heroInfo])
-    return { hero: heroes[0], role, figureInfo, calHeroResult: calHeroResults[0], calAllHeroResult: calAllHeroResults[0] }
+    let { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage } = await createHeroes(roleId, [heroInfo])
+    return { hero: heroes[0], role, figureInfo, calHeroResult: calHeroResults[0], calAllHeroResult: calAllHeroResults[0], taskPushMessage }
 }
 
 export async function createHeroes(roleId: string, heroInfos: HeroUpdate[]) {
@@ -226,7 +231,7 @@ export async function createHeroes(roleId: string, heroInfos: HeroUpdate[]) {
     let heroNum = 0;
     let skinIds = new Array<number>();
     let conditions = new Array<{type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }>();
-    let  heroes = [], calHeroResults = [], calAllHeroResults = [];
+    let heroes = [], calHeroResults = [], calAllHeroResults = [];
 
     for(let heroInfo of heroInfos) {
         let curHero = await HeroModel.createHero(heroInfo); heroes.push(curHero);
@@ -243,5 +248,11 @@ export async function createHeroes(roleId: string, heroInfos: HeroUpdate[]) {
     let figureInfo = await unlockFigure(roleId, conditions); // 解锁头像
 
     let role = await RoleModel.incRoleInfo(roleId, { heroNum }, { heroNumUpdatedAt: nowSeconds() });
-    return { role, figureInfo, heroes, calHeroResults, calAllHeroResults }
+    // 任务
+    let m1 = await checkTask(roleId, TASK_TYPE.HERO_NUM, heroNum, true, {});
+    let m2 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY, heroes);
+    let m3 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, heroes);
+    let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes);
+    let taskPushMessage = m1.concat(m2, m3, m4);
+    return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage }
 }