Merge branch 'ce'

# Conflicts:
#	game-server/app.ts

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -87,7 +87,7 @@ export class GachaHandler {
             if (!costResult) return resResult(STATUS.GACHA_COST_NOT_ENOUGH);
         }
         // 给东西
-        console.log('****', heroInfo)
+        // console.log('****', heroInfo)
         let { heroes } = await createHeroes(roleId, roleName, sid, serverId, funcs, heroInfo);
         await addItems(roleId, roleName, sid, items);
         // 更新数据

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

@@ -1,6 +1,6 @@
 import { STATUS } from '../../../consts/statusCode';
-import { RoleModel } from './../../../db/Role';
-import { HeroModel } from '../../../db/Hero';
+import { RoleModel, RoleUpdate } from './../../../db/Role';
+import { HeroModel, HeroUpdate } from '../../../db/Hero';
 import { resResult, decodeIdCntArrayStr, parseGoodStr } from '../../../pubUtils/util';
 import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
 import { handleCost, addItems, createHeroes } from '../../../services/rewardService';
@@ -20,7 +20,9 @@ import { checkTaskWithHero, checkTask, checkTaskWithArgs, checkActivityTask } fr
 import { getGoldObject, getCoinObject } from '../../../pubUtils/itemUtils';
 import { RScriptRecordModel } from '../../../db/RScriptRecord';
 import { checkPvp } from '../../../services/pvpService';
-import { pushData } from '../../../services/connectorService';
+import { SkinModel, SkinUpdate } from '../../../db/Skin';
+import { CreateHeroes } from '../../../pubUtils/roleUtil';
+import { Figure } from '../../../domain/dbGeneral';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -45,15 +47,16 @@ export class RoleHandler {
         let checkName = await RoleModel.checkName(roleName, serverId);
         if (checkName) return resResult(STATUS.NAME_HAS_USED);
 
-        let heroInfos = [];
-        for (let hid of DEFAULT_HEROES) {
-            heroInfos.push({
-                hid, lv: DEFAULT_HERO_LV, exp: getHeroExpByLv(DEFAULT_HERO_LV - 1) || 0
-            });
-        }
-
         console.log('****** createHeroes before', Date.now())
-        await createHeroes(roleId, roleName, sid, serverId, funcs, heroInfos);
+        let initInfos: { role: RoleUpdate, heroes: HeroUpdate[], skins: SkinUpdate[], figureInfo: { heads: Figure[], frames: Figure[], spines: Figure[] }} 
+            = await this.app.rpc.role.roleRemote.getInitRoleInfos.toServer(this.app.getServerId());
+        role = await RoleModel.updateRoleInfo(roleId, {...initInfos.role, roleName, hasInit: true});
+        let createHero = new CreateHeroes(roleId, roleName, serverId, funcs);
+        await createHero.createWithInitInfo(initInfos.heroes, initInfos.skins, initInfos.figureInfo);
+        await createHero.pushMessage(pinus, sid);
+        await createHero.updateRedisRank(Rank);
+        let heroes = createHero.getResultHeroes();
+
         console.log('****** createHeroes after', Date.now())
         session.set('roleName', roleName);
         session.push('roleName', () => { });
@@ -61,19 +64,15 @@ export class RoleHandler {
         let items = [].concat(DEFAULT_ITEMS, DEFAULT_EQUIPS, [getGoldObject(DEFAULT_GOLD)], [getCoinObject(DEFAULT_COIN)]);
         await addItems(roleId, roleName, sid, items);
 
-        console.log('****** calAllHeroCe before', Date.now())
-        let calResult = await calAllHeroCe(HERO_SYSTEM_TYPE.INIT, sid, roleId, { hasInit: true, roleName });
-        console.log('****** calAllHeroCe after', Date.now())
-
         let battleId = SCRIPT.SCRIPT_BATTLE_ID;
         let warInfo = gameData.war.get(battleId);
         await RScriptRecordModel.setScript(roleId, battleId, warInfo.warType, 2, SCRIPT.SCRIPT_NAME);
 
-        await checkPvp(calResult.role);
+        await checkPvp(role);
 
         console.log('******** initRole end', Date.now());
         return resResult(STATUS.SUCCESS, {
-            roleId, roleName, heroes: calResult.heros
+            roleId, roleName, heroes
         })
     }
 
@@ -523,4 +522,13 @@ export class RoleHandler {
         return resResult(STATUS.SUCCESS, { roleName: role.roleName });
     }
 
+    async setInitRole() {
+        this.app.rpc.role.roleRemote.setInitRole.toServer(this.app.getServerId());
+        return resResult(STATUS.SUCCESS);
+    }
+    async getInitRole() {
+        let initRoleInfo = await this.app.rpc.role.roleRemote.getInitRoleInfos.toServer(this.app.getServerId());
+
+        return resResult(STATUS.SUCCESS, initRoleInfo)
+    }
 }

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

@@ -1,8 +1,12 @@
-import { Application, ChannelService, FrontendSession, RemoterClass, HandlerService, } from 'pinus';
-import { STATUS } from '../../../consts/statusCode';
-import { resResult } from '../../../pubUtils/util';
+import { Application, ChannelService, HandlerService, } from 'pinus';
 // import { sendRolesMails } from '../../../services/mailService';
 import { reloadResources } from '../../../pubUtils/data';
+import { HeroUpdate } from '../../../db/Hero';
+import { RoleUpdate } from '../../../db/Role';
+import { SkinUpdate } from '../../../db/Skin';
+import { getInitRoleInfo } from '../../../pubUtils/roleUtil';
+import { DEFAULT_HEROES } from '../../../consts';
+import { Figure } from '../../../domain/dbGeneral';
 export default function (app: Application) {
     new HandlerService(app, {});
     return new RoleRemote(app);
@@ -13,13 +17,59 @@ export class RoleRemote {
     constructor(private app: Application) {
         this.app = app;
         this.channelService = app.get('channelService');
+        this.setInitRole();
     }
     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[]};
 
+    public setInitRole() {
+        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;
+    }
+
+    public getInitRoleInfos() {
+        return {
+            heroes: this.getInitHeroes(),
+            skins: this.getInitSkins(),
+            role: this.initRole,
+            figureInfo: this.figureInfo
+        };
+    }
+
+    public getInitHeroes() {
+        let result: HeroUpdate[] = [];
+        for(let hid of DEFAULT_HEROES) {
+            result.push(this.initHeroes.get(hid));
+        }
+        return result;
+    }
+
+    public getInitSkins() {
+        let result: SkinUpdate[] = [];
+        for(let hid of DEFAULT_HEROES) {
+            result.push(this.initSkins.get(hid));
+        }
+        return result;
+    }
+
+    public getInitHeroById(hid: number) {
+        return {
+            heroInfo: this.initHeroes.get(hid),
+            skinInfo: this.initSkins.get(hid)
+        }
+    }
 
-    // sendGmMailsToRoles(mails) {
-    //     sendRolesMails(mails)
-    // }
 
     /**
      * 重载json资源