From 32b4f789be9a0acda2c7586e37c56a5c74330ab9 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 12 Dec 2022 16:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=AE=9D=E7=89=A9):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9D=E7=89=A9=E6=9D=90=E6=96=99=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/role/handler/artifactHandler.ts | 2 +- game-server/app/services/checkParam.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/game-server/app/servers/role/handler/artifactHandler.ts b/game-server/app/servers/role/handler/artifactHandler.ts index 3f708abec..e05e9c668 100644 --- a/game-server/app/servers/role/handler/artifactHandler.ts +++ b/game-server/app/servers/role/handler/artifactHandler.ts @@ -148,7 +148,7 @@ export class ArtifactHandler { remainCnt--; } // 通用道具 - if(dicNextArtifact.materialGroup == 0) { // 可使用材料代替，不是必须同名的那种 + if(dicNextArtifact.materialGroup == 0 && remainCnt > 0) { // 可使用材料代替，不是必须同名的那种 let dicMaterialArtifactQuality = gameData.artifactQualityById.get(dicNextArtifact.previousId); if(!dicMaterialArtifactQuality) return resResult(STATUS.DIC_DATA_NOT_FOUND); for(let { id, count } of dicMaterialArtifactQuality.generalItem) { diff --git a/game-server/app/services/checkParam.ts b/game-server/app/services/checkParam.ts index 8524e176b..d3af32988 100644 --- a/game-server/app/services/checkParam.ts +++ b/game-server/app/services/checkParam.ts @@ -1329,7 +1329,7 @@ export function checkRouteParam(route: string, msg: any) { { if(!checkNaturalNumbers(msg.seqId)) return false; if(!checkNumberArray(msg.material)) return false; - if(!checkNaturalArray(msg.generalItems)) return false; + if(!checkArrayCanEmpty(msg.generalItems)) return false; for(let { id, count } of msg.generalItems) { if(!checkNaturalNumbers(id, count)) return false; }