Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

shared/consts/constModules/itemConst.ts

@@ -109,6 +109,11 @@ export const CURRENCY_TYPE = {
   FRIEND_POINT: "friendPoint"
 }
 
+
+export const SPEICAL_ITEM = {
+  REFINE_ADD_RATE: [17039]
+};
+
 const currencyArr = [
   { "gid": 31001, "name": "铜钱", "type": CURRENCY_TYPE.COIN },
   { "gid": 31002, "name": "元宝", "type": CURRENCY_TYPE.GOLD },

shared/consts/statusCode.ts

@@ -151,6 +151,7 @@ export const STATUS = {
     ROLE_EQUIP_REACH_MAX: { code: 30404, simStr: '强化已达上限' },
     ROLE_EQUIP_NOT_REACH_MAX: { code: 30405, simStr: '强化未达到上限' },
     ROLE_EQUIP_CANNOT_RESTRENGTHEN: { code: 30406, simStr: '无属性可以洗炼' },
+    ROLE_WRONG_ITEM: { code: 30407, simStr: '该道具不可用于该功能' },
    
     EQUIP_NOT_FIND: {code: 30500, simStr: '装备不存在'},
     EQUIP_IS_EQUIPED: {code: 30501, simStr: '装备已经穿戴'},

shared/db/Equip.ts

@@ -32,6 +32,7 @@ interface equipUpdate {
     holes?:Array<Holes>;
     randSe?: Array<RandSe>;
     ePlaceId?:number;
+    reStrengthenNum?: number;
 }
 
 @index({ roleId: 1, hid: 1, id: 1 })
@@ -68,6 +69,8 @@ export default class Equip extends BaseModel {
     randSe: RandSe[];							// 强化随机属性
     @prop({ required: true, type: Holes, default: [] })
     holes: Holes[];
+    @prop({ required: true, default: 0 }) 
+    reStrengthenNum: number;     // 洗炼次数
 
     public static async findbyRole(roleId: string, lean = true) {
         const equips: EquipType[] = await EquipModel.find({ roleId }).lean(lean);

shared/db/Hero.ts

@@ -32,8 +32,6 @@ export class EPlace {
     lv: number;
     @prop({ required: true })
     refineLv: number;
-    @prop({ required: true })
-    refineCount: number;
 }
 
 // 初始化
@@ -45,7 +43,6 @@ function getInitialEplace() {
         p.equip = null;
         p.lv = 0;
         p.refineLv = 0;
-        p.refineCount = 0;
 
         ePlace.push(p);
     }

shared/pubUtils/dictionary/DicRefine.ts

@@ -25,6 +25,8 @@ let arr = JSON.parse(str);
 export const dicRefine = new Map<number, DicRefine>();
 
 arr.forEach(o => {
-    o.material = parseReward(o.gainvalue)
+    o.material = parseReward(o.material)
     dicRefine.set(o.id, o);
-});
+});
+
+arr = undefined;