diff --git a/shared/consts/constModules/mailConst.ts b/shared/consts/constModules/mailConst.ts index a756c2658..548d03fa9 100644 --- a/shared/consts/constModules/mailConst.ts +++ b/shared/consts/constModules/mailConst.ts @@ -62,7 +62,6 @@ export enum MAIL_TYPE { GUILD_MAIL = 31, // 军团邮件 REBATE = 32, // 返利邮件 GROUP_SHOP_REFUND = 33, // 退费 - ARTIFACT_OVER = 34, // 宝物数量超过 LEAGUE_DISSMISS = 35, // 联军解散 LEAGUE_KICK = 36, // 被踢出联军 LEAGUE_ABDICATE = 37, // 被任命盟主 @@ -74,6 +73,7 @@ export enum MAIL_TYPE { VESTIGE_REWARD = 43, // 补发遗迹邮件 GVG_BOX_REWARD = 44, // 云台补发 MONTHLY_FUND = 45, // 补发月基金奖励 + ARTIFACT_OVER = 46, // 宝物数量超过 }; export const SEND_NAME = '系统'; diff --git a/shared/db/Artifact.ts b/shared/db/Artifact.ts index c3f71c735..d8e63ceef 100644 --- a/shared/db/Artifact.ts +++ b/shared/db/Artifact.ts @@ -35,16 +35,16 @@ export default class Artifact extends BaseModel { @prop({ required: true, default: 0 }) lv: number; // 强化等级 - @prop({ required: true }) + @prop({ required: true, default: 0 }) quality: number; // 品质 1-5 蓝紫橙红金 - @prop({ required: true }) + @prop({ required: true, default: 0 }) qualityStage: number; // 品质+n,0开始 @prop({ required: true, default: 0 }) hid: number; // 装备的武将 - @prop({ required: true }) + @prop({ required: false }) batchCode: string; // 一键合成批处理 @prop({ required: true, default: 1 }) @@ -70,20 +70,19 @@ export default class Artifact extends BaseModel { const seqId = await CounterModel.getNewCounter(COUNTER.ARTIFACT_ID); const doc = new ArtifactModel(); - const update = Object.assign(doc.toJSON(), seqId, artifactInfo); - delete update._id; - const artifact: ArtifactModelType = await ArtifactModel.findOneAndUpdate({ seqId }, update, { upsert: true, new: true }).lean(); + const artifact = Object.assign(doc.toJSON(), {seqId}, artifactInfo); return artifact; } public static async createArtifacts(roleId: string, artifactInfos: ArtifactModelUpdate[]) { - let result: ArtifactModelType[] = []; + let insertInfo: ArtifactModelType[] = []; for (let artifactInfo of artifactInfos) { let artifact = await this.createArtifact(artifactInfo); - result.push(artifact); + insertInfo.push(artifact); } - await RoleModel.increaseArtifact(roleId, result.length); - return result; + await ArtifactModel.insertMany(insertInfo); + await RoleModel.increaseArtifact(roleId, insertInfo.length); + return insertInfo; } public static async putOnOrOff(roleId: string, seqId: number, hid: number, lv?: number) { diff --git a/shared/resource/jsons/dic_email_content.json b/shared/resource/jsons/dic_email_content.json index 273e66056..13a577fc7 100644 --- a/shared/resource/jsons/dic_email_content.json +++ b/shared/resource/jsons/dic_email_content.json @@ -320,5 +320,12 @@ "sendName": "学宫驿使", "content": "亲爱的百家传人,您购买的本期月旦基金有签到奖励尚未领取,现已发送至邮箱,请查收", "time": 720 + }, + { + "id": 46, + "title": "&", + "sendName": "学宫驿使", + "content": "亲爱的百家传人,您的背包中宝物数量已满,请及时清理背包哦。溢出宝物已通过邮件发放,请查收", + "time": 2160 } ] \ No newline at end of file