宝石
This commit is contained in:
@@ -7,6 +7,7 @@ import { addItems, handleCost } from "../../../services/rewardService";
|
||||
import { checkMaterialEnough } from "../../../services/equipService";
|
||||
import { EquipModel, RandSe } from "../../../db/Equip";
|
||||
import { HeroModel, EPlace } from "../../../db/Hero";
|
||||
import { ItemModel } from "../../../db/Item";
|
||||
import Role from "../../../db/Role";
|
||||
import { calPlayerCeAndSave } from "../../../services/playerCeService";
|
||||
import { getHeroJob, getGoodById, gameData, getJewelById, getHeroEquipByClassId } from "../../../pubUtils/data";
|
||||
@@ -525,13 +526,18 @@ export class EquipHandler {
|
||||
if (good.type != CONSUME_TYPE.JEWEL)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
//检查宝石消耗是否合法TODO
|
||||
consumes.concat(purchaseGoods)
|
||||
let needConsumes = checkMaterialEnough(consumes, jewel, count);
|
||||
if (!purchaseGoods)
|
||||
purchaseGoods = [];
|
||||
let needConsumes = checkMaterialEnough(consumes.concat(purchaseGoods), jewel, count);
|
||||
if (!needConsumes)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
await addItems(roleId, roleName, sid, purchaseGoods);
|
||||
let res = await handleCost(roleId, sid, needConsumes);
|
||||
if (!res)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
let items:Array<{id: number, count: number, ratio?:number}> = [];
|
||||
for (let item of purchaseGoods) {
|
||||
items.push({id: item.id, count: item.count, ratio: 1})
|
||||
}
|
||||
items = items.concat(needConsumes);
|
||||
let {hasError} = await ItemModel.decreaseItems(roleId, items);
|
||||
if (!!hasError)
|
||||
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
|
||||
await addItems(roleId, roleName, sid, [{ id: jewel, count: count }]);
|
||||
return resResult(STATUS.SUCCESS);
|
||||
@@ -548,4 +554,44 @@ export class EquipHandler {
|
||||
}
|
||||
return resResult(STATUS.SUCCESS);
|
||||
}
|
||||
//合成下一级宝石(装备镶嵌界面)
|
||||
public async composeNextLevelJewel(msg: { jewel: number, count: number, eid: number, id: number }, session: BackendSession) {
|
||||
let { count, jewel, eid, id } = msg;
|
||||
let roleId: string = session.get('roleId');
|
||||
let roleName: string = session.get('roleName');
|
||||
let sid: string = session.get('sid');
|
||||
let goodInfo = getGoodById(jewel);
|
||||
let good = ITID.get(goodInfo.itid);
|
||||
let needUpdate = false;
|
||||
let consumes: Array<{id: number, count: number, ratio?: number}> = [];
|
||||
if (good.type != CONSUME_TYPE.JEWEL)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
let equip;
|
||||
if (!!eid) {
|
||||
equip = await EquipModel.getEquip(eid);
|
||||
let index = _.findIndex(equip.holes,{id});
|
||||
if (index) {
|
||||
equip.holes[id].jewel = jewel;
|
||||
needUpdate = true;
|
||||
consumes.push({id:jewel, count: 1, ratio: 1});
|
||||
}
|
||||
}
|
||||
consumes = consumes.concat(goodInfo.composeMaterial);
|
||||
if (goodInfo.specialMaterial.count) {
|
||||
consumes.push({id: goodInfo.specialMaterial.ids[0], count: goodInfo.specialMaterial.count})
|
||||
}
|
||||
let { hasError } = await ItemModel.decreaseItems(roleId, consumes);
|
||||
if (!!hasError)
|
||||
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
|
||||
let res = await handleCost(roleId, sid, consumes);
|
||||
if (!res)
|
||||
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
|
||||
let result = {};
|
||||
if (needUpdate) {
|
||||
await EquipModel.updateEquipInfo(eid, { holes: equip.holes });
|
||||
} else {
|
||||
result = await addItems(roleId, roleName, sid, [{ id: jewel, count: count }]);
|
||||
}
|
||||
return resResult(STATUS.SUCCESS, { goods: result });
|
||||
}
|
||||
}
|
||||
@@ -21,14 +21,14 @@ export class HeroHandler {
|
||||
|
||||
private channelService: ChannelService = this.app.get('channelService');
|
||||
|
||||
public async test(msg: { id: number, count: number, seqId:number, type:number}, session: BackendSession) {
|
||||
public async test(msg: { items:Array<{id: number, count: number, seqId:number, type:number}>}, session: BackendSession) {
|
||||
let roleId: string = session.get('roleId');
|
||||
let roleName: string = session.get('roleName');
|
||||
let sid: string = session.get('sid');
|
||||
|
||||
let {id, count, seqId, type} = msg;
|
||||
let {items} = msg;
|
||||
|
||||
let result = await handleCost(roleId, sid, [{id, count, seqId, type}] );
|
||||
let result = await handleCost(roleId, sid, items );
|
||||
//let result = await addItems(roleId, roleName, sid, [{id, count}] );
|
||||
if(!result) {
|
||||
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
|
||||
|
||||
@@ -14,22 +14,30 @@ import { gameData, getJewelById } from '../pubUtils/data';
|
||||
const _ = require('underscore');
|
||||
|
||||
export function checkMaterialEnough(consumes:Array<{id: number, count: number}>, jewel: number, jewelCount: number) {
|
||||
consumes = mergeSameGoods(consumes);
|
||||
let comJewelMap = {};
|
||||
consumes = mergeSameGoods(consumes);
|
||||
let needConsumes: Array<{id: number, count: number}> = [];
|
||||
let gidJewelInfo = getGoodById(jewel);
|
||||
for (let { id, count } of consumes) {
|
||||
let jewelInfo = getJewelById(id);
|
||||
if (!jewelInfo)
|
||||
if (!jewelInfo || !jewelInfo.count)
|
||||
continue;
|
||||
let comcount = Math.floor((count + (comJewelMap[jewelInfo.good_id] || 0)) / jewelInfo.count);
|
||||
if (comcount < 1) {
|
||||
return false;
|
||||
needConsumes.push({ id, count});
|
||||
comJewelMap[jewelInfo.good_id] = count + (comJewelMap[jewelInfo.good_id] || 0);
|
||||
for (let i = jewelInfo.lvLimited; i < gidJewelInfo.lvLimited; i++) {
|
||||
if (((comJewelMap[jewelInfo.good_id] || 0) % jewelInfo.count != 0)) {
|
||||
break;
|
||||
}
|
||||
let comcount = Math.floor(((comJewelMap[jewelInfo.good_id] || 0)) / jewelInfo.count);
|
||||
if (comcount < 1) {
|
||||
break;
|
||||
}
|
||||
comJewelMap[jewelInfo.nextJewelId] = comcount + (comJewelMap[jewelInfo.nextJewelId] || 0);
|
||||
delete comJewelMap[jewelInfo.good_id];
|
||||
if (!!jewelInfo.specialCount)
|
||||
needConsumes.push({ count: jewelInfo.specialCount, id: jewelInfo.nextSpecialId});
|
||||
jewelInfo = getJewelById(jewelInfo.nextJewelId);
|
||||
}
|
||||
needConsumes.push({ id, count });
|
||||
if (!!jewelInfo.specialMaterial.ids.length)
|
||||
needConsumes.push({ id: jewelInfo.specialMaterial.ids[0], count: jewelInfo.specialMaterial.count});
|
||||
delete comJewelMap[jewelInfo.good_id];
|
||||
comJewelMap[jewelInfo.nextJewelId] = comcount + (comJewelMap[jewelInfo.nextJewelId] || 0);
|
||||
}
|
||||
if (comJewelMap[jewel] != jewelCount || Object.keys(comJewelMap).length != 1)
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user