xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server into feature/normalBattle

Browse Source 
Conflicts:
	game-server/startGameServer.sh
	web-server/package.json
This commit is contained in:
luying
2020-09-14 10:55:46 +08:00
parent 0880f26aa1 47c902b931
commit b6725151d0
40 changed files with 145 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game-server/app/servers/connector/handler/entryHandler.ts
View File

@@ -1,9 +1,9 @@
import { RoleModel } from '../../../../../shared/db/Role';
import { UserModel } from '../../../../../shared/db/User';
import { EquipModel } from './../../../db/Equip';
import { RoleModel } from './../../../db/Role';
import { UserModel } from '../../../db/User';
import { Application, Session } from 'pinus';
import {FrontendSession} from 'pinus';
import Hero from '../../../../../shared/db/Hero';
import Equip from '../../../../../shared/db/Equip';
import { HeroModel } from './../../../db/Hero';
export default function (app: Application) {
return new EntryHandler(app);
@@ -71,8 +71,8 @@ export class EntryHandler {
// put user into channel
let users = await self.app.rpc.chat.chatRemote.add.route(session)(role.roleId, self.app.get('serverId'), rid, true);
let heros = await Hero.findByRole(role.roleId);
let equips = await Equip.findbyRole(role.roleId);
let heros = await HeroModel.findByRole(role.roleId);
let equips = await EquipModel.findbyRole(role.roleId);
role['heros'] = heros;
role['equips'] = equips;
return {