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

将 web-server 和 game-server 中的公共文件改为链接

Browse Source
This commit is contained in:
liangtongchuan
2020-09-10 17:20:27 +08:00
parent f8ac401c67
commit dbff02f5a6
32 changed files with 126 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shared/db/Equip.ts
View File

@@ -1,5 +1,3 @@
import { COUNTER } from './../consts/consts';
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@@ -47,12 +45,12 @@ export default class Equip extends BaseModel {
}
public static async createEquip(equipInfo: {roleId: string, roleName: string, eid: number, seqId: number, type: number, eName: string}, lean = true) {
const equip = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, equipInfo, {upsert: true, new: true}).lean();
const equip = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, equipInfo, {upsert: true, new: true}).lean(lean);
return equip;
}
public static async putOn(hid: number, equipId: string, lean = true) {
const equip = await EquipModel.findOneAndUpdate({ _id: equipId }, {hid}, {new: true});
const equip = await EquipModel.findOneAndUpdate({ _id: equipId }, {hid}, {new: true}).lean(lean);
return equip;
}
}

2
shared/db/Game.ts
View File

@@ -1,4 +1,4 @@
import { APP_ID } from '../../game-server/app/consts/consts';
import { APP_ID } from './../consts/consts';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';

6
shared/db/Hero.ts
View File

@@ -1,5 +1,5 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, arrayProp, Ref, mongoose } from '@typegoose/typegoose';
import { index, getModelForClass, prop, Ref, mongoose } from '@typegoose/typegoose';
import Equip from './Equip';
/**
@@ -57,7 +57,9 @@ export default class Hero extends BaseModel {
public static async addEquip(roleId: string, hid: number, equipId: string, lean = true) {
const hero = await HeroModel.findOneAndUpdate({ roleId, hid }, {$push: {equips: equipId}}, {new: true}).lean(lean);
await Equip.putOn(hero.hid, equipId);
if (hero) {
await Equip.putOn(hero.hid, equipId);
}
return hero;
}

9
shared/db/Role.ts
View File

@@ -1,4 +1,3 @@
import { CounterModel } from './Counter';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import User from './User';
@@ -97,8 +96,12 @@ export default class Role extends BaseModel {
return role;
}
public static async createRole(userInfo: User, serverType: string, serverId: number, roleName: string) {
public static async createRole(uid: number, serverId: number, roleInfo: {roleId: string; roleName: string; seqId: number; code: string}, lean = true) {
const user = await User.findUserByUid(uid);
if (!user) return null;
const info = Object.assign(roleInfo, { userInfo: user, serverType: user.serverType, serverId });
const role = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, info, { upsert: true, new: true }).lean(lean);
return role;
}
}

2
shared/db/User.ts
View File

@@ -26,7 +26,7 @@ export default class User extends BaseModel {
telHash: string;
@prop({ required: true })
channelId: string;COUNTER
channelId: string;
@prop({ required: true })
guestId: string;