创建武将

game-server/app/servers/chat/remote/guildRemote.ts

@@ -92,7 +92,6 @@ export class GuildRemote {
      */
     private pushMessage(guildCode: string, path: string, message: any) {
         let channel = this.getChannel(guildCode);
-        console.log('##### channel', guildCode, channel)
         if (!!channel) {
             channel.pushMessage(path, resResult(STATUS.SUCCESS, message));
         }

game-server/app/servers/gm/handler/gmRoleHandler.ts

@@ -21,7 +21,7 @@ import { HeroModel } from '../../../db/Hero';
 import { calAllHeroCe, calPlayerCeAndSave } from '../../../services/playerCeService';
 import { SkinModel } from '../../../db/Skin';
 import { PvpDefenseModel } from '../../../db/PvpDefense';
-import { calculatetopLineup } from '../../../pubUtils/playerCe';
+import { calculatetopLineup } from '../../../pubUtils/util';
 import { createHeroes } from '../../../services/role/createHero';
 
 let timer: NodeJS.Timer;

game-server/app/servers/role/handler/heroHandler.ts

@@ -11,14 +11,14 @@ import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, g
 import { ItemInter, RewardInter } from '../../../pubUtils/interface';
 import { getDropItems, FIGURE_UNLOCK_CONDITION } from '../../../consts/constModules/itemConst'
 import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax, pushHeroWakeUp } from '../../../services/chatService';
-import { calculatetopLineup } from '../../../pubUtils/playerCe';
+import { calculatetopLineup } from '../../../pubUtils/util';
 import { PvpDefenseModel } from '../../../db/PvpDefense';
 import { checkTask, checkTaskInHeroQUalityUp, checkTaskInHeroStarUp, checkTaskInHeroTrain, checkTaskInHeroWakeUp } from '../../../services/task/taskService';
 import { isNumber, pick } from 'underscore';
 import { updateEplaces } from '../../../services/equipService';
 import { addConsumeToHero, checkUnlockTalentCondition, initSkinTalent, updateSkinTalent } from '../../../services/roleService';
 import { JewelModel, jewelUpdate } from '../../../db/Jewel';
-import { CalHeroCe } from '../../../domain/roleField/calCe';
+import { CalHeroCe } from '../../../services/role/_calCe';
 import { HERO, REBORN } from '../../../pubUtils/dicParam';
 import { createHero, createHeroes } from '../../../services/role/createHero';
 import { CheckMeterial } from '../../../services/role/checkMaterial';
@@ -654,9 +654,8 @@ export class HeroHandler {
 
         let newSkins = initSkinTalent(skins);
         let dicHeroScroll = getScollByStar(dicHero.quality, dicHero.initialStars, dicHero.quality, 0);
-        let initInfo = HeroModel.getInitInfo({ 
+        let initInfo = HeroModel.getInitInfo(hid, { 
             job: dicJob.jobid, skins: newSkins, skinId, ce,
-            star: dicHero.initialStars, quality: dicHero.quality,
             scrollActive: scrollActive, 
             scrollId: scrollActive? dicHeroScroll.id: 0,
             scrollStar: scrollActive? dicHeroScroll.stars: 0,

game-server/app/servers/role/handler/roleHandler.ts

@@ -25,7 +25,7 @@ import * as dicParam from '../../../pubUtils/dicParam';
 import Counter from '../../../db/Counter';
 import { UserModel } from '../../../db/User';
 import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService';
-import { CreateHeroes } from '../../../services/role/createHero';
+import { createHeroes, CreateHeroes } from '../../../services/role/createHero';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -50,20 +50,8 @@ export class RoleHandler {
         let checkName = await RoleModel.checkName(roleName, serverId);
         if (checkName) return resResult(STATUS.NAME_HAS_USED);
 
-        let initInfos: { role: RoleUpdate, initInfos: {heroInfo: HeroUpdate, skinInfo: SkinUpdate}[], figureInfo: { heads: Figure[], frames: Figure[], spines: Figure[] }} 
-            = this.app.get('initRoleInfos');
-        role = await RoleModel.updateRoleInfo(roleId, {...initInfos.role, roleName, hasInit: true});
-        let createHero = new CreateHeroes(roleId, roleName, serverId);
-
-        let infos = new Map();
-        for(let {heroInfo, skinInfo} of initInfos.initInfos) {
-            infos.set(heroInfo.hid, { heroInfo, skinInfo });
-        }
-        await createHero.createWithInitInfo(infos, initInfos.figureInfo);
-        await createHero.pushMessage(sid);
-        await createHero.updateRedisRank();
-        let heroes = createHero.getResultHeroes();
-
+        let { resultHeroes: heroes } = await createHeroes(roleId, roleName, sid, serverId, DEFAULT_HEROES.map(hid => ({hid, count: 1})));
+        role = await RoleModel.updateRoleInfo(roleId, { roleName, hasInit: true });
         session.set('roleName', roleName);
         session.push('roleName', () => { });
 

game-server/app/servers/role/remote/roleRemote.ts

@@ -5,14 +5,11 @@ import { HeroUpdate } from '../../../db/Hero';
 import { RoleUpdate } from '../../../db/Role';
 import { SkinUpdate } from '../../../db/Skin';
 import { RankFirstModel, RankFirstType } from '../../../db/RankFirst';
-import { DEFAULT_HEROES } from '../../../consts';
 import { Figure } from '../../../domain/dbGeneral';
-import { getDefaultRoleInfo } from '../../../services/roleService';
 import { PVPConfigModel, PVPConfigType } from '../../../db/SystemConfig';
 import { treatRoleName, taflush } from '../../../services/sdkService';
 import { getServerMainten, setServerMainten, stopServerMainten } from '../../../services/gmService';
 import { errlogger } from '../../../util/logger';
-import { getInitRoleInfo } from '../../../services/role/initRoleService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -23,16 +20,12 @@ export class RoleRemote {
 
     constructor(private app: Application) {
         this.app = app;
-        this.channelService = app.get('channelService');
-        this.setInitRole();
+        // this.channelService = app.get('channelService');
         this.loadRankFirst();
         this.initPvpSeasonNum();
     }
-    private channelService: ChannelService;
-    private initHeroes: Map<number, HeroUpdate> = new Map(); // hid => hero
-    private initRole: RoleUpdate = {};
-    private initSkins: Map<number, SkinUpdate> = new Map(); // hid => skin
-    private figureInfo: {heads: Figure[], frames: Figure[], spines: Figure[]};
+    // private channelService: ChannelService;
+
     private rankFirstRewards: Map<number, Map<number, RankFirstType>> = new Map();
 
     private async loadRankFirst() {
@@ -68,76 +61,6 @@ export class RoleRemote {
         }
     }
 
-    public setInitRole() {
-        try {
-            let result = getInitRoleInfo();
-            let { role, heroes, skins, figureInfo } = result;
-            for(let hero of heroes) {
-                this.initHeroes.set(hero.hid, hero);
-            }
-            for(let skin of skins) {
-                this.initSkins.set(skin.hid, skin);
-            }
-            this.initRole = role;
-            this.figureInfo = figureInfo;
-            const initRoleInfos = getDefaultRoleInfo(this.initHeroes, this.initSkins, this.initRole, this.figureInfo);
-            this.app.set('initRoleInfos', initRoleInfos);
-            this.app.set('initHeroes', this.initHeroes);
-            this.app.set('initSkins', this.initSkins);
-        } catch(e) {
-            errlogger.error(`remote ${__filename} \n ${e.stack}`);
-        }
-    }
-
-    public getInitRoleInfos() {
-        try {
-            let initRoleInfos = this.app.get('initRoleInfos');
-            if (!initRoleInfos) {
-                initRoleInfos = getDefaultRoleInfo(this.initHeroes, this.initSkins, this.initRole, this.figureInfo);
-                this.app.set('initRoleInfos', initRoleInfos);
-            }
-            return initRoleInfos;
-        } catch(e) {
-            errlogger.error(`remote ${__filename} \n ${e.stack}`);
-        }
-    }
-
-    public getInitHeroes() {
-        try {
-            let result: HeroUpdate[] = [];
-            for(let hid of DEFAULT_HEROES) {
-                result.push(this.initHeroes.get(hid));
-            }
-            return result;
-        } catch(e) {
-            errlogger.error(`remote ${__filename} \n ${e.stack}`);
-        }
-    }
-
-    public getInitSkins() {
-        try {
-            let result: SkinUpdate[] = [];
-            for(let hid of DEFAULT_HEROES) {
-                result.push(this.initSkins.get(hid));
-            }
-            return result;
-        } catch(e) {
-            errlogger.error(`remote ${__filename} \n ${e.stack}`);
-        }
-    }
-
-    public getInitHeroById(hid: number) {
-        try {
-            return {
-                heroInfo: this.initHeroes.get(hid),
-                skinInfo: this.initSkins.get(hid)
-            }
-        } catch(e) {
-            errlogger.error(`remote ${__filename} \n ${e.stack}`);
-        }
-    }
-
-
     /**
      * 重载json资源
      */