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

合成藏宝图，消耗品单独开表

Browse Source
This commit is contained in:
luying
2020-11-25 20:31:42 +08:00
parent 3f3c716dc6
commit 169ba8cea7
17 changed files with 282 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/db/HeroSoul.ts
-55
View File
@@ -1,55 +0,0 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, hid: 1 })
@index({ seqId: 1 })
export default class HeroSoul extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
roleName: string; // 角色名称
@prop({ required: true })
soulid: number; // 道具 id
@prop({ required: true })
soulName: string; // 道具名称
@prop({ required: true })
hid: number; // 武将 id
@prop({ required: true })
hName: string; // 武将名称
@prop({ required: true })
seqId: number; // 将魂表自增 id
@prop({ required: true, default: 0 })
count: number; // 道具数量
public static async findbyRole(roleId: string, lean = true) {
const items = await HeroSoulModel.find({ roleId }).lean(lean);
return items;
}
public static async findbyItemid(itemid: number, roleId: string, lean = true) {
const equips = await HeroSoulModel.findOne({ itemid, roleId }).lean(lean);
return equips;
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await HeroSoulModel.findOneAndUpdate({ seqId }, {$inc:{count}}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, soulid: number, seqId: number, soulName: string, count: number, hid: number, hName: string}, lean = true) {
const doc = new HeroSoulModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await HeroSoulModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
return item;
}
public static async deleteAccount(roleId: string, lean = true) {
let result = await HeroSoulModel.deleteMany({roleId}).lean(lean);
return result||{};
}
}
export const HeroSoulModel = getModelForClass(HeroSoul);
shared/db/Item.ts
+38 -26
View File
@@ -1,47 +1,59 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, itemid: 1 })
@index({ roleId: 1, id: 1 })
@index({ seqId: 1 })
export default class Item extends BaseModel {
@prop({ required: true })
@prop({ required: true, default: '' })
roleId: string; // 角色 id
@prop({ required: true })
@prop({ required: true, default: '' })
roleName: string; // 角色名称
@prop({ required: true })
itemid: number; // 道具 id
@prop({ required: true })
type: number; // 装备类型
@prop({ required: true })
itemName: string; // 道具名称
@prop({ required: true })
seqId: number; // 道具表自增 id
@prop({ required: true, default: '' })
id: number; // 道具 id
@prop({ required: true, default: '' })
type: number; // 道具类型
@prop({ required: true, default: '' })
itemName: string; // 道具名称
@prop({ required: true, default: 0 })
count: number; // 道具数量
hid: number; // 将魂：武将id，其他：0
@prop({ required: true })
count: number; // 道具数量
public static async findbyRole(roleId: string, lean = true) {
const items = await ItemModel.find({ roleId }).lean(lean);
const items = await ItemModel.find({ roleId }).select('id count type').lean(lean);
return items;
}
public static async findbyItemid(itemid: number, roleId: string, lean = true) {
const equips = await ItemModel.findOne({ itemid, roleId }).lean(lean);
return equips;
public static async findbyRoleAndGidAndCount(roleId: string, id: number, count: number, lean = true) {
const items = await ItemModel.findOne({ roleId, id, $gte: {count} }).select('id count type').lean(lean);
return items;
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await ItemModel.findOneAndUpdate({ seqId }, {$inc:{count}}, {upsert: true, new: true}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number, type: number}, lean = true) {
public static async increaseItem(roleId: string, id: number, count: number, itemInfo: {roleId: string, roleName: string, id: number, itemName: string, type: number, hid?: number }, lean = true) {
const doc = new ItemModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await ItemModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
return item;
const setOnInsert = Object.assign(doc.toJSON(), itemInfo);
const equips = await ItemModel.findOneAndUpdate({roleId, id },{$setOnInsert: setOnInsert, $inc: { count }}, {new: true, upsert: true}).lean(lean);
return equips;
}
public static async decreaseItems(roleId: string, items: Array<{id: number, count: number}>, lean = true) {
let wrongItems = new Array<{id: number, count: number}>();
for(let {id, count} of items) {
const rec = await ItemModel.findOneAndUpdate({roleId, id, count: {$gte: count} },{ $inc: { count: -1 * count }}, {new: true}).lean(lean);
if(!rec) {
wrongItems.push({id, count}); break;
}
}
if(wrongItems.length > 0) { // 数量不足
for(let {id, count} of wrongItems) {
await ItemModel.findOneAndUpdate({roleId, id },{ $inc: { count }}, {new: true}).lean(lean);
}
return false
} else {
return true
}
}
public static async deleteAccount(roleId: string, lean = true) {
shared/db/Role.ts
+1 -31
View File
@@ -89,11 +89,6 @@ export default class Role extends BaseModel {
@prop({ required: true, default: 0 })
frdCnt: number; // 情谊点
@prop({ required: true, default: [] })
consumeGoods: [{ // 消耗品
id: number; // id
count: number; // 数量
}];
@prop({ required: true, default: [] })
souls: [{ // 将魂
id: number; // 武将 id
@@ -233,32 +228,7 @@ export default class Role extends BaseModel {
let result = await RoleModel.deleteMany({roleId}).lean(lean);
return result||{};
}
public static async addItems(roleId: string, field: string, id: number, cnt: number, lean = true) {
try {
let role = await RoleModel.findOne({roleId}).lean(lean);
let item = role?role[field]:[];
let curItem = item.find(cur => cur.id == id);
if(!curItem) {
let addToSet = {};
addToSet[field] = {id, count: cnt};
let result = await RoleModel.findOneAndUpdate({roleId}, { $addToSet: addToSet }, { "new": true, "upsert": true}).lean(lean);
return result;
} else {
let condition = { roleId };
condition[`${field}.id`] = id;
let update = {};
update[`${field}.$.count`] = cnt;
let result = await RoleModel.findOneAndUpdate(condition, { $inc: update }, { "new": true, "upsert": true}).lean(lean);
return result;
}
}catch(e) {
console.error(e)
}
}
public static async addCoin(roleId: string, cnt: number, lean = true) {
let result = await RoleModel.findOneAndUpdate({roleId}, { $inc: {coin: cnt} }, { "new": true, "upsert": true}).lean(lean);
return result;
shared/db/ScriptItem.ts
-54
View File
@@ -1,54 +0,0 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
@index({ roleId: 1, itemid: 1 })
@index({ seqId: 1 })
export default class ScriptItem extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
roleName: string; // 角色名称
@prop({ required: true })
itemid: number; // 道具 id
@prop({ required: true })
type: number; // 装备类型
@prop({ required: true })
itemName: string; // 道具名称
@prop({ required: true })
seqId: number; // 道具表自增 id
@prop({ required: true, default: 0 })
count: number; // 道具数量
public static async findbyRole(roleId: string, lean = true) {
const items = await ScriptItemModel.find({ roleId }).lean(lean);
return items;
}
public static async findbyItemid(itemid: number, roleId: string, lean = true) {
const equips = await ScriptItemModel.findOne({ itemid, roleId }).lean(lean);
return equips;
}
public static async changeItemCount(seqId: number, count: number, lean = true) {
const equips = await ScriptItemModel.findOneAndUpdate({ seqId }, {$inc:{count}}, {upsert: true, new: true}).lean(lean);
return equips;
}
public static async createItem(itemInfo: {roleId: string, roleName: string, itemid: number, seqId: number, itemName: string, count: number, type: number}, lean = true) {
const doc = new ScriptItemModel();
const update = Object.assign(doc.toJSON(), itemInfo);
const item = await ScriptItemModel.findOneAndUpdate({ seqId: itemInfo.seqId }, update, {upsert: true, new: true}).lean(lean);
return item;
}
public static async deleteAccount(roleId: string, lean = true) {
let result = await ScriptItemModel.deleteMany({roleId}).lean(lean);
return result||{};
}
}
export const ScriptItemModel = getModelForClass(ScriptItem);