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

修改util为公共地址

Browse Source
This commit is contained in:
luying
2020-10-16 14:54:28 +08:00
parent 73a30b6eb0
commit bd6646c6fe
21 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/db/HangUpSpdUpRec.ts
View File

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

5
shared/db/Role.ts
View File

@@ -2,7 +2,7 @@ import { HANG_UP_CONSTS } from './../consts/consts';
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import User from './User';
import { shouldRefresh } from '../util/util';
import { shouldRefresh } from '../pubUtils/util';
/**
* 角色字段接口
@@ -155,7 +155,8 @@ export default class Role extends BaseModel {
public static async hangUpSpdUp(roleId: string, cnt: number, curTime: Date, lean = true) {
if (cnt < 0) return null;
const {lastSpdUpTime} = await RoleModel.findOneAndUpdate({roleId}, {$inc: {hangUpSpdUpCnt: -cnt}, lastSpdUpTime: curTime}, {new: true}).lean(lean);
const result = await RoleModel.findOneAndUpdate({roleId}, {$inc: {hangUpSpdUpCnt: -cnt}, lastSpdUpTime: curTime}, {new: true}).lean(lean);
const lastSpdUpTime = result?result.lastSpdUpTime: curTime;
let role = null;
if (shouldRefresh(lastSpdUpTime, curTime, HANG_UP_CONSTS.REFRESH_TIME, 1) && cnt <= HANG_UP_CONSTS.MAX_SPD_UP_CNT) {
role = await RoleModel.findOneAndUpdate({roleId}, {hangUpSpdUpCnt: HANG_UP_CONSTS.MAX_SPD_UP_CNT - cnt, lastSpdUpTime: curTime}, {new: true}).lean(lean);

30
shared/db/TowerTaskRec.ts
View File

@@ -1,16 +1,16 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
class TowerTask {
@prop({ required: true })
id: number; // 任务唯一 Id，来自任务表
@prop({ required: true})
taskCode: string; // 服务器生成的任务唯一编号
@prop({ required: true, type: Number, default: []})
heroes: Array<number>; // 派遣武将 hid
@prop({ required: true })
status: boolean; // 派遣任务当前状态，0-可派遣，1-已派遣，2-已完成，3-已领取
}
// class TowerTask {
// @prop({ required: true })
// id: number; // 任务唯一 Id，来自任务表
// @prop({ required: true})
// taskCode: string; // 服务器生成的任务唯一编号
// @prop({ required: true, type: Number, default: []})
// heroes: Array<number>; // 派遣武将 hid
// @prop({ required: true })
// status: boolean; // 派遣任务当前状态，0-可派遣，1-已派遣，2-已完成，3-已领取
// }
function genCodeTmp(len) {
const chars = '123456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijklmnopqrstuvwxyz';
@@ -61,7 +61,7 @@ export default class TowerTaskRec extends BaseModel {
return recs;
}
public static async createTasks(roleId: string, roleName: string, taskIds: Array<number>, lean = true) {
public static async createTasks(roleId: string, roleName: string, taskIds: Array<number>/*, lean = true*/) {
const batchCode = genCodeTmp(8);
const tasksData = taskIds.map(id => {
const taskModel = new TowerTaskRecModel();
@@ -78,8 +78,8 @@ export default class TowerTaskRec extends BaseModel {
return recs;
}
public static async sendHeroes(roleId: string, batchCode: string, tasks: Array<{taskCode:string, heroes: Array<number>}>, sendTime: Date, lean = true) {
let recs = [];
public static async sendHeroes(_roleId: string, batchCode: string, tasks: Array<{taskCode:string, heroes: Array<number>}>, sendTime: Date, lean = true) {
let recs = new Array();
const refTime = getRefTime();
for (let task of tasks) {
const rec = await TowerTaskRecModel.findOneAndUpdate(
@@ -93,8 +93,8 @@ export default class TowerTaskRec extends BaseModel {
}
public static async finishTask(batchCode: string, tasks: Array<string>, lean = true) {
let recs = [];
const refTime = getRefTime();
let recs = new Array();
// const refTime = getRefTime();
for (let task of tasks) {
const rec = await TowerTaskRecModel.findOneAndUpdate(
{batchCode, taskCode: task},