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

This commit is contained in:
mamengke01
2020-12-18 21:32:51 +08:00
4 changed files with 47 additions and 11 deletions

View File

@@ -41,6 +41,8 @@ export class EquipHandler {
// 消耗材料
// 获得装备
let {gid, originalEquip} = msg;
let targetGood = gameData.goods.get(gid);
if(!targetGood) return resResult(STATUS.ROLE_INFO_NOT_FOUND);
@@ -233,7 +235,7 @@ export class EquipHandler {
} else if (lockNum == 2) {
consumes = parseReward(EQUIP.EQUIP_THREE_LOCKED);
} else {
consumes = parseReward(EQUIP.EQUIP_FOUR_LOCKED);
return resResult(STATUS.ROLE_ALL_SE_LOCK);
}
let result = await handleCost(roleId, sid, consumes);
if(!result) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
@@ -257,7 +259,7 @@ export class EquipHandler {
let equip = await EquipModel.findbySeqId(eid);
if(!equip) return resResult(STATUS.EQUIP_NOT_FIND);
let {id, randSe, reStrengthenNum = 0} = equip;
let {id, randSe } = equip;
if(!randSe || randSe.length <=0 ) {
return resResult(STATUS.EQUIP_HAVE_NO_RANDSE);
}
@@ -289,11 +291,11 @@ export class EquipHandler {
// 消耗
let consumes:Array<{id: number, count: number}> = [];
if (reStrengthenNum == 0) {
if (lockNum == 0) {
consumes = parseReward(EQUIP.EQUIP_ONE_REFORGED);
} else if (reStrengthenNum == 1) {
} else if (lockNum == 1) {
consumes = parseReward(EQUIP.EQUIP_TWO_REFORGED);
} else if (reStrengthenNum == 2) {
} else if (lockNum == 2) {
consumes = parseReward(EQUIP.EQUIP_THREE_REFORGED);
} else {
consumes = parseReward(EQUIP.EQUIP_FOUR_REFORGED);
@@ -302,7 +304,7 @@ export class EquipHandler {
let result = await handleCost(roleId, sid, consumes);
if(!result) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let equipResult = await EquipModel.updateEquipInfo(eid, { randSe, reStrengthenNum: reStrengthenNum + 1 })
let equipResult = await EquipModel.updateEquipInfo(eid, { randSe })
let curEquip = {
seqId: equipResult.seqId,
id: equipResult.id,