优化：gm-server创建武将

shared/pubUtils/itemUtils.ts

@@ -1,6 +1,6 @@
 
 
-import { HeroModel, HeroType, HeroUpdate } from '../db/Hero';
+import { HeroModel, HeroType, } from '../db/Hero';
 import { ItemModel } from '../db/Item';
 import { EquipModel, RandSe, Holes, RandMain, equipUpdate } from './../db/Equip';
 import { gameData, getQuenchByQualityAndGrade, getQuenchGradeByValue } from './data';
@@ -10,12 +10,11 @@ import { getRandValueByMinMax, getRandEelm } from './util';
 import { findWhere } from 'underscore';
 import { RoleModel, RoleType, } from '../db/Role';
 import { Figure } from '../domain/dbGeneral';
-import { getTimeFun, nowSeconds } from './timeUtil';
-import { calPlayerCeAndSave, reCalAllHeroCe } from './playerCe';
-import { accomplishTask, checkTask, checkTaskWithEquip, checkTaskWithHeroes } from './taskUtil';
+import { getTimeFun } from './timeUtil';
+import { reCalAllHeroCe } from './playerCe';
+import { checkTaskWithEquip } from './taskUtil';
 // import { checkTask, checkTaskWithHeroes, checkTaskWithEquip, accomplishTask } from './taskUtil';
-import { CreateHeroParam } from '../domain/roleField/hero';
-import { SkinModel, SkinType, SkinUpdate, } from '../db/Skin';
+import { SkinModel, } from '../db/Skin';
 import { TaskListReturn } from '../domain/roleField/task';
 
 /**
@@ -185,16 +184,14 @@ export function getFriendPointObject(count: number) {
 export function getHonourObject(count: number) {
     return { id: CURRENCY_BY_TYPE.get(CURRENCY_TYPE.HONOUR), count };
 }
+
 /**
- * 解锁头像/相框
- * @param roleId 玩家id
+ * 返回 解锁头像/相框
  * @param conditions 解锁条件
  * @param role 如果已查询过role表就直接可以使用
  */
