优化：gm-server创建武将

game-server/app/services/rankService.ts

@@ -773,7 +773,6 @@ export class Rank {
  * @param serverId 分服
  */
 export async function setRankRedisFromDb(type: string, args?: { serverId?: number }) {
-
     if (type == REDIS_KEY.TOWER_RANK) {
         let serverId = args.serverId;
         let ranks = await RoleModel.getRank('tower', serverId, ROLE_SELECT.RANK);

game-server/app/services/rewardService.ts

@@ -7,11 +7,11 @@ import { pushCalPlayerCe, pushCalAllHeroCe, calPlayerCeAndSave } from './playerC
 import { ItemModel, ItemType } from '../db/Item';
 import { STATUS } from '../consts/statusCode';
 import { pinus } from 'pinus';
-import { addEquips, addBags, addSkin, addFigure, unlockFigure as pubUnlockFigure, createHeroes as pubCreateHeroes, transPiece, getGoldObject, getCoinObject, getApObject } from '../pubUtils/itemUtils';
+import { addEquips, addBags, addSkin, addFigure, unlockFigure as pubUnlockFigure, transPiece, getGoldObject, getCoinObject, getApObject } from '../pubUtils/itemUtils';
 import { ItemInter, RewardInter, } from '../pubUtils/interface';
 import { gameData } from '../pubUtils/data';
 import { uniq } from 'underscore';
-import { HeroModel, HeroType } from '../db/Hero';
+import { HeroModel, HeroType, HeroUpdate } from '../db/Hero';
 import { Figure } from '../domain/dbGeneral';
 import { Rank } from './rankService';
 import { checkActivityTask, checkTaskWithHero, pushActivityUpdate, pushTaskUpdate } from './taskService';
@@ -21,6 +21,8 @@ import { errlogger } from '../util/logger';
 import { BAG } from '../pubUtils/dicParam';
 import { sendMailByContent } from './mailService';
 import { calEquipSeids } from '../pubUtils/playerCe';
+import { CreateHeroes } from '../pubUtils/roleUtil';
+import { SkinUpdate } from '../db/Skin';
 
 export class CheckMeterial {
     private roleId: string;
@@ -439,15 +441,15 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
     let hids = heroInfo.map(cur => cur.hid);
     let userHeroesMap = await HeroModel.findMapByHidRange(hids, roleId);
 
-
-    let newHeroInfo: CreateHeroParam[] = [], pieces: ItemInter[] = [];
+    let infos: Map<number, { heroInfo: HeroUpdate, skinInfo: SkinUpdate }> = new Map(), pieces: ItemInter[] = [];
     for (let h of heroInfo) {
         let heroCount = h.count || 1;
         if (userHeroesMap.has(h.hid)) {
             let { pieceId, count } = transPiece(h.hid);
             pieces.push({ id: pieceId, count: count * heroCount });
         } else {
-            newHeroInfo.push(h)
+            let initInfo = await pinus.app.rpc.role.roleRemote.getInitHeroById.toServer(pinus.app.getServerId(), h.hid);
+            infos.set(h.hid, initInfo);
             userHeroesMap.set(h.hid, null);
             if (heroCount > 1) {
                 let { pieceId, count } = transPiece(h.hid);
@@ -457,25 +459,12 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
     }
 
     let resultHeroes: HeroType[] = [], resultItems: RewardInter[] = [];
-    if (newHeroInfo.length > 0) {
-
-        console.log('****** pubCreateHeroes before', Date.now())
-        let { heroes, role, figureInfo, calHeroResults, calAllHeroResult, taskPushMessage, activityTaskPushMessage } = await pubCreateHeroes(roleId, roleName, serverId, newHeroInfo, funcs);
-
-        console.log('****** pubCreateHeroes after', Date.now())
-        let r = new Rank(REDIS_KEY.HERO_NUM_RANK, { serverId });
-        await r.setRankWithRoleInfo(roleId, role.heroNum, role.heroNumUpdatedAt, role);
-
-        await pushFigureUpdate(roleId, sid, figureInfo);
-
-        // await pushCalAllHeroCe(roleId, sid, calAllHeroResult);
-        for (let calHeroResult of calHeroResults) {
-            await pushCalPlayerCe(roleId, sid, calHeroResult);
-        }
-
-        pushTaskUpdate(roleId, sid, null, taskPushMessage);
-        pushActivityUpdate(roleId, sid, null, activityTaskPushMessage);
-        resultHeroes = heroes;
+    if (infos.size > 0) {
+        let createHero = new CreateHeroes(roleId, roleName, serverId, funcs);
+        await createHero.createWithHeroInfo(infos);
+        await createHero.pushMessage(pinus, sid);
+        await createHero.updateRedisRank(Rank);
+        resultHeroes = createHero.getResultHeroes();
     }
 
     if (pieces.length > 0) {