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

fix 秘境json字段

Browse Source
This commit is contained in:
luying
2020-11-18 13:39:32 +08:00
parent b4c0dc7da7
commit 4f9d996003
16 changed files with 152 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared/db/ExpeditionWarRecord.ts
View File

@@ -1,5 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
import { EXPEDITION_WAR_RECORD_STATUS } from '../consts/consts';
class Enemies {
@prop({ required: true })
@@ -56,7 +57,7 @@ export default class ExpeditionWarRecord extends BaseModel {
@prop({ required: true, default: '' })
battleCode: string; // 关联关卡唯一值
@prop({ required: true, default: 0 })
battleStatus: number; // 是否通过, 0-可挑战 1-成功 2-挑战失败
battleStatus: number; // 是否通过, -1-已生成 0-可挑战 1-成功 2-挑战失败
@prop({ required: true, default: 0 })
enemyFrom: number; // 敌军数据来源：1-配表的敌军队，2-玩家
@prop({ required: true, default: '' })
@@ -67,7 +68,7 @@ export default class ExpeditionWarRecord extends BaseModel {
ce: number; // 敌军战力
public static async getRecordByCode(expeditionCode: string, lean = true) {
const result = await ExpeditionWarRecordModel.find({ expeditionCode, battleStatus: {$gte: 0} }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
const result = await ExpeditionWarRecordModel.find({ expeditionCode, battleStatus: {$gte: EXPEDITION_WAR_RECORD_STATUS.WAITING} }).select('expeditionId battleId battleCode battleStatus ce').sort({expeditionId: 1}).lean(lean);
return result;
}

9
shared/db/Role.ts
View File

@@ -126,6 +126,8 @@ export default class Role extends BaseModel {
towerTaskCnt: number; // 刷新派遣任务的次数，向上累加，每天8个
@prop({ required: false})
towerTaskRefTime: Date; // 刷新派遣任务的时间
@prop({ required: true, default: 0})
towerTaskReCnt: number; // 刷新派遣任务刷新次数
// 奇遇事件相关
@prop({ required: true, default: 0 })
@@ -273,7 +275,7 @@ export default class Role extends BaseModel {
// 重置派遣次数
public static async resetTowerCnt(roleId: string, curTime: Date, lean = true) {
const role = await RoleModel.findOneAndUpdate({roleId}, {towerTaskCnt: 0, towerTaskRefTime: curTime}, {new: true}).lean(lean);
const role = await RoleModel.findOneAndUpdate({roleId}, {towerTaskCnt: 0, towerTaskRefTime: curTime, towerTaskReCnt: 0}, {new: true}).lean(lean);
return role;
}
// 刷新派遣任务次数增长
@@ -281,6 +283,11 @@ export default class Role extends BaseModel {
const role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskCnt: num}}, {new: true}).lean(lean);
return role;
}
// 派遣任务增加刷新次数
public static async increaseTowerRefCnt(roleId: string, num: number, lean = true) {
const role = await RoleModel.findOneAndUpdate({roleId}, {$inc: {towerTaskReCnt: num}}, {new: true}).lean(lean);
return role;
}
// 刷新远征重置次数
public static async increaseExpeditionResetCnt(roleId: string, needRefresh: boolean, curTime: Date, lean = true) {