diff --git a/game-server/app/services/equipService.ts b/game-server/app/services/equipService.ts index 33319748d..8c6e6f8fd 100644 --- a/game-server/app/services/equipService.ts +++ b/game-server/app/services/equipService.ts @@ -208,7 +208,10 @@ export function getRebuildConsume(artifacts: ArtifactModelType[]) { let dicArtifactQuality = getDicArtifactQualityByStage(dicArtifact.quality, stage); let dicNextArtifactQuality = gameData.artifactQualityById.get(dicArtifactQuality?.nextId); if(!dicNextArtifactQuality) continue; - let consumes = dicArtifactQuality.generalItem.map(({id, count}) => ({ id, count: count * dicNextArtifactQuality.materialCnt})); + let dicMaterialArtifactQuality = gameData.artifactQualityById.get(dicNextArtifactQuality.materialId); + if(!dicMaterialArtifactQuality) continue; + + let consumes = dicMaterialArtifactQuality.generalItem.map(({id, count}) => ({ id, count: count * dicNextArtifactQuality.materialCnt})); usedConsumes.push(...consumes); } } diff --git a/shared/resource/jsons/dic_zyz_artifactQuality.json b/shared/resource/jsons/dic_zyz_artifactQuality.json index 45a07391e..50e1dec81 100644 --- a/shared/resource/jsons/dic_zyz_artifactQuality.json +++ b/shared/resource/jsons/dic_zyz_artifactQuality.json @@ -54,9 +54,9 @@ "materialId": 3, "materialCnt": 1, "materialGroup": 0, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, - "generalItem": "82002&2", + "generalItem": "&", "nextId": 5 }, { @@ -69,9 +69,9 @@ "materialId": 3, "materialCnt": 2, "materialGroup": 0, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, - "generalItem": "82002&3", + "generalItem": "&", "nextId": 6 }, { @@ -99,9 +99,9 @@ "materialId": 6, "materialCnt": 1, "materialGroup": 0, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, - "generalItem": "82003&2", + "generalItem": "&", "nextId": 8 }, { @@ -114,9 +114,9 @@ "materialId": 6, "materialCnt": 2, "materialGroup": 0, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, - "generalItem": "82003&3", + "generalItem": "&", "nextId": 9 }, { @@ -129,9 +129,9 @@ "materialId": 6, "materialCnt": 2, "materialGroup": 0, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, - "generalItem": "82003&4", + "generalItem": "&", "nextId": 10 }, { @@ -144,7 +144,7 @@ "materialId": 9, "materialCnt": 2, "materialGroup": 1, - "canDecompose": 1, + "canDecompose": 0, "canComposeAll": 0, "generalItem": "&", "nextId": 0