洗炼

shared/consts/statusCode.ts

@@ -147,6 +147,7 @@ export const STATUS = {
     // 装备养成 30400-30499
     ROLE_EQUIP_PLACE_NOT_ENOUGH: {code: 30400, simStr: '装备栏未装备或无可强化'},
     ROLE_COIN_NOT_ENOUGH: {code: 30401, simStr: '铜币不足'},
+    EQUIP_HAVE_NO_RANDSE: { code: 30403, simStr: '装备无随机属性' },
    
     EQUIP_NOT_FIND: {code: 30500, simStr: '装备不存在'},
     EQUIP_IS_EQUIPED: {code: 30501, simStr: '装备已经穿戴'},

shared/db/Equip.ts

@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType, modelOptions } from '@type
 import { COUNTER } from '../consts';
 import { CounterModel } from './Counter';
 
-class RandSe {
+export class RandSe {
     @prop({ required: true })
     id: number;					// 随机属性位置id
     @prop({ required: true })
@@ -14,7 +14,7 @@ class RandSe {
     locked: boolean;				// 洗炼是否锁定
 }
 
-class Holes {
+export class Holes {
     @prop({ required: true })
     id: number;					  // 孔的id
     @prop({ required: true })
@@ -28,13 +28,15 @@ interface equipUpdate {
     quality?: number;							
     wearLv?: number;	
     _id?:number;
-    holes?:Array<Holes>
+    holes?:Array<Holes>;
+    randSe?: Array<RandSe>;
 }
 
 @index({ roleId: 1, hid: 1, id: 1 })
 @index({ seqId: 1 })
 @modelOptions({ schemaOptions: { id: false } })
 export default class Equip extends BaseModel {
+
     @prop({ required: true })
     roleId: string;					// 角色 id
     @prop({ required: true })
@@ -48,16 +50,14 @@ export default class Equip extends BaseModel {
     name: string;					// 装备名称
     @prop({ required: false })
     hid: number;						// 装备此装备的武将 id
+    @prop({ required: false, default: 0 })
+    ePlaceId: number;				// 武将装备的部位
     @prop({ required: false, default: 1 })
     count: number;					// 装备数量
 
     @prop({ required: true, default: 1 })
     quality: number;				// 品质
     @prop({ required: true, default: 0 })
-    type: number;						// 装备类型
-    @prop({ required: true, default: 1 })
-    wearLv: number;							// 穿戴等级
-    @prop({ required: true, default: 0 })
     suitId: number;							// 套装id
 
     @prop({ required: true, default: 0 })
@@ -72,12 +72,19 @@ export default class Equip extends BaseModel {
         return equips;
     }
 
-    public static async createEquip(equipInfo: { roleId: string, roleName: string, id: number, seqId: number, type: number, name: string, lv?: number }, lean = true) {
-        const doc = new EquipModel();
-        const update = Object.assign(doc.toJSON(), equipInfo);
-        const equip: EquipType = await EquipModel.findOneAndUpdate({ seqId: equipInfo.seqId }, update, { upsert: true, new: true }).lean(lean);
-        return equip;
+    public static async findbySeqId(seqId: number, lean = true) {
+      const equip: EquipType = await EquipModel.findOne({ seqId }).lean(lean);
+      return equip;
     }
+    
+  public static async createEquip(equipInfo: {roleId: string, roleName: string, id: number, name: string, quality: number, suitId: number, ePlaceId: number, randSe: RandSe[], randRange: number, holes: Holes[]}, lean = true) {
+    const seqId = await CounterModel.getNewCounter(COUNTER.EID);
+
+    const doc = new EquipModel();
+    const update = Object.assign(doc.toJSON(), seqId, equipInfo);
+    const equip: EquipType = await EquipModel.findOneAndUpdate({ seqId }, update, {upsert: true, new: true}).lean(lean);
+    return equip;
+  }
 
     public static async putOn(hid: number, equipId: string, lean = true) {
         const equip: EquipType = await EquipModel.findOneAndUpdate({ _id: equipId }, { hid }, { new: true }).lean(lean);
@@ -108,6 +115,11 @@ export default class Equip extends BaseModel {
         let result: EquipType = await EquipModel.findOneAndUpdate({seqId}, {$set: equipUpdate}).lean(lean);
         return result;
     }
+
+    public static async lock(roleId: string, seqId: number, id: number, lock: boolean) {
+      let result: EquipType = await EquipModel.findOneAndUpdate({roleId, seqId, 'randSe.id': id}, {$set: {'randSe.$.locked': lock}}, {new: true, upsert: false}).select('seqId id randSe').lean();
+      return result;
+    }
 }
 
 export const EquipModel = getModelForClass(Equip);

shared/pubUtils/itemUtils.ts

@@ -33,7 +33,7 @@ export async function addBags(roleId: string, roleName: string, data: BagInter)
 export async function addEquips(roleId: string, roleName: string, weapon: EquipInter) {
     let { id, name, quality, suitId, hole, randomEffect, itid } = weapon;
     let {type} = ITID.get(itid);
-    console.log(itid, type)
+
     let randomNum = RANDOM_SE_COUNT.get(quality);
     let pool = randomEffect.map(cur => gameData.randomEffectPool.get(cur));
     let chosen = new Array<number>();