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

数数：修改创建角色逻辑

Browse Source
This commit is contained in:
luying
2022-05-19 11:56:40 +08:00
parent 77e6c3ba8e
commit afecae3303
10 changed files with 67 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/consts/constModules/httpConst.ts
View File

@@ -33,7 +33,7 @@ export enum SDK_37_CONST {
export enum SDK_TA_CONST {
APPID = '74120ffc6f2945448cc60bf1540c5ad4',
SERVER_URL = 'https://shushu.xyplay.cn',
LOG_PATH = '/root/zyz/game-server/logs/ta',
LOG_PATH = '/zyz_logs/ta',
}
export const WJX_KEY = "f98551ef-4c7a-4ae2-abda-b7cca2684fe6"

2
shared/consts/constModules/sysConst.ts
View File

@@ -846,7 +846,7 @@ export enum THINKING_DATA_MODE_LIST {
BATCH = 'batch',
LOGGING = 'logging',
}
export let THINKING_DATA_MODE = THINKING_DATA_MODE_LIST.BATCH;
export let THINKING_DATA_MODE = THINKING_DATA_MODE_LIST.LOGGING;
export enum BLOCK_TYPE {

6
shared/db/Role.ts
View File

@@ -311,6 +311,8 @@ export default class Role extends BaseModel {
@prop({ required: true })
sdkMark: boolean; // 37sdk标记有问题
@prop({ required: false })
shushuMark: string; // 数数distinctId
public static async findAllByUid(uid: number, getters = false, virtuals = true) {
const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId head frame spine heads frames spines lv updatedAt').lean({ getters, virtuals });
@@ -356,11 +358,11 @@ export default class Role extends BaseModel {
return role;
}
public static async createRole(uid: number, serverId: number, roleInfo: { roleId: string; roleName: string; seqId: number; code: string, lv?: number, exp?: number }, lean = true) {
public static async createRole(uid: number, serverId: number, roleInfo: { roleId: string; roleName: string; seqId: number; code: string, lv?: number, exp?: number }, distinctId: string, lean = true) {
const user = await User.findUserByUid(uid);
if (!user) return null;
const doc = new RoleModel();
const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId });
const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId, shushuMark: distinctId });
delete update._id;
const role: RoleType = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean);
return role;