-export async function unlockFigure(roleId: string, conditions: { type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }[], role?: RoleType) {
-    if (!role || !role.heads || !role.frames) {
-        role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
-    }
+ export function unlockFigureWithoutSave(conditions: { type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }[], role: RoleType) {
+
     let { heads, frames, spines } = role;
     let figureInfo = { heads: new Array<Figure>(), frames: new Array<Figure>(), spines: new Array<Figure>() };
     for (let { type, paramHid, paramFavourLv, paramSkinId } of conditions) {
@@ -235,6 +232,20 @@ export async function unlockFigure(roleId: string, conditions: { type: number, p
 
         }
     }
+    return { figureInfo, heads, frames, spines };
+}
+
+/**
+ * 解锁头像/相框
+ * @param roleId 玩家id
+ * @param conditions 解锁条件
+ * @param role 如果已查询过role表就直接可以使用
+ */
+export async function unlockFigure(roleId: string, conditions: { type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }[], role?: RoleType) {
+    if (!role || !role.heads || !role.frames) {
+        role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
+    }
+    let { figureInfo, heads, frames, spines } = unlockFigureWithoutSave(conditions, role);
     role = await RoleModel.updateRoleInfo(roleId, { heads, frames, spines });
     return figureInfo;
 }
@@ -314,108 +325,17 @@ function unlockSingleFigure(dbFigures: Figure[], id: number, unlockDirect = fals
     return figure
 }
 
-async function getSkinsOfThisHero(roleId: string, roleName: string, hid: number, initialSkin: number, allSkins?: SkinType[]) {
-    if(!allSkins) allSkins = await SkinModel.findbyRoleAndHid(roleId, hid);
-    let skin = await increaseSkin(roleId, roleName, initialSkin);
-    if(skin) allSkins.push(skin);
-    let skins: { id: number, skin: string, enable: boolean }[] = [];
-    for(let skin of allSkins) {
-        skins.push({ id: skin.id, skin: skin._id, enable: skin.id == initialSkin });
-    }
+// async function getSkinsOfThisHero(roleId: string, roleName: string, hid: number, initialSkin: number, allSkins?: SkinType[]) {
+//     if(!allSkins) allSkins = await SkinModel.findbyRoleAndHid(roleId, hid);
+//     let skin = await increaseSkin(roleId, roleName, initialSkin);
+//     if(skin) allSkins.push(skin);
+//     let skins: { id: number, skin: string, enable: boolean }[] = [];
+//     for(let skin of allSkins) {
+//         skins.push({ id: skin.id, skin: skin._id, enable: skin.id == initialSkin });
+//     }
 
-    return skins
-}
-
-/**
- * 创建武将
- * @param roleId 玩家id
- * @param roleName 玩家名
- * @param serverId 服务器id
- * @param {CreateHeroParam} heroInfo 创建武将所需信息
- * @param funcs 玩家开启了的功能，主要用于任务
- */
-export async function createHero(roleId: string, roleName: string, serverId: number, heroInfo: CreateHeroParam, funcs?: number[]) {
-    let { role, figureInfo, heroes, calHeroResults, calAllHeroResult, taskPushMessage, activityTaskPushMessage } = await createHeroes(roleId, roleName, serverId, [heroInfo], funcs)
-    return { hero: heroes[0], role, figureInfo, calHeroResult: calHeroResults[0], calAllHeroResult, taskPushMessage, activityTaskPushMessage }
-}
-
-export async function createHeroes(roleId: string, roleName: string, serverId: number, heroInfos: CreateHeroParam[], funcs?: number[]) {
-
-    let heroNum = 0;
-    let conditions = new Array<{ type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }>();
-    let heroes: HeroType[] = [], calHeroResults = [], calAllHeroResult = undefined;
-    let figureInfos:{ heads: Figure[], frames: Figure[], spines: Figure[] }[] = [];
-
-    for (let heroInfo of heroInfos) {
-        let dicHero = gameData.hero.get(heroInfo.hid);
-        let { quality, initialStars: star, jobid: job, name: hName, initialSkin } = dicHero;
-
-        let info = { roleId, roleName, serverId, quality, star, job, hName };
-
-        let skins = await getSkinsOfThisHero(roleId, roleName, heroInfo.hid, initialSkin);
-
-        let curHero = await HeroModel.createHero(Object.assign(info, heroInfo, { skins }));
-
-        // 计算初始战力
-        let calHeroResult = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.INIT, roleId, curHero, {}); 
-        calHeroResults.push(calHeroResult);
-        heroes.push(calHeroResult.hero);
-        conditions.push({ type: FIGURE_UNLOCK_CONDITION.GET_HERO, paramHid: heroInfo.hid });
-        heroNum++;
-    }
-    figureInfos.push(await unlockFigure(roleId, conditions)); // 解锁头像
-
-    let role = await RoleModel.incRoleInfo(roleId, { heroNum }, { heroNumUpdatedAt: nowSeconds() });
-    // 任务
-    console.log('****** checkTask before', Date.now())
-    let m1 = await checkTask(roleId, TASK_TYPE.HERO_NUM, heroNum, true, {}, funcs);
-    let m2 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY, heroes, funcs);
-    let m3 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, heroes, funcs);
-    let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs);
-    let taskPushMessage = m1.concat(m2, m3, m4);
-    console.log('****** checkTask after', Date.now())
-    //成长任务
-    console.log('****** accomplishTask before', Date.now())
-    let mm1 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
-    let mm2 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY, heroNum, { heroes })
-    console.log('****** accomplishTask after', Date.now())
-    let activityTaskPushMessage = mm1.concat(mm2);
-    console.log(funcs);
-    return { role, figureInfo: combineFigureInfo(figureInfos), heroes, calHeroResults, calAllHeroResult, taskPushMessage, activityTaskPushMessage }
-}
-
-
-export async function createHeroesWhenInit(roleId: string, roleName: string, serverId: number, heroInfos: HeroUpdate[], skinInfos: SkinUpdate[], funcs?: number[]) {
-
-    let heroNum = 0;
-    let conditions = new Array<{ type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number }>();
-    let figureInfos:{ heads: Figure[], frames: Figure[], spines: Figure[] }[] = [];
-
-    for (let heroInfo of heroInfos) {
-        conditions.push({ type: FIGURE_UNLOCK_CONDITION.GET_HERO, paramHid: heroInfo.hid });
-        heroNum++;
-    }
-    figureInfos.push(await unlockFigure(roleId, conditions)); // 解锁头像
-    let heroes = await HeroModel.insertHeroes(roleId, roleName, serverId, heroInfos);
-    await SkinModel.insertSkins(roleId, roleName, skinInfos);
-
-    // 任务
-    console.log('****** checkTask before', Date.now())
-    let m1 = await checkTask(roleId, TASK_TYPE.HERO_NUM, heroNum, true, {}, funcs);
-    let m2 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY, heroes, funcs);
-    let m3 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, heroes, funcs);
-    let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs);
-    let taskPushMessage = m1.concat(m2, m3, m4);
-    console.log('****** checkTask after', Date.now())
-    //成长任务
-    console.log('****** accomplishTask before', Date.now())
-    let mm1 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
-    let mm2 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY, heroNum, { heroes })
-    console.log('****** accomplishTask after', Date.now())
-    let activityTaskPushMessage = mm1.concat(mm2);
-    console.log(funcs);
-    return { figureInfo: combineFigureInfo(figureInfos), heroes, taskPushMessage, activityTaskPushMessage }
-}
+//     return skins
+// }
 
 export function combineFigureInfo(figureInfos: { heads: Figure[], frames: Figure[], spines: Figure[] }[]) {
     let figureInfo = { heads: new Array<Figure>(), frames: new Array<Figure>(), spines: new Array<Figure>() };