From a8896717f1604a8694031065446478e66b202ceb Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 28 Dec 2020 14:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=95=B0=E7=BB=84=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=5Fid=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/Equip.ts | 4 +-- shared/db/EventRecord.ts | 2 +- shared/db/ExpeditionRecord.ts | 2 +- shared/db/ExpeditionWarRecord.ts | 4 +-- shared/db/Game.ts | 2 +- shared/db/HangUpRecord.ts | 2 +- shared/db/HangUpSpdUpRec.ts | 4 +-- shared/db/Hero.ts | 8 ++--- shared/db/PvpDefense.ts | 2 +- shared/db/Role.ts | 12 +++---- shared/db/SearchRecord.ts | 2 +- shared/db/TowerRecord.ts | 2 +- shared/db/generalField.ts | 60 ++++++++++++++++---------------- 13 files changed, 53 insertions(+), 53 deletions(-) diff --git a/shared/db/Equip.ts b/shared/db/Equip.ts index 0e1359ef2..9ed8a446e 100644 --- a/shared/db/Equip.ts +++ b/shared/db/Equip.ts @@ -64,9 +64,9 @@ export default class Equip extends BaseModel { @prop({ required: true, default: 0 }) randRange: number; // 固定属性随机值 - @prop({ required: false, type: RandSe, default: [] }) + @prop({ required: false, type: RandSe, default: [], _id: false }) randSe: RandSe[]; // 强化随机属性 - @prop({ required: true, type: Holes, default: [] }) + @prop({ required: true, type: Holes, default: [], _id: false }) holes: Holes[]; public static async findbyRole(roleId: string, lean = true) { diff --git a/shared/db/EventRecord.ts b/shared/db/EventRecord.ts index e2f94cacb..03fd81376 100644 --- a/shared/db/EventRecord.ts +++ b/shared/db/EventRecord.ts @@ -42,7 +42,7 @@ export default class EventRecord extends BaseModel { turn: number; // 随机的轮数，保证每个event_id都能随机到一次再进行下一轮 @prop({ required: true }) point: number; // 位置 - @prop({ required: true, type: Question, default: [] }) + @prop({ required: true, type: Question, default: [], _id: false }) question: Array; // 题库id diff --git a/shared/db/ExpeditionRecord.ts b/shared/db/ExpeditionRecord.ts index 0da43505f..b0a14f4a4 100644 --- a/shared/db/ExpeditionRecord.ts +++ b/shared/db/ExpeditionRecord.ts @@ -26,7 +26,7 @@ export default class ExpeditionRecord extends BaseModel { expeditionCode: string; // 远征的唯一标识 @prop({ required: true, default: 0 }) myCe: number; // 我方在重置时的战力 - @prop({ required: true, type: Heroes, default: [] }) + @prop({ required: true, type: Heroes, default: [], _id: false }) heroes: Array; // 我方已出场武将 @prop({ required: true, default: 1 }) status: number; // 状态 1-显示 0-不显示 diff --git a/shared/db/ExpeditionWarRecord.ts b/shared/db/ExpeditionWarRecord.ts index 42bc4fa01..77097ad38 100644 --- a/shared/db/ExpeditionWarRecord.ts +++ b/shared/db/ExpeditionWarRecord.ts @@ -71,9 +71,9 @@ export default class ExpeditionWarRecord extends BaseModel { enemyFrom: number; // 敌军数据来源：1-配表的敌军队，2-玩家 @prop({ required: true, default: '' }) enemyId: string; // 敌军队伍id或玩家id - @prop({ required: true, type: Enemies, default: [] }) + @prop({ required: true, type: Enemies, default: [], _id: false }) enemies: Array; // 敌军数据 - @prop({ required: true, type: EnemiesCurHPAP, default: [] }) + @prop({ required: true, type: EnemiesCurHPAP, default: [], _id: false }) enemiesCurHpAp: Array; // 敌军数据 @prop({ required: true, default: 0 }) ce: number; // 敌军战力 diff --git a/shared/db/Game.ts b/shared/db/Game.ts index ba633050d..f17a0d795 100644 --- a/shared/db/Game.ts +++ b/shared/db/Game.ts @@ -44,7 +44,7 @@ export default class Game extends BaseModel { @prop({ required: true }) des: string; - @prop({ required: true, type: ServerInfo, default: [] }) + @prop({ required: true, type: ServerInfo, default: [], _id: false }) serverList: Array; @prop({ required: true }) diff --git a/shared/db/HangUpRecord.ts b/shared/db/HangUpRecord.ts index b68a893d2..d62686424 100644 --- a/shared/db/HangUpRecord.ts +++ b/shared/db/HangUpRecord.ts @@ -32,7 +32,7 @@ export default class HangUpRecord extends BaseModel { @prop({ required: false }) endTime: Date; // 结束挂机的时间 - @prop({ required: true, default: [], type: Goods }) + @prop({ required: true, default: [], type: Goods, _id: false }) notReceivedGoods: Array @prop({ required: true, default: false }) diff --git a/shared/db/HangUpSpdUpRec.ts b/shared/db/HangUpSpdUpRec.ts index 4715958ff..8fbb84e35 100644 --- a/shared/db/HangUpSpdUpRec.ts +++ b/shared/db/HangUpSpdUpRec.ts @@ -12,7 +12,7 @@ class Goods { class NotReceivedGoods { @prop({ required: true }) cnt: number; // 加速的次数 - @prop({ required: true, default: [], type: Goods }) + @prop({ required: true, default: [], type: Goods, _id: false }) goods: Array; // 这次挂机没来得及领取的 } /** @@ -31,7 +31,7 @@ export default class HangUpSpdUpRec extends BaseModel { @prop({required: true, default: 1}) lv: number; // 天梯层数 - @prop({ required: true, default: [], type: NotReceivedGoods }) + @prop({ required: true, default: [], type: NotReceivedGoods, _id: false }) notReceivedGoodsList: Array public static async getSpdUpRec(roleId, lv, lean = true ) { diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts index 932a407ef..3fa1e1d67 100644 --- a/shared/db/Hero.ts +++ b/shared/db/Hero.ts @@ -99,7 +99,7 @@ export default class Hero extends BaseModel { ce: number; // 武将战力 @prop({ required: true, default: 0 }) historyCe: number; // 武将历史最高战力 - @prop({required: true, default: new CeAttr() }) + @prop({required: true, default: new CeAttr(), _id: false }) ceAttr: CeAttr; // 影响战力的属性 @prop({ required: true, default: 1 }) @@ -132,12 +132,12 @@ export default class Hero extends BaseModel { favour: number; // 好感度 @prop({ required: true, default: 1 }) favourLv: number; // 好感等级 - @prop({ required: true, type:Connect, default: [] }) + @prop({ required: true, type:Connect, default: [], _id: false }) connections: Connect[]; // 羁绊 - @prop({ required: true, type: Skin, default: [] }) + @prop({ required: true, type: Skin, default: [], _id: false }) skins: Skin[]; // 皮肤 - @prop({ required: true, type: EPlace, default: getInitialEplace() }) + @prop({ required: true, type: EPlace, default: getInitialEplace(), _id: false }) ePlace: EPlace[]; // 武将装备引用数组 public static async findByRole(roleId: string, lean = true) { diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts index 572fb476e..1249aba80 100644 --- a/shared/db/PvpDefense.ts +++ b/shared/db/PvpDefense.ts @@ -29,7 +29,7 @@ export default class PvpDefense extends BaseModel { @prop({ required: true }) roleName: string; // 角色名称 - @prop({ required: true, type: Heroes, default: []}) + @prop({ required: true, type: Heroes, default: [], _id: false}) heroes: Array; @prop({ required: true, default: 0}) ce: number; diff --git a/shared/db/Role.ts b/shared/db/Role.ts index 618bea450..895be28c7 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -121,11 +121,11 @@ export default class Role extends BaseModel { lv: number; // 主公等级 @prop({ required: true, default: 0 }) ce: number; // 总战力 - @prop({ required: true, default: new CeAttrRole() }) + @prop({ required: true, default: new CeAttrRole(), _id: false }) globalCeAttr: CeAttrRole; // 总战力 @prop({ required: true, default: 0 }) topFiveCe: number; // 最强5人战力 - @prop({ required: true, type: TopHero, default: [] }) + @prop({ required: true, type: TopHero, default: [], _id: false }) topFive: Array; // 总战力 @prop({ required: true, default: 100 }) tili: number; // 体力值 @@ -152,7 +152,7 @@ export default class Role extends BaseModel { @prop({ required: true, default: 0 }) frdCnt: number; // 情谊点 - @prop({ required: true, type: WarStar, default: [] }) + @prop({ required: true, type: WarStar, default: [], _id: false }) warStar: WarStar[]; // 关卡星级 @prop({ required: true, default: 1 }) @@ -162,7 +162,7 @@ export default class Role extends BaseModel { @prop({ required: true }) loginTime: Date; // 更新 / 登录时间 - @prop({ required: true, type: Number, default: [] }) + @prop({ required: true, type: Number, default: [], _id: false }) funcs: Array; // 开启了的功能 // 天梯相关 @@ -202,14 +202,14 @@ export default class Role extends BaseModel { dungeonBuyCnt: number; // 秘境购买次数 @prop({ required: true, default: new Date() }) dungeonRefTime: Date; // 秘境刷新时间 - @prop({ required: true, type: DungeonHero, default: [] }) + @prop({ required: true, type: DungeonHero, default: [], _id: false }) dungeonHeroes: Array; // 秘境首通使用的武将 // 全局养成 @prop({ required: true, default: 1 }) title: number; //爵位 //神像 - @prop({ required: true, type: Teraph, default: getInitialTeraph() }) + @prop({ required: true, type: Teraph, default: getInitialTeraph(), _id: false }) teraphs:Array; public static async findByUid(uid: number, serverId: number, lean = true) { diff --git a/shared/db/SearchRecord.ts b/shared/db/SearchRecord.ts index 95a43c703..f72079b43 100644 --- a/shared/db/SearchRecord.ts +++ b/shared/db/SearchRecord.ts @@ -24,7 +24,7 @@ export default class SearchRecord extends BaseModel { roleId: string; // 角色 id @prop({ required: true }) batchCode: string; // 本批派遣任务唯一标识 - @prop({ required: true, default: [] }) + @prop({ required: true, default: [], _id: false }) tasks: Array; diff --git a/shared/db/TowerRecord.ts b/shared/db/TowerRecord.ts index c90444642..2fdccf3f2 100644 --- a/shared/db/TowerRecord.ts +++ b/shared/db/TowerRecord.ts @@ -22,7 +22,7 @@ export default class TowerRecord extends BaseModel { lv: number; // 天梯层数 @prop({ required: true, default: [] }) heroes: Array; // 本层已使用武将 - @prop({ required: true, type: WarStatus, default: [] }) + @prop({ required: true, type: WarStatus, default: [], _id: false }) warStatus: Array; @prop({ required: true, default: 0 }) speedUpCnt: number; // 加速总次数 diff --git a/shared/db/generalField.ts b/shared/db/generalField.ts index e0a518230..c7c9b2830 100644 --- a/shared/db/generalField.ts +++ b/shared/db/generalField.ts @@ -12,35 +12,35 @@ export class CeAttrData { } export class CeAttr { - @prop({ required: false }) + @prop({ required: false, _id: false }) hp?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) atk?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) matk?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) def?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) mdef?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) agi?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) luk?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) hit?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) cri?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) flee?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) antCri?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) damageIncrease?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) damageDecrease?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) defIngnore?: CeAttrData = new CeAttrData(); - @prop({ required: false }) + @prop({ required: false, _id: false }) bloodSuck?: CeAttrData = new CeAttrData(); } @@ -53,35 +53,35 @@ export class CeAttrDataRole { } export class CeAttrRole { -@prop({ required: false }) +@prop({ required: false, _id: false }) hp?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) atk?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) matk?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) def?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) mdef?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) agi?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) luk?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) hit?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) cri?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) flee?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) antCri?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) damageIncrease?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) damageDecrease?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) defIngnore?: CeAttrDataRole = new CeAttrDataRole(); -@prop({ required: false }) +@prop({ required: false, _id: false }) bloodSuck?: CeAttrDataRole = new CeAttrDataRole(); }