diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index 1e188c358..92fc9968c 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -406,12 +406,12 @@ export class EquipHandler { let index = _.findIndex(equip.holes, {id}); if (index > 0) return resResult(STATUS.EQUIP_HOLE_NOT_FIND); - if (equip.holes[index].isOpen) - return resResult(STATUS.EQUIP_HOLE_IS_DUG); + if (!equip.holes[index].isOpen) + return resResult(STATUS.EQUIP_HOLE_IS_NOT_DUG); consumes.push({id: jewel, count: 1}); let result = await handleCost(roleId, sid, consumes); if (!result) - return resResult(STATUS.JEWEL_IS_NOT_FIND); + return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); equip.holes[index].jewel = jewel; await EquipModel.updateEquipInfo(eid, {holes: equip.holes}); return resResult(STATUS.SUCCESS,{curEquip:{seqId: eid, holes: equip.holes}}); @@ -460,12 +460,12 @@ export class EquipHandler { let index = _.findIndex(equip.holes, {id}); if (index > 0) return resResult(STATUS.EQUIP_HOLE_NOT_FIND); - if (equip.holes[index].isOpen) - return resResult(STATUS.EQUIP_HOLE_IS_DUG); + if (!equip.holes[index].jewel) + return resResult(STATUS.JEWEL_IS_NOT_FIND); goods.push({id: equip.holes[index].jewel, count: 1}); equip.holes[index].jewel = 0; await EquipModel.updateEquipInfo(eid, {holes: equip.holes}); - let result = await addItems(roleId, roleName, sid, goods); - return resResult(STATUS.SUCCESS,{curEquip:{seqId: eid, holes: equip.holes, goods: result}}); + await addItems(roleId, roleName, sid, goods); + return resResult(STATUS.SUCCESS,{curEquip:{seqId: eid, holes: equip.holes}}); } } \ No newline at end of file diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index e6d8e4869..8807fa65c 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -158,6 +158,7 @@ export const STATUS = { EQUIP_IS_EQUIPED_NOT_DECOMPOSE: {code: 30503, simStr: '装备已穿戴,不能分解'}, EQUIP_HOLE_NOT_FIND: {code: 30504, simStr: '装备孔不存在' }, EQUIP_HOLE_IS_DUG: {code: 30505, simStr: '装备已经打过孔' }, + EQUIP_HOLE_IS_NOT_DUG: {code: 30505, simStr: '装备未打过孔' }, JEWEL_IS_NOT_FIND: {code: 30506, simStr: '宝石不存在' }, // 社交相关状态 40000 - 49999 diff --git a/shared/resource/jsons/dic_zyz_search.json b/shared/resource/jsons/dic_zyz_search.json index 2ca105184..d5a5f426e 100644 --- a/shared/resource/jsons/dic_zyz_search.json +++ b/shared/resource/jsons/dic_zyz_search.json @@ -5,10 +5,10 @@ "quality": 1, "reward": "31001&50|31002&100", "additionalReward": "10201&5|10202&10", - "termsForAdd": "1&2&2|2&2&1|3&1&1", + "termsForAdd": "1&8&2|2&2&1|3&1&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -20,7 +20,7 @@ "termsForAdd": "2&1&1|3&2&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -32,7 +32,7 @@ "termsForAdd": "2&3&1|3&3&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -44,7 +44,7 @@ "termsForAdd": "2&4&1|3&4&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -53,10 +53,10 @@ "quality": 2, "reward": "17007&50|17008&100", "additionalReward": "10501&5|10502&10", - "termsForAdd": "1&1&1|2&4&1|3&5&1", + "termsForAdd": "1&9&1|2&4&1|3&5&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -68,7 +68,7 @@ "termsForAdd": "3&6&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -80,7 +80,7 @@ "termsForAdd": "3&7&1", "actorNeeded": 2, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "1&", "weight": 1 }, { @@ -92,7 +92,7 @@ "termsForAdd": "3&8&2", "actorNeeded": 3, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -104,7 +104,7 @@ "termsForAdd": "1&1&1|2&1&1|3&1&1", "actorNeeded": 3, "completeTime": 60, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -116,7 +116,7 @@ "termsForAdd": "1&2&1|2&2&1|3&2&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -125,10 +125,10 @@ "quality": 4, "reward": "10105&50|10201&100", "additionalReward": "10703&5|10704&10", - "termsForAdd": "1&1&1|2&3&1|3&3&1", + "termsForAdd": "1&3&1|2&3&1|3&3&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -137,10 +137,10 @@ "quality": 4, "reward": "10202&50|10203&100", "additionalReward": "10705&5|12001&10", - "termsForAdd": "1&2&1|2&4&1|3&4&1", + "termsForAdd": "1&4&1|2&4&1|3&4&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -149,10 +149,10 @@ "quality": 5, "reward": "10204&50|10205&100", "additionalReward": "12002&5|12003&10", - "termsForAdd": "1&1&1|2&1&1|3&5&1", + "termsForAdd": "1&5&1|2&1&1|3&5&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -161,10 +161,10 @@ "quality": 5, "reward": "10301&50|10302&100", "additionalReward": "12004&5|12005&10", - "termsForAdd": "1&2&1|2&2&1|3&6&1", + "termsForAdd": "1&6&1|2&2&1|3&6&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 }, { @@ -173,10 +173,10 @@ "quality": 5, "reward": "10303&50|10304&100", "additionalReward": "12006&5|12007&10", - "termsForAdd": "1&1&1|2&3&1|3&7&1", + "termsForAdd": "1&7&1|2&3&1|3&7&1", "actorNeeded": 3, "completeTime": 120, - "suitFloor": 1, + "suitFloor": "10&", "weight": 1 } ] \ No newline at end of file